Author: jm
Date: 2012-08-09 13:35:10 -0700 (Thu, 09 Aug 2012)
New Revision: 30143
Modified:
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/datatable/CSVCyReader.java
core3/impl/trunk/io-impl/impl/src/test/java/org/cytoscape/io/internal/read/datatable/CSVCyReaderTest.java
Log:
Fixes #1352: Changed CSVCyReader so that no character is treated like an escape
character. Fixed tests that had spurious escapes which failed because we no
longer allow escaping.
Modified:
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/datatable/CSVCyReader.java
===================================================================
---
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/datatable/CSVCyReader.java
2012-08-09 20:00:42 UTC (rev 30142)
+++
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/datatable/CSVCyReader.java
2012-08-09 20:35:10 UTC (rev 30143)
@@ -57,7 +57,7 @@
public void run(TaskMonitor taskMonitor) throws Exception {
taskMonitor.setProgress(0.0);
- CSVReader reader = new CSVReader(new InputStreamReader(stream,
encoding));
+ CSVReader reader = new CSVReader(new InputStreamReader(stream,
encoding), ',', '"', '\0');
taskMonitor.setProgress(0.2);
TableInfo info = readHeader(reader);
Modified:
core3/impl/trunk/io-impl/impl/src/test/java/org/cytoscape/io/internal/read/datatable/CSVCyReaderTest.java
===================================================================
---
core3/impl/trunk/io-impl/impl/src/test/java/org/cytoscape/io/internal/read/datatable/CSVCyReaderTest.java
2012-08-09 20:00:42 UTC (rev 30142)
+++
core3/impl/trunk/io-impl/impl/src/test/java/org/cytoscape/io/internal/read/datatable/CSVCyReaderTest.java
2012-08-09 20:35:10 UTC (rev 30143)
@@ -41,7 +41,7 @@
@Test
public void testReadSimple() throws Exception {
- String data = "SUID\r\njava.lang.Long\r\ntest
table,\"public\\,mutable\"\r\n5\r\n6";
+ String data = "SUID\r\njava.lang.Long\r\ntest
table,\"public,mutable\"\r\n5\r\n6";
CSVCyReader reader = new CSVCyReader(createStream(data), true,
/* handleEquations = */
false, tableFactory, null, "UTF-8");
reader.run(taskMonitor);
@@ -62,7 +62,7 @@
@Test
public void testReadString() throws Exception {
- String data =
"SUID,name\r\njava.lang.Long,java.lang.String\r\ntest
table,\"public\\,mutable\"\r\n1,Alice\r\n2,Bob\r\n3,Carol";
+ String data =
"SUID,name\r\njava.lang.Long,java.lang.String\r\ntest
table,\"public,mutable\"\r\n1,Alice\r\n2,Bob\r\n3,Carol";
CSVCyReader reader = new CSVCyReader(createStream(data), true,
/* handleEquations = */
false, tableFactory, null, "UTF-8");
reader.run(taskMonitor);
@@ -74,7 +74,7 @@
@Test
public void testReadDouble() throws Exception {
- String data =
"SUID,weight\r\njava.lang.Long,java.lang.Double\r\ntest
table,\"public\\,mutable\"\r\n0,0.56\r\n-5,-1.234";
+ String data =
"SUID,weight\r\njava.lang.Long,java.lang.Double\r\ntest
table,\"public,mutable\"\r\n0,0.56\r\n-5,-1.234";
CSVCyReader reader = new CSVCyReader(createStream(data), true,
/* handleEquations = */
false, tableFactory, null, "UTF-8");
reader.run(taskMonitor);
@@ -86,7 +86,7 @@
@Test
public void testReadBoolean() throws Exception {
- String data =
"SUID,hidden\r\njava.lang.Long,java.lang.Boolean\r\ntest
table,\"public\\,mutable\"\r\n30,true\r\n40,false\r\n50,true";
+ String data =
"SUID,hidden\r\njava.lang.Long,java.lang.Boolean\r\ntest
table,\"public,mutable\"\r\n30,true\r\n40,false\r\n50,true";
CSVCyReader reader = new CSVCyReader(createStream(data), true,
/* handleEquations = */
false, tableFactory, null, "UTF-8");
reader.run(taskMonitor);
@@ -98,7 +98,7 @@
@Test
public void testReadList() throws Exception {
- String data =
"SUID,list\r\njava.lang.Long,java.util.List<java.lang.String>\r\ntest
table,\"public\\,mutable\"\r\n1,\"a\rb\rc\"";
+ String data =
"SUID,list\r\njava.lang.Long,java.util.List<java.lang.String>\r\ntest
table,\"public,mutable\"\r\n1,\"a\rb\rc\"";
CSVCyReader reader = new CSVCyReader(createStream(data), true,
/* handleEquations = */
false, tableFactory, null, "UTF-8");
reader.run(taskMonitor);
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
