Author: gttersen
Date: 2007-03-30 12:06:05 +0200 (Fri, 30 Mar 2007)
New Revision: 4688
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractESPFastSearchCommand.java
Log:
AndClause(Leaf("term"), AndClause(Leaf(null),Leaf(null))) converted to FQL:
"term and"
Now correctly converts to FQL: "term"
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractESPFastSearchCommand.java
===================================================================
---
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractESPFastSearchCommand.java
2007-03-30 10:03:41 UTC (rev 4687)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractESPFastSearchCommand.java
2007-03-30 10:06:05 UTC (rev 4688)
@@ -25,6 +25,7 @@
import no.schibstedsok.searchportal.query.AndNotClause;
import no.schibstedsok.searchportal.query.Clause;
import no.schibstedsok.searchportal.query.DefaultOperatorClause;
+import no.schibstedsok.searchportal.query.DoubleOperatorClause;
import no.schibstedsok.searchportal.query.LeafClause;
import no.schibstedsok.searchportal.query.NotClause;
import no.schibstedsok.searchportal.query.OrClause;
@@ -153,7 +154,7 @@
LOG.debug("execute: SortBy " + userSortBy);
if ("standard".equals(userSortBy)) {
- sortBy ="-frontpagename -contentprofile -docdatetime";
+ sortBy = "-frontpagename -contentprofile -docdatetime";
} else if ("datetime".equals(userSortBy)) {
sortBy = "-frontpagename -docdatetime";
}
@@ -350,8 +351,10 @@
String transformedTerm = getTransformedTerm(clause);
transformedTerm = transformedTerm.length() == 0 ? null :
transformedTerm;
return leaf.getField() == null && transformedTerm == null || null
!= leaf.getField() && null != getFieldFilter(leaf);
+ } else if (clause instanceof DoubleOperatorClause) {
+ DoubleOperatorClause doc = (DoubleOperatorClause) clause;
+ return isEmptyLeaf(doc.getFirstClause()) &&
isEmptyLeaf(doc.getSecondClause());
}
-
return false;
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
