Changeset 4104

Timestamp:

Jan 28, 2008, 1:29:10 PM (15 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #906: FlatFileParser? should not always throw an exception if a column header is not found

Location:

trunk/src/core/net/sf/basedb/util/parser

Files:

• ColFunction.java (modified) (3 diffs)
• FlatFileParser.java (modified) (5 diffs)
• JepMapper.java (modified) (2 diffs)

trunk/src/core/net/sf/basedb/util/parser/ColFunction.java

@@ -66 +66 @@
   private final ParsePosition pos;
   private FlatFileParser.Data data;
+  private boolean ignoreNonExistingColumns = false;
   
   public ColFunction(Map<String, Integer> columnHeaders, NumberFormat numberFormat)
@@ -138 +139 @@
       if (column == null)
       {
-        throw new BaseException("Column '" + colName + "' not found in column headers.");
-      }
-      value = data.get(column);
+        if (!ignoreNonExistingColumns)
+        {
+          throw new BaseException("Column '" + colName + "' not found in column headers.");
+        }
+        value = null;
+      }
+      else
+      {
+        value = data.get(column);
+      }
     }
     else
@@ -176 +184 @@
   // -------------------------------------------
 
+  /**
+    Set to TRUE to ignore non-existing columns. Set to FALSE to
+    throw an exception (default).
+    @since 2.6
+  */
+  public void setIgnoreNonExistingColumns(boolean ignoreNonExistingColumns)
+  {
+    this.ignoreNonExistingColumns = ignoreNonExistingColumns;
+  }
+  
   public void setData(FlatFileParser.Data data)
   {

trunk/src/core/net/sf/basedb/util/parser/FlatFileParser.java

@@ -247 +247 @@
 
   /**
+    If non-existing columns should be ignored (true) or result in an
+    exception (false) 
+  */
+  private boolean ignoreNonExistingColumns = false;
+
+  /**
     If <code>null</code> should be returned for the string NULL (ignoring case)
     or not. 
@@ -849 +855 @@
   
   /**
+    Specify if trying to create a mapper with one of the {@link #getMapper(String)}
+    methods for an expression which references a non-existing column should
+    result in an exception or be ignored.
+    @param ignoreNonExistingColumns TRUE to ignore, or FALSE to throw an exception
+    @since 2.6
+  */
+  public void setIgnoreNonExistingColumns(boolean ignoreNonExistingColumns)
+  {
+    this.ignoreNonExistingColumns = ignoreNonExistingColumns;
+  }
+  
+  /**
     Get a mapper using the default number format. 
     @see #getMapper(String, NumberFormat, boolean)
@@ -917 +935 @@
     else if (expression.startsWith("="))
     {
-      mapper = new JepMapper(expression.substring(1), columnHeaders, numberFormat);
+      mapper = new JepMapper(expression.substring(1), columnHeaders, numberFormat, ignoreNonExistingColumns);
       if (nullIfException) mapper = new NullIfExceptionMapper(mapper);
     }
@@ -946 +964 @@
             if (column == null)
             {
-              throw new BaseException("Column '" + name + "' not found in column headers.");
+              if (!ignoreNonExistingColumns)
+              {
+                throw new BaseException("Column '" + name + "' not found in column headers.");
+              }
             }
-            mappers.add(new ColumnMapper(column, name, numberFormat, nullIfException));
+            else
+            {
+              mappers.add(new ColumnMapper(column, name, numberFormat, nullIfException));
+            }
           }
         }
@@ -957 +981 @@
         mappers.add(new ConstantMapper(expression.substring(nextStart), numberFormat, nullIfException));
       }
-      if (mappers.size() == 1)
+      if (mappers.size() == 0)
+      {
+        mapper = new ConstantMapper(emptyIsNull ? null : "", numberFormat, nullIfException);
+      }
+      else if (mappers.size() == 1)
       {
         mapper = mappers.get(0);

trunk/src/core/net/sf/basedb/util/parser/JepMapper.java

@@ -70 +70 @@
   public JepMapper(String expression, List<String> columnHeaders)
   {
-    this(expression, columnHeaders, null);
+    this(expression, columnHeaders, null, false);
   }
   
   public JepMapper(String expression, List<String> columnHeaders, NumberFormat numberFormat)
   {
+    this(expression, columnHeaders, numberFormat, false);
+  }
+
+  public JepMapper(String expression, List<String> columnHeaders, NumberFormat numberFormat,
+    boolean ignoreNonExistingColumns)
+  {
     this.expression = expression;
     this.numberFormat = numberFormat;
     this.colFunction = new ColFunction(columnHeaders, numberFormat);
+    colFunction.setIgnoreNonExistingColumns(ignoreNonExistingColumns);
     this.lineNoFunction = expression.contains("lineNo()") ? new LineNoFunction() : null;
     this.hasLineNo = lineNoFunction != null;
@@ -86 +93 @@
     this.parser = Jep.newJep(expression, colFunction, lineNoFunction, dataNoFunction);
   }
+  
   
   /*