#46 Date autodetection complete

orientechnologies · Mar 29, 2015 · 16d58b8 · 16d58b8
1 parent 04876ba
commit 16d58b8
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 15 deletions.
diff --git a/src/main/java/com/orientechnologies/orient/etl/transformer/OCSVTransformer.java b/src/main/java/com/orientechnologies/orient/etl/transformer/OCSVTransformer.java
@@ -25,6 +25,9 @@
 import com.orientechnologies.orient.core.serialization.serializer.OStringSerializerHelper;
 import com.orientechnologies.orient.etl.OETLProcessor;
 
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -143,19 +146,26 @@ public Object executeTransform(final Object input) {
           // DETERMINE THE TYPE
           final char firstChar = fieldStringValue.charAt(0);
           if (Character.isDigit(firstChar)) {
-              // NUMBER
-              if (fieldStringValue.contains(".") || fieldStringValue.contains(",")) {
-                  String numberAsString = fieldStringValue.replaceAll(",", ".");
-                  fieldValue = new Float(numberAsString);
-                  if (!Float.isFinite((Float) fieldValue)) {
-                      fieldValue = new Double(numberAsString);
-                  }
-              } else
-                  try {
-                      fieldValue = new Integer(fieldStringValue);
-                  } catch (Exception e) {
-                      fieldValue = new Long(fieldStringValue);
-                  }
+              //DATE
+              DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+              df.setLenient(true);
+              try {
+                  fieldValue = df.parse(fieldStringValue);
+              } catch (ParseException pe) {
+                  // NUMBER
+                  if (fieldStringValue.contains(".") || fieldStringValue.contains(",")) {
+                      String numberAsString = fieldStringValue.replaceAll(",", ".");
+                      fieldValue = new Float(numberAsString);
+                      if (!Float.isFinite((Float) fieldValue)) {
+                          fieldValue = new Double(numberAsString);
+                      }
+                  } else
+                      try {
+                          fieldValue = new Integer(fieldStringValue);
+                      } catch (Exception e) {
+                          fieldValue = new Long(fieldStringValue);
+                      }
+              }
           }
           else
             fieldValue = fieldStringValue;

diff --git a/src/test/java/com/orientechnologies/orient/etl/transformer/OCSVTransformerTest.java b/src/test/java/com/orientechnologies/orient/etl/transformer/OCSVTransformerTest.java
@@ -74,8 +74,8 @@ public void testDateTypeAutodetection(){
         List<ODocument> res = getResult();
         ODocument doc = res.get(0);
         Date birthday = doc.field("BirthDay");
-        assertEquals(2008, birthday.getYear());
-        assertEquals(3, birthday.getMonth());
+        assertEquals(2008, birthday.getYear()+1900);
+        assertEquals(4, birthday.getMonth()+1);
         assertEquals(30, birthday.getDate());
     }