[Echobase-commits] r499 - in trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata: . csv

6 Apr 2012

Author: tchemit
Date: 2012-04-06 16:07:07 +0200 (Fri, 06 Apr 2012)
New Revision: 499

Url: http://forge.codelutin.com/repositories/revision/echobase/499

Log:
fixes #1096: Ajout du voyage sur les imports de r?\195?\169sultats esdu

Modified:
   trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java
   trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java
   trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportRow.java
   trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportModel.java
   trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportRow.java
   trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java
   trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportRow.java
   trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java
   trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportRow.java

Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java
===================================================================

--- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java	2012-04-06 14:05:31 UTC (rev 498)
+++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java	2012-04-06 14:07:07 UTC (rev 499)
@@ -62,6 +62,7 @@
 import org.nuiton.util.csv.ImportRuntimeException;
 
 import java.io.Reader;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -116,6 +117,10 @@
                 DataProcessing.class,
                 configuration.getDataProcessingId());
 
+        // authorize only the selected voyage to be imported
+        Map<String, Voyage> voyageMap = Maps.uniqueIndex(Arrays.asList(
+                voyage), EchoBaseFunctions.VOYAGE_NAME);
+
         // get esdu cells usables
         Map<String, Cell> esduCellMap = Maps.uniqueIndex(
                 dataProcessing.getCell(), EchoBaseFunctions.CELL_BY_NAME);
@@ -134,6 +139,7 @@
                     configuration,
                     inputFile,
                     voyage,
+                    voyageMap,
                     echotypeMap,
                     dataMetadataMap,
                     esduCellMap,
@@ -147,6 +153,7 @@
                     configuration,
                     inputFile,
                     voyage,
+                    voyageMap,
                     echotypeMap,
                     dataMetadataMap,
                     speciesMap,
@@ -162,6 +169,7 @@
                     configuration,
                     inputFile,
                     voyage,
+                    voyageMap,
                     dataMetadataMap,
                     speciesMap,
                     sizeCategoryMap,
@@ -177,6 +185,7 @@
                     configuration,
                     inputFile,
                     voyage,
+                    voyageMap,
                     dataMetadataMap,
                     speciesMap,
                     ageCategoryMap,
@@ -190,6 +199,7 @@
             ResultsImportConfiguration configuration,
             InputFile inputFile,
             Voyage voyage,
+            Map<String, Voyage> voyageMap,
             Map<String, Echotype> echotypeMap,
             Map<String, DataMetadata> dataMetadataMap,
             Map<String, Cell> esduCellMap,
@@ -214,6 +224,7 @@
 
         EsduResultByEchotypeImportModel csvModel = new EsduResultByEchotypeImportModel(
                 serviceContext.getConfiguration().getCsvSeparator(),
+                voyageMap,
                 echotypeMap,
                 voyage,
                 esduCellMap,
@@ -256,6 +267,7 @@
             ResultsImportConfiguration configuration,
             InputFile inputFile,
             Voyage voyage,
+            Map<String, Voyage> voyageMap,
             Map<String, Echotype> echotypeMap,
             Map<String, DataMetadata> dataMetadataMap,
             Map<String, Species> speciesMap,
@@ -291,6 +303,7 @@
 
         EsduResultByEchotypeAndSpeciesCategoryImportModel csvModel = new EsduResultByEchotypeAndSpeciesCategoryImportModel(
                 serviceContext.getConfiguration().getCsvSeparator(),
+                voyageMap,
                 echotypeMap,
                 speciesMap,
                 sizeCategoryMap,
@@ -335,6 +348,7 @@
     private CsvFileImportResult importBySpeciesAndSizeCategoryFile(
             ResultsImportConfiguration configuration, InputFile inputFile,
             Voyage voyage,
+            Map<String, Voyage> voyageMap,
             Map<String, DataMetadata> dataMetadataMap,
             Map<String, Species> speciesMap,
             Map<String, SizeCategory> sizeCategoryMap,
@@ -370,6 +384,7 @@
 
         EsduResultBySpeciesAndSizeCategoryImportModel csvModel = new EsduResultBySpeciesAndSizeCategoryImportModel(
                 serviceContext.getConfiguration().getCsvSeparator(),
+                voyageMap,
                 speciesMap,
                 voyage,
                 esduCellMap,
@@ -436,6 +451,7 @@
             ResultsImportConfiguration configuration,
             InputFile inputFile,
             Voyage voyage,
+            Map<String, Voyage> voyageMap,
             Map<String, DataMetadata> dataMetadataMap,
             Map<String, Species> speciesMap,
             Map<String, AgeCategory> ageCategoryMap,
@@ -471,6 +487,7 @@
 
         EsduResultBySpeciesAndAgeCategoryImportModel csvModel = new EsduResultBySpeciesAndAgeCategoryImportModel(
                 serviceContext.getConfiguration().getCsvSeparator(),
+                voyageMap,
                 speciesMap,
                 voyage,
                 esduCellMap,

Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java
===================================================================
--- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java	2012-04-06 14:05:31 UTC (rev 498)
+++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java	2012-04-06 14:07:07 UTC (rev 499)
@@ -55,6 +55,7 @@
 
     public EsduResultByEchotypeAndSpeciesCategoryImportModel(
             char separator,
+            Map<String, Voyage> voyageMap,
             Map<String, Echotype> echotypeMap,
             Map<String, Species> speciesMap,
             Map<String, SizeCategory> sizeCategoryMap,
@@ -64,6 +65,7 @@
             Map<String, DataQuality> dataQualityMap) {
         super(separator);
 
+        newForeignKeyColumn(RegionCellImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap);
         newForeignKeyColumn(EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_ECHOTYPE, Echotype.class, Echotype.PROPERTY_NAME, echotypeMap);
         newForeignKeyColumn(Species.PROPERTY_BARACOUDA_CODE, EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap);
         newForeignKeyColumn(EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, sizeCategoryMap);

Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportRow.java
===================================================================
--- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportRow.java	2012-04-06 14:05:31 UTC (rev 498)
+++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportRow.java	2012-04-06 14:07:07 UTC (rev 499)
@@ -28,6 +28,7 @@
 import fr.ifremer.echobase.entities.data.Cell;
 import fr.ifremer.echobase.entities.data.Echotype;
 import fr.ifremer.echobase.entities.data.Result;
+import fr.ifremer.echobase.entities.data.Voyage;
 import fr.ifremer.echobase.entities.references.DataQuality;
 import fr.ifremer.echobase.entities.references.SizeCategory;
 import fr.ifremer.echobase.entities.references.Species;
@@ -43,6 +44,8 @@
  */
 public class EsduResultByEchotypeAndSpeciesCategoryImportRow implements EchobaseCsvUtil.ResultAble {
 
+    public static final String PROPERTY_VOYAGE = "voyage";
+
     public static final String PROPERTY_ECHOTYPE = "echotype";
 
     public static final String PROPERTY_CELL = "cell";
@@ -53,6 +56,8 @@
 
     public static final String PROPERTY_DATA_QUALITY = "dataQuality";
 
+    protected Voyage voyage;
+
     protected Echotype echotype;
 
     protected Cell cell;
@@ -66,6 +71,10 @@
     protected DataQuality dataQuality;
 
 
+    public void setVoyage(Voyage voyage) {
+        this.voyage = voyage;
+    }
+
     public Echotype getEchotype() {
         return echotype;
     }

Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportModel.java
===================================================================
--- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportModel.java	2012-04-06 14:05:31 UTC (rev 498)
+++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportModel.java	2012-04-06 14:07:07 UTC (rev 499)
@@ -51,6 +51,7 @@
 
     public EsduResultByEchotypeImportModel(
             char separator,
+            Map<String, Voyage> voyageMap,
             Map<String, Echotype> echotypeMap,
             Voyage voyage,
             Map<String, Cell> esduCellMap,
@@ -58,6 +59,7 @@
             Map<String, DataQuality> dataQualityMap) {
         super(separator);
 
+        newForeignKeyColumn(RegionCellImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap);
         newForeignKeyColumn(EsduResultByEchotypeImportRow.PROPERTY_ECHOTYPE, Echotype.class, Echotype.PROPERTY_NAME, echotypeMap);
         newMandatoryColumn(CELL_NAME, EsduResultByEchotypeImportRow.PROPERTY_CELL, EchobaseCsvUtil.newCellValueParser(voyage, esduCellMap));
         newForeignKeyColumn(EsduResultByEchotypeImportRow.PROPERTY_DATA_QUALITY, DataQuality.class, DataQuality.PROPERTY_QUALITY_DATA_FLAG_VALUES, dataQualityMap);

Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportRow.java
===================================================================
--- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportRow.java	2012-04-06 14:05:31 UTC (rev 498)
+++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportRow.java	2012-04-06 14:07:07 UTC (rev 499)
@@ -28,6 +28,7 @@
 import fr.ifremer.echobase.entities.data.Cell;
 import fr.ifremer.echobase.entities.data.Echotype;
 import fr.ifremer.echobase.entities.data.Result;
+import fr.ifremer.echobase.entities.data.Voyage;
 import fr.ifremer.echobase.entities.references.DataQuality;
 
 import java.util.List;
@@ -40,12 +41,16 @@
  */
 public class EsduResultByEchotypeImportRow implements EchobaseCsvUtil.ResultAble {
 
+    public static final String PROPERTY_VOYAGE = "voyage";
+
     public static final String PROPERTY_ECHOTYPE = "echotype";
 
     public static final String PROPERTY_CELL = "cell";
 
     public static final String PROPERTY_DATA_QUALITY = "dataQuality";
 
+    protected Voyage voyage;
+
     protected Echotype echotype;
 
     protected Cell cell;
@@ -54,6 +59,10 @@
 
     protected DataQuality dataQuality;
 
+    public void setVoyage(Voyage voyage) {
+        this.voyage = voyage;
+    }
+
     public Echotype getEchotype() {
         return echotype;
     }

Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java
===================================================================
--- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java	2012-04-06 14:05:31 UTC (rev 498)
+++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java	2012-04-06 14:07:07 UTC (rev 499)
@@ -53,6 +53,7 @@
 
     public EsduResultBySpeciesAndAgeCategoryImportModel(
             char separator,
+            Map<String, Voyage> voyageMap,
             Map<String, Species> speciesMap,
             Voyage voyage,
             Map<String, Cell> esduCellMap,
@@ -60,6 +61,7 @@
             Map<String, DataQuality> dataQualityMap) {
         super(separator);
 
+        newForeignKeyColumn(RegionCellImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap);
         newMandatoryColumn(CELL_NAME, EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_CELL, EchobaseCsvUtil.newCellValueParser(voyage, esduCellMap));
         newMandatoryColumn(EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_AGE_CATEGORY);
         newMandatoryColumn(EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_AGE_CATEGORY_MEANING);

Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportRow.java
===================================================================
--- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportRow.java	2012-04-06 14:05:31 UTC (rev 498)
+++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportRow.java	2012-04-06 14:07:07 UTC (rev 499)
@@ -27,6 +27,7 @@
 import fr.ifremer.echobase.csv.EchobaseCsvUtil;
 import fr.ifremer.echobase.entities.data.Cell;
 import fr.ifremer.echobase.entities.data.Result;
+import fr.ifremer.echobase.entities.data.Voyage;
 import fr.ifremer.echobase.entities.references.DataQuality;
 import fr.ifremer.echobase.entities.references.Species;
 
@@ -41,6 +42,8 @@
  */
 public class EsduResultBySpeciesAndAgeCategoryImportRow implements EchobaseCsvUtil.ResultAble {
 
+    public static final String PROPERTY_VOYAGE = "voyage";
+
     public static final String PROPERTY_CELL = "cell";
 
     public static final String PROPERTY_SPECIES = "species";
@@ -51,6 +54,8 @@
 
     public static final String PROPERTY_DATA_QUALITY = "dataQuality";
 
+    protected Voyage voyage;
+
     protected Cell cell;
 
     protected List<Result> result = Lists.newArrayList();
@@ -63,6 +68,10 @@
 
     protected DataQuality dataQuality;
 
+    public void setVoyage(Voyage voyage) {
+        this.voyage = voyage;
+    }
+
     public Species getSpecies() {
         return species;
     }

Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java
===================================================================
--- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java	2012-04-06 14:05:31 UTC (rev 498)
+++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java	2012-04-06 14:07:07 UTC (rev 499)
@@ -53,6 +53,7 @@
 
     public EsduResultBySpeciesAndSizeCategoryImportModel(
             char separator,
+            Map<String, Voyage> voyageMap,
             Map<String, Species> speciesMap,
             Voyage voyage,
             Map<String, Cell> esduCellMap,
@@ -60,6 +61,7 @@
             Map<String, DataQuality> dataQualityMap) {
         super(separator);
 
+        newForeignKeyColumn(RegionCellImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap);
         newMandatoryColumn(CELL_NAME, EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_CELL, EchobaseCsvUtil.newCellValueParser(voyage, esduCellMap));
         newMandatoryColumn(EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_SIZE_CATEGORY);
         newMandatoryColumn(EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_SIZE_CATEGORY_MEANING);

Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportRow.java
===================================================================
--- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportRow.java	2012-04-06 14:05:31 UTC (rev 498)
+++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportRow.java	2012-04-06 14:07:07 UTC (rev 499)
@@ -27,6 +27,7 @@
 import fr.ifremer.echobase.csv.EchobaseCsvUtil;
 import fr.ifremer.echobase.entities.data.Cell;
 import fr.ifremer.echobase.entities.data.Result;
+import fr.ifremer.echobase.entities.data.Voyage;
 import fr.ifremer.echobase.entities.references.DataQuality;
 import fr.ifremer.echobase.entities.references.Species;
 
@@ -41,6 +42,8 @@
  */
 public class EsduResultBySpeciesAndSizeCategoryImportRow implements EchobaseCsvUtil.ResultAble {
 
+    public static final String PROPERTY_VOYAGE = "voyage";
+
     public static final String PROPERTY_CELL = "cell";
 
     public static final String PROPERTY_SPECIES = "species";
@@ -51,6 +54,8 @@
 
     public static final String PROPERTY_DATA_QUALITY = "dataQuality";
 
+    protected Voyage voyage;
+
     protected Cell cell;
 
     protected List<Result> result = Lists.newArrayList();
@@ -63,6 +68,10 @@
 
     protected DataQuality dataQuality;
 
+    public void setVoyage(Voyage voyage) {
+        this.voyage = voyage;
+    }
+
     public Species getSpecies() {
         return species;
     }

    

[Echobase-commits] r499 - in trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata: . csv

tchemit＠users.forge.codelutin.com