svn commit: r1590594 - in /jena/trunk/jena-arq/src/main/java/org: apache/jena/riot/RiotReader.java openjena/riot/RiotReader.java

[rvesse]

Author: rvesse
Date: Mon Apr 28 10:38:51 2014
New Revision: 1590594

URL: http://svn.apache.org/r1590594
Log:
Add overloads that allow specifying whether to use ASCII or UTF-8 (JENA-688)

Modified:
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotReader.java

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java?rev=1590594&r1=1590593&r2=1590594&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java 
(original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java Mon 
Apr 28 10:38:51 2014
@@ -38,6 +38,7 @@ import org.apache.jena.atlas.iterator.It
 import org.apache.jena.atlas.json.io.parser.TokenizerJSON ;
 import org.apache.jena.atlas.lib.Sink ;
 import org.apache.jena.riot.lang.* ;
+import org.apache.jena.riot.out.CharSpace;
 import org.apache.jena.riot.system.ErrorHandlerFactory ;
 import org.apache.jena.riot.system.IRIResolver ;
 import org.apache.jena.riot.system.RiotLib ;
@@ -391,7 +392,16 @@ public class RiotReader
     @Deprecated
     public static LangNTriples createParserNTriples(InputStream input, 
StreamRDF dest)
     {
-        Tokenizer tokenizer = TokenizerFactory.makeTokenizerUTF8(input) ;
+        return createParserNTriples(input, CharSpace.UTF8, dest) ;
+    }
+    
+    /** Create a parser for N-Triples
+     * @deprecated use an RDFDataMgr operation with argument Lang.NTRIPLES
+     */
+    @Deprecated
+    public static LangNTriples createParserNTriples(InputStream input, 
CharSpace charSpace, StreamRDF dest)
+    {
+        Tokenizer tokenizer = charSpace == CharSpace.ASCII ? 
TokenizerFactory.makeTokenizerASCII(input) : 
TokenizerFactory.makeTokenizerUTF8(input) ;
         return createParserNTriples(tokenizer, dest) ;
     }
     
@@ -408,7 +418,16 @@ public class RiotReader
     @Deprecated
     public static LangNQuads createParserNQuads(InputStream input, StreamRDF 
dest)
     {
-        Tokenizer tokenizer = TokenizerFactory.makeTokenizerUTF8(input) ;
+        return createParserNQuads(input, CharSpace.UTF8, dest) ;
+    }
+    
+    /** Create a parser for NQuads
+     * @deprecated use an RDFDataMgr operation with argument Lang.NQUADS)
+     */
+    @Deprecated
+    public static LangNQuads createParserNQuads(InputStream input, CharSpace 
charSpace, StreamRDF dest)
+    {
+        Tokenizer tokenizer = charSpace == CharSpace.ASCII ? 
TokenizerFactory.makeTokenizerASCII(input) : 
TokenizerFactory.makeTokenizerUTF8(input) ;
         return createParserNQuads(tokenizer, dest) ;
     }
     

Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotReader.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotReader.java?rev=1590594&r1=1590593&r2=1590594&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotReader.java 
(original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotReader.java Mon Apr 
28 10:38:51 2014
@@ -41,6 +41,7 @@ import org.apache.jena.riot.lang.LangTur
 import org.apache.jena.riot.lang.PipedQuadsStream ;
 import org.apache.jena.riot.lang.PipedRDFIterator ;
 import org.apache.jena.riot.lang.PipedTriplesStream ;
+import org.apache.jena.riot.out.CharSpace;
 import org.apache.jena.riot.system.* ;
 import org.apache.jena.riot.tokens.Tokenizer ;
 import org.apache.jena.riot.tokens.TokenizerFactory ;
@@ -335,7 +336,13 @@ public class RiotReader
     /** Create a parser for N-Triples, with default behaviour */
     public static LangNTriples createParserNTriples(InputStream input, 
StreamRDF dest)
     {
-        Tokenizer tokenizer = TokenizerFactory.makeTokenizerUTF8(input) ;
+        return createParserNTriples(input, CharSpace.UTF8, dest) ;
+    }
+    
+    /** Create a parser for N-Triples, with default behaviour */
+    public static LangNTriples createParserNTriples(InputStream input, 
CharSpace charSpace, StreamRDF dest)
+    {
+        Tokenizer tokenizer = charSpace == CharSpace.ASCII ? 
TokenizerFactory.makeTokenizerASCII(input) : 
TokenizerFactory.makeTokenizerUTF8(input) ;
         return createParserNTriples(tokenizer, dest) ;
     }
     
@@ -349,7 +356,13 @@ public class RiotReader
     /** Create a parser for NQuads, with default behaviour */
     public static LangNQuads createParserNQuads(InputStream input, StreamRDF 
dest)
     {
-        Tokenizer tokenizer = TokenizerFactory.makeTokenizerUTF8(input) ;
+        return createParserNQuads(input, CharSpace.UTF8, dest) ;
+    }
+    
+    /** Create a parser for NQuads, with default behaviour */
+    public static LangNQuads createParserNQuads(InputStream input, CharSpace 
charSpace, StreamRDF dest)
+    {
+        Tokenizer tokenizer = charSpace == CharSpace.ASCII ? 
TokenizerFactory.makeTokenizerASCII(input) : 
TokenizerFactory.makeTokenizerUTF8(input) ;
         return createParserNQuads(tokenizer, dest) ;
     }