http://git-wip-us.apache.org/repos/asf/jena/blob/a8b0d53e/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java index 296cfc1..a6d961f 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java @@ -212,7 +212,7 @@ public class SPARQLParser11 extends SPARQLParser11Base implements SPARQLParser11 final public void ConstructQuery() throws ParseException { Template t ; - QuadAcc acc = new QuadAcc() ; + TripleCollectorBGP acc = new TripleCollectorBGP() ; jj_consume_token(CONSTRUCT); getQuery().setQueryConstructType() ; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -284,7 +284,7 @@ public class SPARQLParser11 extends SPARQLParser11Base implements SPARQLParser11 } jj_consume_token(RBRACE); SolutionModifier(); - t = new Template(acc) ; + t = new Template(acc.getBGP()) ; getQuery().setConstructTemplate(t) ; ElementPathBlock epb = new ElementPathBlock(acc.getBGP()) ; ElementGroup elg = new ElementGroup() ; @@ -2353,8 +2353,8 @@ public class SPARQLParser11 extends SPARQLParser11Base implements SPARQLParser11 } final public Template ConstructTemplate() throws ParseException { - QuadAcc acc = new QuadAcc() ; - Template t = new Template(acc) ; + TripleCollectorBGP acc = new TripleCollectorBGP(); + Template t = new Template(acc.getBGP()) ; setInConstructTemplate(true) ; jj_consume_token(LBRACE); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
http://git-wip-us.apache.org/repos/asf/jena/blob/a8b0d53e/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 c6a5b26..944c252 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.tripleInQuad, triple ) ); + quads.add( new Quad( Quad.defaultGraphIRI, triple ) ); } return quads; } @@ -146,7 +146,10 @@ public class Template { Quad q1 = list1.get(i) ; Quad q2 = list2.get(i) ; - Iso.quadIso(q1, q2, labelMap) ; + boolean iso = Iso.quadIso(q1, q2, labelMap) ; + if(!iso){ + return false; + } } return true ; }
