svn commit: r1243159 - in /incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset: JSONInput.java XMLInput.java

[an...@apache.org]

Author: andy
Date: Sat Feb 11 22:01:48 2012
New Revision: 1243159

URL: http://svn.apache.org/viewvc?rev=1243159&view=rev
Log:
Support for boolean results in application/sparql-results+json

Modified:
    incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONInput.java
    incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInput.java

Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONInput.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONInput.java?rev=1243159&r1=1243158&r2=1243159&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONInput.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONInput.java Sat Feb 11 22:01:48 2012
@@ -64,6 +64,17 @@ public class JSONInput extends SPARQLRes
         return r.getResultSet() ; 
     }
     
+    public static boolean booleanFromJSON(InputStream input)
+    {
+        SPARQLResult r = new JSONInput().process(input, null) ;
+        return r.getBooleanResult() ; 
+    }
+    
+    public static SPARQLResult make(InputStream input)
+    {
+        return make(input, null) ;
+    }
+    
     public static SPARQLResult make(InputStream input, Model model)
     {
         return new JSONInput().process(input, model) ;
@@ -93,6 +104,8 @@ public class JSONInput extends SPARQLRes
     private SPARQLResult process(InputStream in, Model model)
     {
         parse(in) ;
+        if ( model == null )
+            model = GraphFactory.makeJenaDefaultModel() ;
         if ( rows != null )
         {
             QueryIterator qIter = new QueryIterPlainWrapper(rows.iterator()) ;

Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInput.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInput.java?rev=1243159&r1=1243158&r2=1243159&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInput.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInput.java Sat Feb 11 22:01:48 2012
@@ -18,12 +18,17 @@
 
 package com.hp.hpl.jena.sparql.resultset;
 
+import java.io.ByteArrayInputStream ;
+import java.io.IOException ;
 import java.io.InputStream ;
 
+import org.openjena.atlas.io.IO ;
+
 import com.hp.hpl.jena.query.ARQ ;
 import com.hp.hpl.jena.query.ResultSet ;
 import com.hp.hpl.jena.rdf.model.Model ;
 import com.hp.hpl.jena.sparql.util.RefBoolean ;
+import com.hp.hpl.jena.util.FileUtils ;
 
 /** Code that reads an XML Result Set and builds the ARQ structure for the same. */
 
@@ -68,6 +73,12 @@ public class XMLInput
     
     public static SPARQLResult make(InputStream in, Model model)
     {
+        try {
+            String x = FileUtils.readWholeFileAsUTF8(in) ;
+            System.out.println(x) ;
+            in = new ByteArrayInputStream(x.getBytes("utf-8")) ; 
+        } catch (IOException ex) { IO.exception(ex) ; }
+        
         if ( useSAX.getValue() )
             return new XMLInputSAX(in, model) ;
         return new XMLInputStAX(in, model) ;