Changeset 3238

Timestamp:

Apr 12, 2007, 12:04:45 AM (16 years ago)

Author:

Nicklas Nordborg

Message:

:Fixes #562:Support for scientific notation for number when parsing data files

Location:

branches/2.2.3/src

Files:

• core/net/sf/basedb/core/Type.java (modified) (1 diff)
• test/TestAll.java (modified) (1 diff)

branches/2.2.3/src/core/net/sf/basedb/core/Type.java

@@ -418 +418 @@
       if (pos.getIndex() < value.length())
       {
-        throw new NumberFormatException("For input string: \"" + value + "\"");
+        if (value.indexOf('e') >= 0)
+        {
+          // Convert 'e' to 'E' (in scientific notation only 'E' is allowed) and try again
+          return parseString(value.replace('e', 'E'), numberFormat);
+        }
+        else
+        {
+          throw new NumberFormatException("For input string: \"" + value + "\"");
+        }
       }
       return convertNumber(num);

branches/2.2.3/src/test/TestAll.java

@@ -122 +122 @@
     results.put("TestDbInfo", TestDbInfo.test_all());
     results.put("TestPresets", TestPresets.test_all());
+    results.put("TestNumberFormat", TestNumberFormat.test_all());
 
     // Plugins, jobs