svn commit: r1377344 - in /jena/trunk/jena-arq/src/main/java: com/hp/hpl/jena/sparql/modify/UpdateProcessRemote.java com/hp/hpl/jena/sparql/modify/UpdateProcessRemoteForm.java org/openjena/riot/out/NQuadsWriter.java org/openjena/riot/web/HttpOp.java

[an...@apache.org]

Author: andy
Date: Sat Aug 25 20:09:22 2012
New Revision: 1377344

URL: http://svn.apache.org/viewvc?rev=1377344&view=rev
Log:
Fix update-by-form for certain content returns.
Check for null endpoint.
Add nquads write operation for a dataset.


Modified:
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemote.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemoteForm.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/NQuadsWriter.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/web/HttpOp.java

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemote.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemote.java?rev=1377344&r1=1377343&r2=1377344&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemote.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemote.java Sat Aug 25 20:09:22 2012
@@ -56,6 +56,8 @@ public class UpdateProcessRemote impleme
     @Override
     public void execute()
     {
+        if ( endpoint == null )
+            throw new ARQException("Null endpoint for remote update") ;
         String reqStr = request.toString() ;
         HttpOp.execHttpPost(endpoint, WebContent.contentTypeSPARQLUpdate, reqStr) ;
     }

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemoteForm.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemoteForm.java?rev=1377344&r1=1377343&r2=1377344&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemoteForm.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessRemoteForm.java Sat Aug 25 20:09:22 2012
@@ -64,6 +64,8 @@ public class UpdateProcessRemoteForm imp
     @Override
     public void execute()
     {
+        if ( endpoint == null )
+            throw new ARQException("Null endpoint for remote update by form") ;
         String reqStr = request.toString() ;
         List<Pair<String, String>> params = new ArrayList<Pair<String, String>>() ;
         params.add(Pair.create("update", reqStr)) ;

Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/NQuadsWriter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/NQuadsWriter.java?rev=1377344&r1=1377343&r2=1377344&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/NQuadsWriter.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/out/NQuadsWriter.java Sat Aug 25 20:09:22 2012
@@ -27,6 +27,7 @@ import org.openjena.riot.system.Prologue
 import org.openjena.riot.system.SyntaxLabels ;
 
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.query.Dataset ;
 import com.hp.hpl.jena.sparql.core.DatasetGraph ;
 import com.hp.hpl.jena.sparql.core.Quad ;
 
@@ -37,6 +38,11 @@ public class NQuadsWriter
         write(out, dsg.find(Node.ANY, Node.ANY, Node.ANY, Node.ANY)) ;
     }
     
+    public static void write(OutputStream out, Dataset dsg)
+    {
+        write(out, dsg.asDatasetGraph()) ;
+    }
+    
     public static void write(OutputStream out, Iterator<Quad> iter)
     {
         Prologue prologue = Prologue.create(null, null) ; // (null, graph.getPrefixMapping()) ;

Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/web/HttpOp.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/web/HttpOp.java?rev=1377344&r1=1377343&r2=1377344&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/web/HttpOp.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/web/HttpOp.java Sat Aug 25 20:09:22 2012
@@ -306,11 +306,11 @@ public class HttpOp
                 else
                     log.warn(format("[%d] No handler found for %s", id, ct));
             }
-            else
-            {
-                if( handlers != null )
-                    log.warn(format("[%d] No content returned but handlers provided"));
-            }
+//            else
+//            {
+//                if ( handlers != null )
+//                    log.warn(format("[%d] No content returned but handlers provided", id));
+//            }
         } finally { closeEntity(response.getEntity()) ; }
     }
 }