X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=basic%2Fruntime%2Forg.argeo.basic.nodeps%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Futil%2FCsvParser.java;h=127d0f50928f9b358c5f376a9ba8704f9d9ba697;hb=1d5afdce3e91054f07ddd3c98309c363b4cf1d46;hp=c20f4e07c684c90902cef9fd473e16410286d64f;hpb=7215a19b3ee12587e9d8298c9afd576bf087b017;p=lgpl%2Fargeo-commons.git

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 c20f4e07c..127d0f509 100644
--- 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Mathieu Baudier
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.util;
 
 import java.io.BufferedReader;
@@ -40,11 +55,17 @@ public abstract class CsvParser {
 			List<String> header, List<String> tokens);
 
 	public synchronized void parse(InputStream in) {
+		parse(in, null);
+	}
+
+	public synchronized void parse(InputStream in, String encoding) {
 		BufferedReader reader = null;
 		Integer lineCount = 0;
 		try {
-			reader = new BufferedReader(new InputStreamReader(in));
-
+			if (encoding == null)
+				reader = new BufferedReader(new InputStreamReader(in));
+			else
+				reader = new BufferedReader(new InputStreamReader(in, encoding));
 			List<String> header = null;
 			if (!noHeader) {
 				String headerStr = reader.readLine();
@@ -65,14 +86,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) {
@@ -105,6 +131,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
 	 *