[Mulgara-svn] r815 - branches/mgr-61-sparql/src/jar/sparql-interpreter/java/org/mulgara/sparql

[pag at mulgara.org]

Author: pag
Date: 2008-04-22 10:32:21 -0700 (Tue, 22 Apr 2008)
New Revision: 815

Modified:
   branches/mgr-61-sparql/src/jar/sparql-interpreter/java/org/mulgara/sparql/PatternMapper.java
Log:
Now using ConstraintIn to implement the applyGraph method

Modified: branches/mgr-61-sparql/src/jar/sparql-interpreter/java/org/mulgara/sparql/PatternMapper.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql-interpreter/java/org/mulgara/sparql/PatternMapper.java	2008-04-22 17:31:03 UTC (rev 814)
+++ branches/mgr-61-sparql/src/jar/sparql-interpreter/java/org/mulgara/sparql/PatternMapper.java	2008-04-22 17:32:21 UTC (rev 815)
@@ -41,6 +41,7 @@
 import org.mulgara.query.ConstraintExpression;
 import org.mulgara.query.ConstraintFalse;
 import org.mulgara.query.ConstraintImpl;
+import org.mulgara.query.ConstraintIn;
 import org.mulgara.query.ConstraintOptionalJoin;
 import org.mulgara.query.Variable;
 import org.mulgara.query.rdf.LiteralImpl;
@@ -131,14 +132,12 @@
       // remember this is variable to be bound to the FROM NAMED values
       Variable var = new Variable(v.getName());
       graphVars.add(var);
-      // TODO: wrap the constraint in a new ConstraintIn
-      // constraint = new ConstraintIn(constraint, var);
+      constraint = new ConstraintIn(constraint, var);
     } else if (graph instanceof IRIReference) {
       // store this reference as a value that should be in the FROM NAMED list
       URI ref = ((IRIReference)graph).getUri();
       graphUris.add(ref);
-      // TODO: wrap the constraint in a new ConstraintIn
-      // constraint = new ConstraintIn(constraint, new URIReferenceImpl(ref));
+      constraint = new ConstraintIn(constraint, new URIReferenceImpl(ref));
     } else {
       throw new IllegalArgumentException("Illegal argument in a GRAPH expression: " + graph.getClass().getSimpleName());
     }