adjustements to the csv parser method

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/EcologicalEngine@82436 82a268e6-3cf1-43bd-a215-b396298e98cf

input.csv

@@ -1,10 +0,0 @@
-5.1,3.5
-4.9,3.0
-4.7,3.2
-4.6,3.1
-5.0,3.6
-5.4,3.9
-4.6,3.4
-5.0,3.4
-4.4,2.9
-4.9,3.1

pom.xml

@@ -9,7 +9,7 @@
 	</parent>
 	<groupId>org.gcube.dataanalysis</groupId>
 	<artifactId>ecological-engine</artifactId>
-	<version>1.7.0-SNAPSHOT</version>
+	<version>1.7.1-SNAPSHOT</version>
 	<name>ecological-engine</name>
 	<description>ecological-engine library</description>
 	<properties>

src/main/java/org/gcube/dataanalysis/ecoengine/utils/Transformations.java

@@ -65,12 +65,10 @@ public class Transformations {
 			}
 
 			return columns;
-		}
+		} else
-		else
 			return null;
 	}
 
-	
 	// gets a column from a matrix
 	public static double[] getColumn(int index, double[][] matrix) {
 		int colulen = matrix.length;
@@ -90,7 +88,6 @@ public class Transformations {
 
 	}
 
-	
 	// merge matrixes: puts the rows of a matrix under another matrix
 	public static double[][] mergeMatrixes(double[][] matrix1, double[][] matrix2) {
 
@@ -125,13 +122,10 @@ public class Transformations {
 		return out;
 	}
 
-	
 	public static Object getObjectFromFile(String file) throws Exception {
 
 		/*
-		FileInputStream fis = new FileInputStream(file);
+		 * FileInputStream fis = new FileInputStream(file); ObjectInputStream ois = new ObjectInputStream(fis); return ois.readObject();
-		ObjectInputStream ois = new ObjectInputStream(fis);
-		return ois.readObject();
 		 */
 		XStream xstream = new XStream();
 		return xstream.fromXML(new FileInputStream(file));
@@ -145,9 +139,7 @@ public class Transformations {
 		bw.write(xstream.toXML(toWrite));
 		bw.close();
 		/*
-		FileOutputStream fos = new FileOutputStream(file);
+		 * FileOutputStream fos = new FileOutputStream(file); ObjectOutputStream ois = new ObjectOutputStream(fos); ois.writeObject(toWrite);
-		ObjectOutputStream ois = new ObjectOutputStream(fos);
-		ois.writeObject(toWrite);
 		 */
 	}
 
@@ -185,10 +177,12 @@ public class Transformations {
 		return d;
 	}
 
-	
 	public static void main(String[] args) throws Exception {
+		String in = "h,t,,,,k,";
+		in = "Salmo lucidus (Richardson 1836)\",\"Salmo lucidus\",\"Richardson 1836\",\"SIMPLE\",0.6547619047619048,\"ASFIS\",\"APL\",\"Plantae aquaticae\",\"\",\"\",\"PLANTAE AQUATICAE MISCELLANEA\",\"Aquatic plants nei\",\"Plantes aquatiques nca\",\"Plantas acuáticas nep\"";
+
+		List<String> ll = Transformations.parseCVSString(in, ",");
 
-		List<String> ll = Transformations.parseCVSString("h,t,,,,k,", ",");
 		for (String l : ll) {
 			System.out.println(l);
 		}
@@ -215,26 +209,36 @@ public class Transformations {
 			quot = phrase.startsWith("\"");
 			if (quot) {
 				phrase = phrase.substring(1);
+				String quoted = "";
+				if (phrase.startsWith("\""))
+					phrase = phrase.substring(1);
+				else{
 					RE regexp = new RE("[^\\\\]\"");
 					boolean matching = regexp.match(phrase);
-				String quoted = "";
+
 					if (matching) {
 						int i0 = regexp.getParenStart(0);
 						quoted = phrase.substring(0, i0 + 1).trim();
 						phrase = phrase.substring(i0 + 2).trim();
 					}
+				}
 
 				if (phrase.startsWith(delimiter))
 					phrase = phrase.substring(1);
 
 				elements.add(quoted);
 
-			}
+			} else {
-			else{	
 				elements.add(phrase.substring(0, idxdelim));
 				phrase = phrase.substring(idxdelim + 1).trim();
 			}
 		}
+		if (phrase.startsWith("\""))
+			phrase = phrase.substring(1);
+
+		if (phrase.endsWith("\""))
+			phrase = phrase.substring(0, phrase.length() - 1);
+
 		elements.add(phrase);
 
 		return elements;

target/maven-archiver/pom.properties

@@ -0,0 +1,5 @@
+#Generated by Maven
+#Thu Oct 03 09:52:55 CEST 2013
+version=1.7.1-SNAPSHOT
+groupId=org.gcube.dataanalysis
+artifactId=ecological-engine

target/profile.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<ID></ID>
+	<Type>Library</Type>
+	<Profile>
+		<Description>Ecological Engine Library</Description>
+		<Class>EcologicalEngine</Class>
+	<Name>ecological-engine</Name>
+		<Version>1.0.0</Version>
+		<Packages>
+			<Software>
+				<Name>ecological-engine</Name>
+				<Version>1.7.1-SNAPSHOT</Version>
+				<MavenCoordinates>
+					<groupId>org.gcube.dataanalysis</groupId>
+					<artifactId>ecological-engine</artifactId>
+					<version>1.7.1-SNAPSHOT</version>
+				</MavenCoordinates>
+				<Files>
+					<File>ecological-engine-1.7.1-SNAPSHOT.jar</File>
+				</Files>
+			</Software>
+		</Packages>
+	</Profile>
+</Resource>