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 2017/06/20 10:44:22 UTC
[2/6] jena git commit: JENA-1361: Convert back to blank nodes.
JENA-1361: Convert back to blank nodes.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d377dd14
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d377dd14
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d377dd14
Branch: refs/heads/master
Commit: d377dd141028ae81ed373b86d3fc8f26cc898447
Parents: bb7af3b
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Jun 17 15:44:48 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Jun 17 15:44:48 2017 +0100
----------------------------------------------------------------------
.../apache/jena/sparql/modify/request/UpdateWriter.java | 2 ++
.../jena/sparql/modify/request/UpdateWriterVisitor.java | 10 ++++++----
2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/d377dd14/jena-arq/src/main/java/org/apache/jena/sparql/modify/request/UpdateWriter.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/request/UpdateWriter.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/request/UpdateWriter.java
index c2a2e35..1f79f55 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/request/UpdateWriter.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/request/UpdateWriter.java
@@ -54,6 +54,8 @@ public class UpdateWriter implements UpdateSerializer
// To get legal syntax out, the serialization context
// has to be a bNode mapping that does ??N vars to bNodes
if (sCxt == null)
+ // This is the one used for INSERT and DELETE templates.
+ // For the WHERE clause, see UpdateWriterVisitor.prepareElementFormatter
sCxt = new SerializationContext((Prologue)null, new NodeToLabelMapBNode());
this.out = out;
http://git-wip-us.apache.org/repos/asf/jena/blob/d377dd14/jena-arq/src/main/java/org/apache/jena/sparql/modify/request/UpdateWriterVisitor.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/request/UpdateWriterVisitor.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/request/UpdateWriterVisitor.java
index e8a19ec..7672f71 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/request/UpdateWriterVisitor.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/request/UpdateWriterVisitor.java
@@ -32,6 +32,7 @@ import org.apache.jena.sparql.serializer.FormatterElement ;
import org.apache.jena.sparql.serializer.SerializationContext ;
import org.apache.jena.sparql.syntax.Element ;
import org.apache.jena.sparql.util.FmtUtils ;
+import org.apache.jena.sparql.util.NodeToLabelMapBNode ;
public class UpdateWriterVisitor implements UpdateVisitor
{
@@ -212,7 +213,6 @@ public class UpdateWriterVisitor implements UpdateVisitor
String $ = FmtUtils.stringForNode(node, sCxt) ;
out.print($) ;
}
-
@Override
public void visit(UpdateDeleteWhere update)
@@ -233,7 +233,6 @@ public class UpdateWriterVisitor implements UpdateVisitor
output(update.getWithIRI()) ;
}
-
if ( update.hasDeleteClause() )
{
List<Quad> deleteQuads = update.getDeleteQuads() ;
@@ -242,7 +241,6 @@ public class UpdateWriterVisitor implements UpdateVisitor
outputQuadsBraced(deleteQuads) ;
}
-
if ( update.hasInsertClause() )
{
List<Quad> insertQuads = update.getInsertQuads() ;
@@ -272,6 +270,7 @@ public class UpdateWriterVisitor implements UpdateVisitor
output(x) ;
}
+ // Wrong.
Element el = update.getWherePattern() ;
out.ensureStartOfLine() ;
out.print("WHERE") ;
@@ -289,6 +288,9 @@ public class UpdateWriterVisitor implements UpdateVisitor
}
protected FormatterElement prepareElementFormatter() {
- return new FormatterElement(out, sCxt);
+ SerializationContext sCxt1 = new SerializationContext(sCxt);
+ // The label prefix is different to the template writer just for clarity.
+ sCxt1.setBNodeMap(new NodeToLabelMapBNode("x", false));
+ return new FormatterElement(out, sCxt1);
}
}
\ No newline at end of file