Changeset 7722

Timestamp:

Jun 4, 2019, 1:36:40 PM (2 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #2182: Add an option to trim away white-space when parsing files

File:

• branches/3.15-stable/src/core/net/sf/basedb/util/parser/FlatFileParser.java (modified) (9 diffs)

branches/3.15-stable/src/core/net/sf/basedb/util/parser/FlatFileParser.java

@@ -268 +268 @@
   
   /**
+    If white space should be trimmed from data values or not.
+    Default is false.
+    @since 3.15.1
+  */
+  private boolean trimWhiteSpace;
+  
+  /**
     The regular expression for matching the data footer line.
   */
@@ -511 +518 @@
   {
     this.trimQuotes = trimQuotes;
+  }
+  
+  /**
+    Set a flag indicating if white-space should be trimmed from
+    start and end of data values. The default setting is false.
+    @param trimWhiteSpace TRUE to remove white-space, FALSE to keep them
+    @since 3.15.1
+   */
+  public void setTrimWhiteSpace(boolean trimWhiteSpace)
+  {
+    this.trimWhiteSpace = trimWhiteSpace;
   }
 
@@ -947 +965 @@
             lines.add(new Line(parsedLines, line, LineType.DATA));
             parsedDataLines = 1;
-            nextData = new Data(parsedLines, parsedDataLines, line, columns, emptyIsNull, nullIsNull);
+            nextData = new Data(parsedLines, parsedDataLines, line, columns, emptyIsNull, nullIsNull, trimWhiteSpace);
           }
         }
@@ -1472 +1490 @@
               if (excelSheet != null)
               {
-                nextData = new ExcelData(excelSheet, excelParsedLinesOffset, parsedLines, parsedDataLines, line, columns, emptyIsNull, nullIsNull);
+                nextData = new ExcelData(excelSheet, excelParsedLinesOffset, parsedLines, parsedDataLines, line, columns, emptyIsNull, nullIsNull, trimWhiteSpace);
               }
               else
               {
-                nextData = new Data(parsedLines, parsedDataLines, line, columns, emptyIsNull, nullIsNull);
+                nextData = new Data(parsedLines, parsedDataLines, line, columns, emptyIsNull, nullIsNull, trimWhiteSpace);
               }
             }
@@ -1897 +1915 @@
     private final boolean emptyIsNull;
     private final boolean nullIsNull;
+    private final boolean trimWhiteSpace;
 
     /**
       Create a new data object.
     */
-    private Data(int lineNo, int dataLineNo, String line, String[] columns, boolean emptyIsNull, boolean nullIsNull)
+    private Data(int lineNo, int dataLineNo, String line, String[] columns, boolean emptyIsNull, boolean nullIsNull, boolean trimWhiteSpace)
     {
       this.lineNo = lineNo;
@@ -1909 +1928 @@
       this.emptyIsNull = emptyIsNull;
       this.nullIsNull = nullIsNull;
+      this.trimWhiteSpace = trimWhiteSpace;
     }
     
@@ -1991 +2011 @@
     protected String fixString(String value)
     {
+      // TODO - In Java 11 we can use String.strip() which also handles other white-space than "space"
+      if (value != null && trimWhiteSpace) value = value.trim();      
+      
       return value == null || 
         emptyIsNull && value.length() == 0 || 
@@ -1997 +2020 @@
     }
     
-    
     /**
       Shortcut for getInt(index, null, true)
@@ -2086 +2108 @@
       Create a new data object.
     */
-    ExcelData(SheetInfo sheet, int lineOffset, int lineNo, int dataLineNo, String line, String[] columns, boolean emptyIsNull, boolean nullIsNull)
-    {
-      super(lineNo, dataLineNo, line, columns, emptyIsNull, nullIsNull);
+    ExcelData(SheetInfo sheet, int lineOffset, int lineNo, int dataLineNo, String line, String[] columns, boolean emptyIsNull, boolean nullIsNull, boolean trimWhiteSpace)
+    {
+      super(lineNo, dataLineNo, line, columns, emptyIsNull, nullIsNull, trimWhiteSpace);
       this.sheet = sheet;
       this.rowOffset = sheet.getFirstRow()-1-lineOffset;