#46 Parsing: 401 Congress Ave, Suite 2450

orientechnologies · Mar 29, 2015 · 2ad0860 · 2ad0860
1 parent 3a4d397
commit 2ad0860
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 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
@@ -153,18 +153,22 @@ public Object executeTransform(final Object input) {
                   fieldValue = df.parse(fieldStringValue);
               } catch (ParseException pe) {
                   // NUMBER
-                  if (fieldStringValue.contains(".") || fieldStringValue.contains(",")) {
+                  try {
-                      String numberAsString = fieldStringValue.replaceAll(",", ".");
+                      if (fieldStringValue.contains(".") || fieldStringValue.contains(",")) {
-                      fieldValue = new Float(numberAsString);
+                          String numberAsString = fieldStringValue.replaceAll(",", ".");
-                      if (!Float.isFinite((Float) fieldValue)) {
+                          fieldValue = new Float(numberAsString);
-                          fieldValue = new Double(numberAsString);
+                          if (!Float.isFinite((Float) fieldValue)) {
-                      }
+                              fieldValue = new Double(numberAsString);
-                  } else
+                          }
-                      try {
+                      } else
-                          fieldValue = new Integer(fieldStringValue);
+                          try {
-                      } catch (Exception e) {
+                              fieldValue = new Integer(fieldStringValue);
-                          fieldValue = new Long(fieldStringValue);
+                          } catch (Exception e) {
-                      }
+                              fieldValue = new Long(fieldStringValue);
+                          }
+                  } catch (NumberFormatException nf) {
+                      fieldValue = fieldStringValue;
+                  }
               }
           }
           else

diff --git a/src/test/java/com/orientechnologies/orient/etl/transformer/OCSVTransformerTest.java b/src/test/java/com/orientechnologies/orient/etl/transformer/OCSVTransformerTest.java
@@ -94,8 +94,8 @@ public void testStringStartedFromDigit() throws Exception {
         process(cfgJson);
         List<ODocument> res = getResult();
         ODocument doc = res.get(0);
-        String text = doc.field("address");
+        String address = doc.field("address");
-        assertEquals("401 Congress Ave, Suite 2450", text);
+        assertEquals("401 Congress Ave, Suite 2450", address);
     }
 
     @Test