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

28 Mar 2012

Author: tchemit
Date: 2012-03-28 19:56:01 +0200 (Wed, 28 Mar 2012)
New Revision: 435

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

Log:
last modif on import api

Modified:
   trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java
   trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java
   trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportConfiguration.java
   trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.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/EsduResultByEchotypeImportModel.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/EsduResultBySpeciesAndSizeCategoryImportModel.java
   trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellResultImportModel.java

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

--- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java	2012-03-28 17:55:12 UTC (rev 434)
+++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java	2012-03-28 17:56:01 UTC (rev 435)
@@ -35,6 +35,9 @@
 import fr.ifremer.echobase.entities.EntityModificationLog;
 import fr.ifremer.echobase.entities.data.Category;
 import fr.ifremer.echobase.entities.data.CategoryDAO;
+import fr.ifremer.echobase.entities.data.Cell;
+import fr.ifremer.echobase.entities.data.Data;
+import fr.ifremer.echobase.entities.data.DataDAO;
 import fr.ifremer.echobase.entities.data.Echotype;
 import fr.ifremer.echobase.entities.references.AgeCategory;
 import fr.ifremer.echobase.entities.references.DataMetadata;
@@ -347,4 +350,18 @@
         }
         return result;
     }
+
+    protected void createCellData(DataDAO dao,
+                                  Cell cell,
+                                  DataMetadata dataMetaData,
+                                  String dataValue,
+                                  CsvFileImportResult importResult) {
+
+        Data data = create(dao);
+        data.setDataMetadata(dataMetaData);
+        data.setDataValue(dataValue);
+        cell.addData(data);
+
+        importResult.incrementsNumberCreated(EchoBaseEntityEnum.Data);
+    }
 }

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-03-28 17:55:12 UTC (rev 434)
+++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java	2012-03-28 17:56:01 UTC (rev 435)
@@ -336,7 +336,6 @@
                 metas);
 
 
-
         DecoratorService decoratorService = getService(DecoratorService.class);
         Decorator<Category> categoryDecorator = decoratorService.getDecorator(getLocale(), Category.class, null);
 

Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportConfiguration.java
===================================================================
--- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportConfiguration.java	2012-03-28 17:55:12 UTC (rev 434)
+++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportConfiguration.java	2012-03-28 17:56:01 UTC (rev 435)
@@ -75,9 +75,6 @@
     /** Map cells file to import. */
     protected final InputFile mapsFile;
 
-    /** Map cell results file to import. */
-    protected final InputFile mapResultFile;
-
     /** Echotype  file to import. */
     protected final InputFile echotypeFile;
 
@@ -96,8 +93,6 @@
                 l_(locale, "echobase.common.cellRegionResultFile"));
         mapsFile = InputFile.newFile(
                 l_(locale, "echobase.common.cellMapsFile"));
-        mapResultFile = InputFile.newFile(
-                l_(locale, "echobase.common.cellMapResultFile"));
         echotypeFile = InputFile.newFile(
                 l_(locale, "echobase.common.echotypeFile"));
         lengthAgeKeyFile = InputFile.newFile(
@@ -162,10 +157,6 @@
         return mapsFile;
     }
 
-    public InputFile getMapResultFile() {
-        return mapResultFile;
-    }
-
     public InputFile getEchotypeFile() {
         return echotypeFile;
     }
@@ -198,7 +189,7 @@
     public InputFile[] getInputFiles() {
         return new InputFile[]{regionsFile, regionAssociationFile,
                                regionResultFile,
-                               mapsFile, mapResultFile, echotypeFile,
+                               mapsFile, echotypeFile,
                                lengthAgeKeyFile, lengthWeightKeyFile,
                                esduByEchotypeFile,
                                esduByEchotypeAndSpeciesCategoryFile,

Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java
===================================================================
--- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java	2012-03-28 17:55:12 UTC (rev 434)
+++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java	2012-03-28 17:56:01 UTC (rev 435)
@@ -376,20 +376,4 @@
             closeReader(reader, inputFile);
         }
     }
-
-    private void createCellData(DataDAO dao,
-                                Cell cell,
-                                DataMetadata dataMetaData,
-                                String dataValue,
-                                CsvFileImportResult importResult) {
-
-        Data data = create(dao);
-        data.setDataMetadata(dataMetaData);
-        data.setDataValue(dataValue);
-        cell.addData(data);
-
-        importResult.incrementsNumberCreated(EchoBaseEntityEnum.Data);
-    }
-
-
 }

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-03-28 17:55:12 UTC (rev 434)
+++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java	2012-03-28 17:56:01 UTC (rev 435)
@@ -70,7 +70,7 @@
             String name = metadata.getName();
             newMandatoryColumn(
                     name,
-                    EchobaseCsvUtil.newResultValueParser(metadata),
+                    EchobaseCsvUtil.newResultValueParser(metadata, false),
                     EchobaseCsvUtil.<EsduResultByEchotypeAndSpeciesCategoryImportRow>newResultValueSetter());
         }
     }

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-03-28 17:55:12 UTC (rev 434)
+++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportModel.java	2012-03-28 17:56:01 UTC (rev 435)
@@ -62,7 +62,7 @@
             String name = metadata.getName();
             newMandatoryColumn(
                     name,
-                    EchobaseCsvUtil.newResultValueParser(metadata),
+                    EchobaseCsvUtil.newResultValueParser(metadata, false),
                     EchobaseCsvUtil.<EsduResultByEchotypeImportRow>newResultValueSetter());
         }
     }

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-03-28 17:55:12 UTC (rev 434)
+++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java	2012-03-28 17:56:01 UTC (rev 435)
@@ -66,7 +66,7 @@
             String name = metadata.getName();
             newMandatoryColumn(
                     name,
-                    EchobaseCsvUtil.newResultValueParser(metadata),
+                    EchobaseCsvUtil.newResultValueParser(metadata, false),
                     EchobaseCsvUtil.<EsduResultBySpeciesAndAgeCategoryImportRow>newResultValueSetter());
         }
     }

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-03-28 17:55:12 UTC (rev 434)
+++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java	2012-03-28 17:56:01 UTC (rev 435)
@@ -66,7 +66,7 @@
             String name = metadata.getName();
             newMandatoryColumn(
                     name,
-                    EchobaseCsvUtil.newResultValueParser(metadata),
+                    EchobaseCsvUtil.newResultValueParser(metadata, false),
                     EchobaseCsvUtil.<EsduResultBySpeciesAndSizeCategoryImportRow>newResultValueSetter());
         }
     }

Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellResultImportModel.java
===================================================================
--- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellResultImportModel.java	2012-03-28 17:55:12 UTC (rev 434)
+++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellResultImportModel.java	2012-03-28 17:56:01 UTC (rev 435)
@@ -68,10 +68,9 @@
         newForeignKeyColumn(RegionCellResultImportRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, sizeCategoryMap);
 
         for (DataMetadata metadata : dataMetadatas) {
-            String name = metadata.getName();
             newMandatoryColumn(
-                    name,
-                    EchobaseCsvUtil.newResultValueParser(metadata),
+                    metadata.getName(),
+                    EchobaseCsvUtil.newResultValueParser(metadata, true),
                     EchobaseCsvUtil.<RegionCellResultImportRow>newResultValueSetter());
         }
     }

    

r435 - in trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata: . csv

tchemit＠users.forge.codelutin.com

tags

participants (1)