[Mulgara-svn] r1496 - in trunk/src/jar/querylang/java/org/mulgara: itql sparql

[pag at mulgara.org]

Author: pag
Date: 2009-02-13 12:19:38 -0800 (Fri, 13 Feb 2009)
New Revision: 1496

Modified:
   trunk/src/jar/querylang/java/org/mulgara/itql/TqlInterpreter.java
   trunk/src/jar/querylang/java/org/mulgara/sparql/SparqlInterpreter.java
Log:
Allowing relative URIs in queries

Modified: trunk/src/jar/querylang/java/org/mulgara/itql/TqlInterpreter.java
===================================================================
--- trunk/src/jar/querylang/java/org/mulgara/itql/TqlInterpreter.java	2009-02-13 19:12:45 UTC (rev 1495)
+++ trunk/src/jar/querylang/java/org/mulgara/itql/TqlInterpreter.java	2009-02-13 20:19:38 UTC (rev 1496)
@@ -1341,7 +1341,7 @@
       
     } else if (element instanceof AResourceTripleElement) {
       // create a new resource
-      node = new URIReferenceImpl(toURI(((AResourceTripleElement)element).getResource()));
+      node = new URIReferenceImpl(toURI(((AResourceTripleElement)element).getResource()), false);
       
     } else if (element instanceof AVariableTripleElement) {
 

Modified: trunk/src/jar/querylang/java/org/mulgara/sparql/SparqlInterpreter.java
===================================================================
--- trunk/src/jar/querylang/java/org/mulgara/sparql/SparqlInterpreter.java	2009-02-13 19:12:45 UTC (rev 1495)
+++ trunk/src/jar/querylang/java/org/mulgara/sparql/SparqlInterpreter.java	2009-02-13 20:19:38 UTC (rev 1496)
@@ -313,7 +313,7 @@
         } else if (n instanceof IRIReference) {
           // SPARQL SELECT only permits variables; DESCRIBE permits IRI's
           if (queryStruct.getType() == QueryType.select) throw new MulgaraParserException("Unexpected non-variable in the SELECT clause");
-          result.add(new ConstantValue(constantVars.newVar(), new URIReferenceImpl(((IRIReference)n).getUri())));
+          result.add(new ConstantValue(constantVars.newVar(), new URIReferenceImpl(((IRIReference)n).getUri(), false)));
         } else {
           throw new MulgaraParserException("Unexpected select expression");
         }
@@ -369,7 +369,7 @@
     }
     // IRIReferences are converted to a URI and wrapped in a ConstantValue
     if (node instanceof IRIReference) {
-      return new ConstantValue(constantVars.newVar(), new URIReferenceImpl(((IRIReference)node).getUri()));
+      return new ConstantValue(constantVars.newVar(), new URIReferenceImpl(((IRIReference)node).getUri(), false));
     }
     // nothing else is valid. We probably have a compound expression.
     throw new MulgaraParserException("Unexpected element in CONSTRUCT template: " + node); 
@@ -481,7 +481,7 @@
     List<ConstraintExpression> isConstraints = new ArrayList<ConstraintExpression>(bindingList.size());
     for (IRIReference iri: bindingList) {
       // does this need a graph node that isn't variable?
-      isConstraints.add(new ConstraintIs(var, new URIReferenceImpl(iri.getUri())));
+      isConstraints.add(new ConstraintIs(var, new URIReferenceImpl(iri.getUri(), false)));
     }
     return new ConstraintDisjunction(isConstraints);
   }