Improve CSV parser and writer

[lgpl/argeo-commons.git] / basic / runtime / org.argeo.basic.nodeps / src / main / java / org / argeo / util / CsvParser.java

diff --git a/basic/runtime/org.argeo.basic.nodeps/src/main/java/org/argeo/util/CsvParser.java b/basic/runtime/org.argeo.basic.nodeps/src/main/java/org/argeo/util/CsvParser.java
index 3a429f4adc23a634dfcff402203a20e2c83e04d0..7e218c55ceaff4e9afa6811f0497a7ef796e1a8d 100644 (file)
--- a/basic/runtime/org.argeo.basic.nodeps/src/main/java/org/argeo/util/CsvParser.java
+++ b/basic/runtime/org.argeo.basic.nodeps/src/main/java/org/argeo/util/CsvParser.java
@@ -71,14 +71,19 @@ public abstract class CsvParser {
 
                        String line = null;
                        lines: while ((line = reader.readLine()) != null) {
+                               line = preProcessLine(line);
+                               if (line == null) {
+                                       // skip line
+                                       continue lines;
+                               }
                                lineCount++;
                                List<String> tokens = new ArrayList<String>();
                                StringBuffer currStr = new StringBuffer("");
                                Boolean wasInquote = false;
-                               while (parseLine(line, tokens, currStr, wasInquote)) {
+                               sublines: while (parseLine(line, tokens, currStr, wasInquote)) {
                                        line = reader.readLine();
                                        if (line == null)
-                                               break;
+                                               break sublines;
                                        wasInquote = true;
                                }
                                if (!noHeader && strictLineAsLongAsHeader) {
@@ -111,6 +116,15 @@ public abstract class CsvParser {
                }
        }
 
+       /**
+        * Called before each (logical) line is processed, giving a change to modify
+        * it (typically for cleaning dirty files). To be overridden, return the
+        * line unchanged by default. Skip the line if 'null' is returned.
+        */
+       protected String preProcessLine(String line) {
+               return line;
+       }
+
        /**
         * Parses a line character by character for performance purpose
         *