[Mulgara-svn] r1588 - trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene

[ronald at mulgara.org]

Author: ronald
Date: 2009-03-04 06:07:52 -0800 (Wed, 04 Mar 2009)
New Revision: 1588

Modified:
   trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndexTuples.java
Log:
Handle constraints with no variables properly (can't use
TuplesOperations.materialize on these).

Modified: trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndexTuples.java
===================================================================
--- trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndexTuples.java	2009-03-04 14:07:46 UTC (rev 1587)
+++ trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/FullTextStringIndexTuples.java	2009-03-04 14:07:52 UTC (rev 1588)
@@ -182,8 +182,12 @@
     String object = getString(objectElement);
 
     results = new SearchHitsTuples(subject, predicate, object);
-    if (subject != null || predicate != null || object != null) {
+    if (subject != null && predicate != null && object != null) {
       Tuples old = results;
+      results = old.next() ? TuplesOperations.unconstrained() : TuplesOperations.empty();
+      old.close();
+    } else if (subject != null || predicate != null || object != null) {
+      Tuples old = results;
       long t0 = System.currentTimeMillis();
       results = TuplesOperations.materialize(results);
       logger.debug("materialized " + results.getRowCount() + " lucene results() in " + (System.currentTimeMillis() - t0));