Changeset 3241

Timestamp:

Apr 12, 2007, 11:30:53 PM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #563: FlatFileParser? can't handle complex mappings

Location:

branches/2.2.3/src/core/net/sf/basedb/util/parser

Files:

• CompoundMapper.java (modified) (4 diffs)
• ConstantMapper.java (modified) (7 diffs)
• FlatFileParser.java (modified) (1 diff)

branches/2.2.3/src/core/net/sf/basedb/util/parser/CompoundMapper.java

@@ -24 +24 @@
 package net.sf.basedb.util.parser;
 
+import java.text.NumberFormat;
 import java.util.List;
 
+import net.sf.basedb.core.Type;
 import net.sf.basedb.util.parser.FlatFileParser.Data;
 
@@ -41 +43 @@
 {
   private final List<Mapper> mappers;
+  private final NumberFormat parser;
   
   /**
@@ -46 +49 @@
     @param mappers A list of other mappers that will be invoked in 
       the order they appear in the list
-   */
+  */
   public CompoundMapper(List<Mapper> mappers)
   {
+    this(mappers, null);
+  }
+  
+  /**
+    Create a new compound mapper, using a specific number formatter as it's parser.
+    @param mappers A list of other mappers that will be invoked in 
+      the order they appear in the list
+    @param parser The number format to use or null to use Float.valueOf()
+    @since 2.2.3
+   */
+  public CompoundMapper(List<Mapper> mappers, NumberFormat parser)
+  {
     this.mappers = mappers;
+    this.parser = parser;
   }
-
   /*
     From the Mapper interface
@@ -73 +88 @@
   {
     String stringValue = getValue(data);
-    return stringValue == null ? null : Integer.parseInt(stringValue);
+    Integer intValue = null;
+    if (stringValue != null)
+    {
+      if (parser != null)
+      {
+        intValue = (Integer)Type.INT.parseString(stringValue, parser);
+      }
+      else
+      {
+        intValue = Integer.parseInt(stringValue);
+      }
+    }
+    return intValue;
   }
   public Float getFloat(Data data)
   {
     String stringValue = getValue(data);
-    return stringValue == null ? null : Float.parseFloat(stringValue);
+    Float floatValue = null;
+    if (stringValue != null)
+    {
+      if (parser != null)
+      {
+        floatValue = (Float)Type.FLOAT.parseString(stringValue, parser);
+      }
+      else
+      {
+        floatValue = Float.parseFloat(stringValue);
+      }
+    }
+    return floatValue;
   }
   // -------------------------------------------

branches/2.2.3/src/core/net/sf/basedb/util/parser/ConstantMapper.java

@@ -27 +27 @@
 import java.text.ParsePosition;
 
+import net.sf.basedb.core.Type;
 import net.sf.basedb.util.parser.FlatFileParser.Data;
 
@@ -41 +42 @@
 {
   private final String constant;
+  private final NumberFormat parser;
+  private boolean needToParseNumeric;
+  private Float asFloat;
   private Integer asInteger;
-  private NumberFormatException integerException;
-  private Float asFloat;
-  private NumberFormatException floatException;
+  private NumberFormatException parseException;
   
   /**
@@ -63 +65 @@
   {
     this.constant = constant;
-    if (constant != null)
-    {
-      if (parser != null)
-      {
-        ParsePosition pos = new ParsePosition(0);
-        asFloat = parser.parse(constant, pos).floatValue();
-        if (pos.getIndex() < constant.length())
-        {
-          asFloat = null;
-          floatException = new NumberFormatException("For input string: \"" + constant + "\"");
-          integerException = floatException;
-        }
-        else
-        {
-          asInteger = asFloat.intValue();
-        }
-      }
-      else
-      {
-        try
-        {
-          asFloat = Float.valueOf(constant);
-        }
-        catch (NumberFormatException ex)
-        {
-          floatException = ex;
-        }
-        if (asFloat != null)
-        {
-          asInteger = asFloat.intValue();
-        }
-        else
-        {
-          integerException = floatException;
-        }
-      }
-    }
+    this.parser = parser;
+    this.needToParseNumeric = constant != null;
   }
   
@@ -107 +74 @@
     this.asInteger = constant;
     this.asFloat = new Float(constant.floatValue());
+    this.parser = null;
+    this.needToParseNumeric = false;
   }
   
@@ -114 +83 @@
     this.asFloat = constant;
     this.asInteger = new Integer(constant.intValue());
+    this.parser = null;
+    this.needToParseNumeric = false;
   }
   
@@ -129 +100 @@
   public Integer getInt(Data data)
   {
-    if (integerException != null) throw integerException;
+    if (parseException != null) throw parseException;
+    if (needToParseNumeric) parseNumeric();
     return asInteger;
   }
   public Float getFloat(Data data)
   {
-    if (floatException != null) throw floatException;
+    if (parseException != null) throw parseException;
+    if (needToParseNumeric) parseNumeric();
     return asFloat;
   }
@@ -148 +121 @@
   }
   // -------------------------------------------
+
+  private void parseNumeric()
+  {
+    assert constant != null : "constant == null";
+    needToParseNumeric = false;
+    try
+    {
+      if (parser != null)
+      {
+        asFloat = (Float)Type.FLOAT.parseString(constant, parser);
+      }
+      else
+      {
+        asFloat = Float.valueOf(constant);
+      }
+    }
+    catch (NumberFormatException ex)
+    {
+      parseException = ex;
+    }
+    if (asFloat != null)
+    {
+      asInteger = asFloat.intValue();
+    }
+  }
 }

branches/2.2.3/src/core/net/sf/basedb/util/parser/FlatFileParser.java

@@ -871 +871 @@
       else
       {
-        mapper = new CompoundMapper(mappers);
+        mapper = new CompoundMapper(mappers, numberFormat);
       }
     }