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

6 Apr 2012

Author: tchemit
Date: 2012-04-06 16:03:43 +0200 (Fri, 06 Apr 2012)
New Revision: 497

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

Log:
fixes #1091: Uniformisation des formats de date utilis?\195?\169s

Modified:
   trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EchobaseCsvUtil.java
   trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/AcousticImportModel.java
   trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationImportModel.java
   trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransectImportModel.java
   trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransitImportModel.java
   trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/VoyageImportModel.java

Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EchobaseCsvUtil.java
===================================================================

--- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EchobaseCsvUtil.java	2012-04-06 14:01:55 UTC (rev 496)
+++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EchobaseCsvUtil.java	2012-04-06 14:03:43 UTC (rev 497)
@@ -65,13 +65,9 @@
                 }
             };
 
-    public static final ValueParser<Date> IMPORT_DAY = new DateValue("dd/MM/yy");
-
-    public static final ValueParser<Date> IMPORT_DAY_TIME2 = new DateValue("yyyy-MM-dd HH:mm:ss");
-
     public static final String CELLULE_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSSS";
 
-    public static final ValueParser<Date> IMPORT_DAY_TIME3 = new DateValue(CELLULE_DATE_FORMAT);
+    public static final ValueParser<Date> IMPORT_DAY_TIME_ECHOBASE = new DateValue(CELLULE_DATE_FORMAT);
 
     public static final ValueParser<Boolean> INT_TO_BOOLEAN_PARSER = new ValueParser<Boolean>() {
 

Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/AcousticImportModel.java
===================================================================
--- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/AcousticImportModel.java	2012-04-06 14:01:55 UTC (rev 496)
+++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/AcousticImportModel.java	2012-04-06 14:03:43 UTC (rev 497)
@@ -105,8 +105,8 @@
         newMandatoryColumn("MOVIES_EILayer\\cellset\\depthend", AcousticImportRow.PROPERTY_CELL_DEPTH_END, EchobaseCsvUtil.PRIMITIVE_FLOAT);//BA
         newIgnoredColumn("MOVIES_EILayer\\cellset\\indexstart");//BB
         newIgnoredColumn("MOVIES_EILayer\\cellset\\indexend");//BC
-        newMandatoryColumn("MOVIES_EILayer\\cellset\\datestart", AcousticImportRow.PROPERTY_CELL_DATE_START, EchobaseCsvUtil.IMPORT_DAY_TIME3);//BD
-        newMandatoryColumn("MOVIES_EILayer\\cellset\\dateend", AcousticImportRow.PROPERTY_CELL_DATE_END, EchobaseCsvUtil.IMPORT_DAY_TIME3);//BE
+        newMandatoryColumn("MOVIES_EILayer\\cellset\\datestart", AcousticImportRow.PROPERTY_CELL_DATE_START, EchobaseCsvUtil.IMPORT_DAY_TIME_ECHOBASE);//BD
+        newMandatoryColumn("MOVIES_EILayer\\cellset\\dateend", AcousticImportRow.PROPERTY_CELL_DATE_END, EchobaseCsvUtil.IMPORT_DAY_TIME_ECHOBASE);//BE
 
         newMandatoryColumn("MOVIES_EILayer\\cellset\\lat", AcousticImportRow.PROPERTY_CELL_LATITUDE, EchobaseCsvUtil.PRIMITIVE_FLOAT);//BF
         newMandatoryColumn("MOVIES_EILayer\\cellset\\long", AcousticImportRow.PROPERTY_CELL_LONGITUDE, EchobaseCsvUtil.PRIMITIVE_FLOAT);//BG

Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationImportModel.java
===================================================================
--- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationImportModel.java	2012-04-06 14:01:55 UTC (rev 496)
+++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationImportModel.java	2012-04-06 14:03:43 UTC (rev 497)
@@ -53,8 +53,8 @@
         newMandatoryColumn(OPERATION_ID, Operation.PROPERTY_ID);
         newMandatoryColumn(Operation.PROPERTY_MID_HAUL_LATITUDE, EchobaseCsvUtil.PRIMITIVE_FLOAT);
         newMandatoryColumn(Operation.PROPERTY_MID_HAUL_LONGITUDE, EchobaseCsvUtil.PRIMITIVE_FLOAT);
-        newMandatoryColumn(Operation.PROPERTY_GEAR_SHOOTING_START_TIME, EchobaseCsvUtil.DAY_TIME_SECOND);
-        newMandatoryColumn(Operation.PROPERTY_GEAR_SHOOTING_END_TIME, EchobaseCsvUtil.DAY_TIME_SECOND);
+        newMandatoryColumn(Operation.PROPERTY_GEAR_SHOOTING_START_TIME, EchobaseCsvUtil.IMPORT_DAY_TIME_ECHOBASE);
+        newMandatoryColumn(Operation.PROPERTY_GEAR_SHOOTING_END_TIME, EchobaseCsvUtil.IMPORT_DAY_TIME_ECHOBASE);
         newMandatoryColumn(Operation.PROPERTY_GEAR_SHOOTING_START_LATITUDE, EchobaseCsvUtil.PRIMITIVE_FLOAT);
         newMandatoryColumn(Operation.PROPERTY_GEAR_SHOOTING_END_LATITUDE, EchobaseCsvUtil.PRIMITIVE_FLOAT);
         newMandatoryColumn(Operation.PROPERTY_GEAR_SHOOTING_START_LONGITUDE, EchobaseCsvUtil.PRIMITIVE_FLOAT);

Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransectImportModel.java
===================================================================
--- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransectImportModel.java	2012-04-06 14:01:55 UTC (rev 496)
+++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransectImportModel.java	2012-04-06 14:03:43 UTC (rev 497)
@@ -56,9 +56,9 @@
         newMandatoryColumn(Transect.PROPERTY_STRATUM);
         newMandatoryColumn(Transect.PROPERTY_COMMENT);
 
-        newMandatoryColumn(Transect.PROPERTY_DATE_CREATED, EchobaseCsvUtil.IMPORT_DAY_TIME2);
-        newMandatoryColumn(Transect.PROPERTY_TIME_COVERAGE_START, EchobaseCsvUtil.IMPORT_DAY_TIME2);
-        newMandatoryColumn(Transect.PROPERTY_TIME_COVERAGE_END, EchobaseCsvUtil.IMPORT_DAY_TIME2);
+        newMandatoryColumn(Transect.PROPERTY_DATE_CREATED, EchobaseCsvUtil.IMPORT_DAY_TIME_ECHOBASE);
+        newMandatoryColumn(Transect.PROPERTY_TIME_COVERAGE_START, EchobaseCsvUtil.IMPORT_DAY_TIME_ECHOBASE);
+        newMandatoryColumn(Transect.PROPERTY_TIME_COVERAGE_END, EchobaseCsvUtil.IMPORT_DAY_TIME_ECHOBASE);
 
         newMandatoryColumn(Transect.PROPERTY_GEOSPATIAL_LON_MIN, EchobaseCsvUtil.PRIMITIVE_FLOAT);
         newMandatoryColumn(Transect.PROPERTY_GEOSPATIAL_LAT_MIN, EchobaseCsvUtil.PRIMITIVE_FLOAT);

Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransitImportModel.java
===================================================================
--- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransitImportModel.java	2012-04-06 14:01:55 UTC (rev 496)
+++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransitImportModel.java	2012-04-06 14:03:43 UTC (rev 497)
@@ -43,8 +43,8 @@
         super(separator);
         newForeignKeyColumn(TransitImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap);
         newMandatoryColumn(Transit.PROPERTY_DESCRIPTION);
-        newMandatoryColumn(Transit.PROPERTY_START_TIME, EchobaseCsvUtil.DAY_TIME);
-        newMandatoryColumn(Transit.PROPERTY_END_TIME, EchobaseCsvUtil.DAY_TIME);
+        newMandatoryColumn(Transit.PROPERTY_START_TIME, EchobaseCsvUtil.IMPORT_DAY_TIME_ECHOBASE);
+        newMandatoryColumn(Transit.PROPERTY_END_TIME, EchobaseCsvUtil.IMPORT_DAY_TIME_ECHOBASE);
         newMandatoryColumn(Transit.PROPERTY_START_LOCALITY);
         newMandatoryColumn(Transit.PROPERTY_END_LOCALITY);
     }

Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/VoyageImportModel.java
===================================================================
--- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/VoyageImportModel.java	2012-04-06 14:01:55 UTC (rev 496)
+++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/VoyageImportModel.java	2012-04-06 14:03:43 UTC (rev 497)
@@ -39,8 +39,8 @@
     public VoyageImportModel(char separator) {
         super(separator);
         newMandatoryColumn(Voyage.PROPERTY_NAME);
-        newMandatoryColumn(Voyage.PROPERTY_START_DATE, EchobaseCsvUtil.DAY);
-        newMandatoryColumn(Voyage.PROPERTY_END_DATE, EchobaseCsvUtil.DAY);
+        newMandatoryColumn(Voyage.PROPERTY_START_DATE, EchobaseCsvUtil.IMPORT_DAY_TIME_ECHOBASE);
+        newMandatoryColumn(Voyage.PROPERTY_END_DATE, EchobaseCsvUtil.IMPORT_DAY_TIME_ECHOBASE);
         newMandatoryColumn(Voyage.PROPERTY_START_PORT);
         newMandatoryColumn(Voyage.PROPERTY_END_PORT);
     }

    

r497 - in trunk: echobase-entities/src/main/java/fr/ifremer/echobase/csv echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv

tchemit＠users.forge.codelutin.com

tags

participants (1)