svn commit: r1617105 - in /jena/trunk/jena-arq/src: main/java/org/apache/jena/riot/system/IRILib.java test/java/org/apache/jena/riot/lang/TestLangCSV.java

[jp...@apache.org]

Author: jpz6311whu
Date: Sun Aug 10 13:30:14 2014
New Revision: 1617105

URL: http://svn.apache.org/r1617105
Log:
JENA-625 fix the bugs of the '£' character in csv file during parsing

Modified:
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/IRILib.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangCSV.java

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/IRILib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/IRILib.java?rev=1617105&r1=1617104&r2=1617105&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/IRILib.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/IRILib.java Sun Aug 10 13:30:14 2014
@@ -46,7 +46,7 @@ public class IRILib
       '=', '+', '$', ',', '/', '?', '%', '#', '[', ']'} ;
 
     // No allowed in URIs
-    private static char uri_non_chars[] = { '<', '>', '{', '}', '|', '\\', '`', '^', ' ',  '\n', '\r', '\t' } ;
+    private static char uri_non_chars[] = { '<', '>', '{', '}', '|', '\\', '`', '^', ' ',  '\n', '\r', '\t', '£' } ;
     
     // RFC 2396
     //private static char uri_unwise[]    = { '{' , '}', '|', '\\', '^', '[', ']', '`' } ;
@@ -57,7 +57,7 @@ public class IRILib
     { '!', '*', '"', '\'', '(', ')', ';', ':', '@', '&', 
       '=', '+', '$', ',', '/', '?', '%', '#', '[', ']',
       '{', '}', '|', '\\', '`', '^',
-      ' ', '<', '>', '\n', '\r', '\t' } ;
+      ' ', '<', '>', '\n', '\r', '\t', '£' } ;
     
     private static char[] charsFilename =
         // reserved, + non-chars + nasties.

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangCSV.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangCSV.java?rev=1617105&r1=1617104&r2=1617105&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangCSV.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangCSV.java Sun Aug 10 13:30:14 2014
@@ -18,18 +18,19 @@
 
 package org.apache.jena.riot.lang;
 
-import java.io.StringReader ;
+import java.io.StringReader;
 
-import org.apache.jena.atlas.junit.BaseTest ;
-import org.apache.jena.atlas.lib.StrUtils ;
-import org.apache.jena.riot.Lang ;
-import org.apache.jena.riot.RDFDataMgr ;
-import org.apache.jena.riot.RDFLanguages ;
-import org.apache.jena.riot.system.IRIResolver ;
-import org.junit.Test ;
-
-import com.hp.hpl.jena.rdf.model.Model ;
-import com.hp.hpl.jena.rdf.model.ModelFactory ;
+import org.apache.jena.atlas.junit.BaseTest;
+import org.apache.jena.atlas.lib.StrUtils;
+import org.apache.jena.riot.Lang;
+import org.apache.jena.riot.RDFDataMgr;
+import org.apache.jena.riot.RDFLanguages;
+import org.apache.jena.riot.system.IRIResolver;
+import org.junit.Test;
+
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.util.PrintUtil;
 
 public class TestLangCSV extends BaseTest {
 	private static final String FILE_NAME = "src/test/resources/test.csv";
@@ -66,6 +67,16 @@ public class TestLangCSV extends BaseTes
 	}
 
 	@Test
+	public void testMoney() {
+		String[] s1 = { "£", "£" };
+		String[] s2 = {
+				//"<"+ LangCSV.caculateSubject(1, FILE_NAME) + "> <" + FILE_URI + "#1234> 'DigitalLocalName' ; ",
+				" [] <" + FILE_URI + "#%A3> '£' ; ",
+				" <http://w3c/future-csv-vocab/row> 1 ." };
+		assertIsomorphicWith(s1, s2);
+	}
+	
+	@Test
 	public void RDFDataMgrReadTest() {
 		Model m1 = RDFDataMgr.loadModel(FILE_NAME, RDFLanguages.CSV);
 		Model m2 = ModelFactory.createDefaultModel();