fix bugs for default graphs; add some examples in ExampleConstructQuads.java
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d5862569 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d5862569 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d5862569 Branch: refs/heads/JENA-491-construct-quads Commit: d58625693e9439ee0c9164b56993b44f34c2a383 Parents: d0ce13b Author: confidencesun <[email protected]> Authored: Sun Jun 21 21:16:18 2015 +0800 Committer: confidencesun <[email protected]> Committed: Sun Jun 21 21:16:18 2015 +0800 ---------------------------------------------------------------------- jena-arq/Grammar/arq.jj | 2 +- jena-arq/Grammar/master.jj | 2 +- .../src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java | 2 +- jena-arq/src/main/java/org/apache/jena/sparql/syntax/Template.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/d5862569/jena-arq/Grammar/arq.jj ---------------------------------------------------------------------- diff --git a/jena-arq/Grammar/arq.jj b/jena-arq/Grammar/arq.jj index 0f1ef8e..25d5bc4 100644 --- a/jena-arq/Grammar/arq.jj +++ b/jena-arq/Grammar/arq.jj @@ -507,7 +507,7 @@ void ConstructQuads(QuadAcc acc) : {} (TriplesTemplate(acc))? )* } -void ConstructQuadsNotTriples(QuadAccSink acc) : {Node gn = null ; Node prev = acc.getGraph() ; } +void ConstructQuadsNotTriples(QuadAccSink acc) : {Node gn = org.apache.jena.sparql.core.Quad.defaultGraphNodeGenerated ; Node prev = acc.getGraph() ; } { ( <GRAPH> http://git-wip-us.apache.org/repos/asf/jena/blob/d5862569/jena-arq/Grammar/master.jj ---------------------------------------------------------------------- diff --git a/jena-arq/Grammar/master.jj b/jena-arq/Grammar/master.jj index 4005ce0..04217ec 100644 --- a/jena-arq/Grammar/master.jj +++ b/jena-arq/Grammar/master.jj @@ -748,7 +748,7 @@ void ConstructQuads(QuadAcc acc) : {} )* } -void ConstructQuadsNotTriples(QuadAccSink acc) : {Node gn = null ; Node prev = acc.getGraph() ; } +void ConstructQuadsNotTriples(QuadAccSink acc) : {Node gn = org.apache.jena.sparql.core.Quad.defaultGraphNodeGenerated ; Node prev = acc.getGraph() ; } { ( <GRAPH> http://git-wip-us.apache.org/repos/asf/jena/blob/d5862569/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java index 9bb2611..bfa0e85 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java @@ -1995,7 +1995,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants { } final public void ConstructQuadsNotTriples(QuadAccSink acc) throws ParseException { - Node gn = null ; Node prev = acc.getGraph() ; + Node gn = org.apache.jena.sparql.core.Quad.defaultGraphNodeGenerated ; Node prev = acc.getGraph() ; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case GRAPH: jj_consume_token(GRAPH); http://git-wip-us.apache.org/repos/asf/jena/blob/d5862569/jena-arq/src/main/java/org/apache/jena/sparql/syntax/Template.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/Template.java b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/Template.java index 944c252..248ce7e 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/Template.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/Template.java @@ -89,7 +89,7 @@ public class Template if( this.bgp != null){ List<Quad> quads = new ArrayList<Quad>(); for(Triple triple: this.bgp.getList()){ - quads.add( new Quad( Quad.defaultGraphIRI, triple ) ); + quads.add( new Quad( Quad.defaultGraphNodeGenerated, triple ) ); } return quads; }
