svn commit: r1306717 - in /incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot: RiotWriter.java out/NQuadsWriter.java out/NTriplesWriter.java

[sallen]

Author: sallen
Date: Thu Mar 29 04:46:57 2012
New Revision: 1306717

URL: http://svn.apache.org/viewvc?rev=1306717&view=rev
Log:
JENA-205 (Streaming results for CONSTRUCT queries).  Added iterator versions of 
NQuadsWriter and NTriplesWriter.

Modified:
    
incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/RiotWriter.java
    
incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/NQuadsWriter.java
    
incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/NTriplesWriter.java

Modified: 
incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/RiotWriter.java
URL: 
http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/RiotWriter.java?rev=1306717&r1=1306716&r2=1306717&view=diff
==============================================================================
--- 
incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/RiotWriter.java 
(original)
+++ 
incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/RiotWriter.java 
Thu Mar 29 04:46:57 2012
@@ -19,13 +19,16 @@
 package org.openjena.riot;
 
 import java.io.OutputStream ;
+import java.util.Iterator ;
 
 import org.openjena.riot.out.NQuadsWriter ;
 import org.openjena.riot.out.NTriplesWriter ;
 import org.openjena.riot.out.RDFJSONWriter ;
 
 import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.Triple ;
 import com.hp.hpl.jena.sparql.core.DatasetGraph ;
+import com.hp.hpl.jena.sparql.core.Quad ;
 
 /** Output RDF in various formats (unfinished) */
 public class RiotWriter
@@ -38,10 +41,20 @@ public class RiotWriter
         NQuadsWriter.write(out, dsg) ;
     }
     
+    public static void writeNQuads(OutputStream out, Iterator<Quad> it)
+    {
+        NQuadsWriter.write(out, it) ;
+    }
+    
     public static void writeTriples(OutputStream out, Graph graph)
     {
         NTriplesWriter.write(out, graph) ;
     }
+    
+    public static void writeTriples(OutputStream out, Iterator<Triple> it)
+    {
+        NTriplesWriter.write(out, it) ;
+    }
 
     public static void writeRDFJSON(OutputStream out, Graph graph)
     {

Modified: 
incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/NQuadsWriter.java
URL: 
http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/NQuadsWriter.java?rev=1306717&r1=1306716&r2=1306717&view=diff
==============================================================================
--- 
incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/NQuadsWriter.java
 (original)
+++ 
incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/NQuadsWriter.java
 Thu Mar 29 04:46:57 2012
@@ -34,10 +34,14 @@ public class NQuadsWriter
 {
     public static void write(OutputStream out, DatasetGraph dsg)
     {
+        write(out, dsg.find(Node.ANY, Node.ANY, Node.ANY, Node.ANY)) ;
+    }
+    
+    public static void write(OutputStream out, Iterator<Quad> iter)
+    {
         Prologue prologue = Prologue.create(null, null) ; // (null, 
graph.getPrefixMapping()) ;
         // Write prologue.
         Sink<Quad> sink = new SinkQuadOutput(out, prologue, 
SyntaxLabels.createNodeToLabel()) ;
-        Iterator<Quad> iter = dsg.find(Node.ANY, Node.ANY, Node.ANY, Node.ANY) 
;
         Iter.sendToSink(iter, sink) ;
     }
 }

Modified: 
incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/NTriplesWriter.java
URL: 
http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/NTriplesWriter.java?rev=1306717&r1=1306716&r2=1306717&view=diff
==============================================================================
--- 
incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/NTriplesWriter.java
 (original)
+++ 
incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/NTriplesWriter.java
 Thu Mar 29 04:46:57 2012
@@ -34,12 +34,14 @@ public class NTriplesWriter
 {
     public static void write(OutputStream out, Graph graph)
     {
+        write(out, graph.find(Node.ANY, Node.ANY, Node.ANY)) ;
+    }
+    
+    public static void write(OutputStream out, Iterator<Triple> iter)
+    {
         Prologue prologue = Prologue.create(null, null) ; // (null, 
graph.getPrefixMapping()) ;
         //NodeToLabel.createBNodeByLabelEncoded() ;
         Sink<Triple> sink = new SinkTripleOutput(out, prologue, 
SyntaxLabels.createNodeToLabel()) ;
-        Iterator<Triple> iter = graph.find(Node.ANY, Node.ANY, Node.ANY) ;
         Iter.sendToSink(iter, sink) ;
     }
-    
-   
 }