You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by rv...@apache.org on 2013/08/28 19:52:04 UTC
svn commit: r1518300 - in
/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot:
system/StreamRDFLib.java writer/NQuadsWriter.java writer/NTriplesWriter.java
Author: rvesse
Date: Wed Aug 28 17:52:03 2013
New Revision: 1518300
URL: http://svn.apache.org/r1518300
Log:
Fix NQUADS_ASCII and NTRIPLES_ASCII to actually use ASCII complaint triples
The CharSpace was not being propagated to the tuples writer so even when these languages were used raw UTF-8 was still being output
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/NQuadsWriter.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/NTriplesWriter.java
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java?rev=1518300&r1=1518299&r2=1518300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java Wed Aug 28 17:52:03 2013
@@ -27,6 +27,7 @@ import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.lib.Sink ;
import org.apache.jena.atlas.lib.Tuple ;
import org.apache.jena.riot.lang.StreamRDFCounting ;
+import org.apache.jena.riot.out.CharSpace;
import org.apache.jena.riot.writer.WriterStreamRDFTuples ;
import com.hp.hpl.jena.graph.Graph ;
@@ -46,6 +47,27 @@ public class StreamRDFLib
public static StreamRDF writer(OutputStream out) { return new WriterStreamRDFTuples(IO.wrapUTF8(out)) ; }
public static StreamRDF writer(AWriter out) { return new WriterStreamRDFTuples(out) ; }
public static StreamRDF writer(Writer out) { return new WriterStreamRDFTuples(IO.wrap(out)) ; }
+
+ public static StreamRDF writer(OutputStream out, CharSpace charSpace)
+ {
+ switch (charSpace) {
+ case ASCII:
+ return new WriterStreamRDFTuples(IO.wrapASCII(out), charSpace);
+ case UTF8:
+ default:
+ return writer(out);
+ }
+ }
+
+ public static StreamRDF writer(AWriter out, CharSpace charSpace)
+ {
+ return new WriterStreamRDFTuples(out, charSpace);
+ }
+
+ public static StreamRDF writer(Writer out, CharSpace charSpace)
+ {
+ return new WriterStreamRDFTuples(IO.wrap(out), charSpace);
+ }
public static StreamRDF graph(Graph graph) { return new ParserOutputGraph(graph) ; }
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/NQuadsWriter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/NQuadsWriter.java?rev=1518300&r1=1518299&r2=1518300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/NQuadsWriter.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/NQuadsWriter.java Wed Aug 28 17:52:03 2013
@@ -36,13 +36,23 @@ public class NQuadsWriter extends Writer
{
public static void write(OutputStream out, Iterator<Quad> iter)
{
- StreamRDF s = StreamRDFLib.writer(out) ;
+ write(out, iter, CharSpace.UTF8);
+ }
+
+ public static void write(OutputStream out, Iterator<Quad> iter, CharSpace charSpace)
+ {
+ StreamRDF s = StreamRDFLib.writer(out, charSpace) ;
write$(s, iter) ;
}
public static void write(Writer out, Iterator<Quad> iter)
{
- StreamRDF s = StreamRDFLib.writer(out) ;
+ write(out, iter, CharSpace.UTF8);
+ }
+
+ public static void write(Writer out, Iterator<Quad> iter, CharSpace charSpace)
+ {
+ StreamRDF s = StreamRDFLib.writer(out, charSpace) ;
write$(s, iter) ;
}
@@ -72,12 +82,12 @@ public class NQuadsWriter extends Writer
@Override
public void write(Writer out, DatasetGraph dataset, PrefixMap prefixMap, String baseURI, Context context)
{
- write(out, dataset.find(null, null, null, null)) ;
+ write(out, dataset.find(null, null, null, null), this.charSpace) ;
}
@Override
public void write(OutputStream out, DatasetGraph dataset, PrefixMap prefixMap, String baseURI, Context context)
{
- write(out, dataset.find(null, null, null, null)) ;
+ write(out, dataset.find(null, null, null, null), this.charSpace) ;
}
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/NTriplesWriter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/NTriplesWriter.java?rev=1518300&r1=1518299&r2=1518300&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/NTriplesWriter.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/writer/NTriplesWriter.java Wed Aug 28 17:52:03 2013
@@ -40,13 +40,23 @@ public class NTriplesWriter extends Writ
{
public static void write(OutputStream out, Iterator<Triple> iter)
{
- StreamRDF s = StreamRDFLib.writer(out) ;
+ write(out, iter, CharSpace.UTF8);
+ }
+
+ public static void write(OutputStream out, Iterator<Triple> iter, CharSpace charSpace)
+ {
+ StreamRDF s = StreamRDFLib.writer(out, charSpace) ;
write$(s, iter) ;
}
public static void write(Writer out, Iterator<Triple> iter)
{
- StreamRDF s = StreamRDFLib.writer(out) ;
+ write(out, iter, CharSpace.UTF8);
+ }
+
+ public static void write(Writer out, Iterator<Triple> iter, CharSpace charSpace)
+ {
+ StreamRDF s = StreamRDFLib.writer(out, charSpace) ;
write$(s, iter) ;
}