[Mulgara-svn] r744 - branches/mgr-61-sparql/src/jar/resolver/java/org/mulgara/resolver

[pag at mulgara.org]

Author: pag
Date: 2008-04-04 21:51:46 -0700 (Fri, 04 Apr 2008)
New Revision: 744

Modified:
   branches/mgr-61-sparql/src/jar/resolver/java/org/mulgara/resolver/DefaultConstraintHandlers.java
Log:
Add a handler for ConstraintOptional to call the optionalJoin method in TuplesOperations

Modified: branches/mgr-61-sparql/src/jar/resolver/java/org/mulgara/resolver/DefaultConstraintHandlers.java
===================================================================
--- branches/mgr-61-sparql/src/jar/resolver/java/org/mulgara/resolver/DefaultConstraintHandlers.java	2008-04-05 04:50:45 UTC (rev 743)
+++ branches/mgr-61-sparql/src/jar/resolver/java/org/mulgara/resolver/DefaultConstraintHandlers.java	2008-04-05 04:51:46 UTC (rev 744)
@@ -70,8 +70,6 @@
  * @created 2007-11-09
  * @author <a href="mailto:andrae at netymon.com">Andrae Muys</a>
  * @company <a href="http://www.netymon.com">Netymon Pty Ltd</a>
- * @copyright &copy;2004 <a href="http://www.tucanatech.com/">Tucana
- *   Technology, Inc</a>
  * @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
  */
 class DefaultConstraintHandlers
@@ -175,6 +173,18 @@
             }
           }
         }),
+        new NVPair(ConstraintOptionalJoin.class, new ConstraintResolutionHandler() {
+          public Tuples resolve(QueryEvaluationContext context, ModelExpression modelExpr, ConstraintExpression constraintExpr) throws Exception {
+            List args = context.resolveConstraintOperation(modelExpr, (ConstraintOperation)constraintExpr);
+            assert args.size() == 2;
+            try {
+              return TuplesOperations.optionalJoin((Tuples)args.get(0), (Tuples)args.get(1));
+            } finally {
+              ((Tuples)args.get(0)).close();
+              ((Tuples)args.get(1)).close();
+            }
+          }
+        }),
         new NVPair(ConstraintIs.class, new ConstraintResolutionHandler() {
           public Tuples resolve(QueryEvaluationContext context, ModelExpression modelExpr, ConstraintExpression constraintExpr) throws Exception {
             ConstraintIs constraint = (ConstraintIs)constraintExpr;