You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2014/06/15 15:52:08 UTC

svn commit: r1602696 - in /jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql: core/Prologue.java modify/request/UpdateWriter.java

Author: andy
Date: Sun Jun 15 13:52:08 2014
New Revision: 1602696

URL: http://svn.apache.org/r1602696
Log:
JENA-712 : print BASE and use for realtive URIs if and onld if it was explicitly set in the query abstract syntax tree.

Modified:
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Prologue.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateWriter.java

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Prologue.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Prologue.java?rev=1602696&r1=1602695&r2=1602696&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Prologue.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Prologue.java Sun Jun 15 13:52:08 2014
@@ -66,7 +66,11 @@ public class Prologue
     {
         PrefixMapping prefixMap = new PrefixMappingImpl() ;
         prefixMap.setNsPrefixes(this.prefixMap) ;
-        return new Prologue(prefixMap, resolver.getBaseIRI()) ;
+        String baseURI = null ;
+        if ( resolver != null)
+            baseURI = resolver.getBaseIRI() ;
+        
+        return new Prologue(prefixMap, baseURI) ;
     }
     
     // Reverse of sub()

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateWriter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateWriter.java?rev=1602696&r1=1602695&r2=1602696&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateWriter.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateWriter.java Sun Jun 15 13:52:08 2014
@@ -29,6 +29,7 @@ import org.apache.jena.riot.out.SinkQuad
 
 import com.hp.hpl.jena.graph.Node;
 import com.hp.hpl.jena.graph.Triple;
+import com.hp.hpl.jena.n3.IRIResolver ;
 import com.hp.hpl.jena.sparql.ARQException;
 import com.hp.hpl.jena.sparql.core.Prologue ;
 import com.hp.hpl.jena.sparql.core.Quad;
@@ -235,7 +236,11 @@ public class UpdateWriter implements Clo
     
     public static void output(UpdateRequest request, IndentedWriter out)
     {
-        SerializationContext sCxt = new SerializationContext(request, new NodeToLabelMapBNode()) ;
+        Prologue prologue = request ;
+        if ( ! request.explicitlySetBaseURI() )
+            prologue = new Prologue(request.getPrefixMapping(), (IRIResolver)null) ;
+        
+        SerializationContext sCxt = new SerializationContext(prologue, new NodeToLabelMapBNode()) ;
         output(request, out, sCxt);
     }