Author: gttersen
Date: 2007-03-16 14:05:39 +0100 (Fri, 16 Mar 2007)
New Revision: 4581
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractESPFastSearchCommand.java
Log:
Uppdate for isEmptyLeaf:
Changed logic to include: no field and no term. - Geir H. Pettersen - T-Rank
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-16 10:24:48 UTC (rev 4580)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractESPFastSearchCommand.java
2007-03-16 13:05:39 UTC (rev 4581)
@@ -20,6 +20,7 @@
import com.fastsearch.esp.search.result.IQueryResult;
import com.fastsearch.esp.search.view.ISearchView;
import no.schibstedsok.searchportal.InfrastructureException;
+import no.schibstedsok.searchportal.datamodel.DataModel;
import no.schibstedsok.searchportal.mode.config.ESPFastSearchConfiguration;
import no.schibstedsok.searchportal.query.AndClause;
import no.schibstedsok.searchportal.query.AndNotClause;
@@ -28,23 +29,20 @@
import no.schibstedsok.searchportal.query.LeafClause;
import no.schibstedsok.searchportal.query.NotClause;
import no.schibstedsok.searchportal.query.OrClause;
+import no.schibstedsok.searchportal.query.Visitor;
import no.schibstedsok.searchportal.query.XorClause;
import no.schibstedsok.searchportal.result.BasicSearchResultItem;
import no.schibstedsok.searchportal.result.FastSearchResult;
import no.schibstedsok.searchportal.result.SearchResult;
import no.schibstedsok.searchportal.result.SearchResultItem;
-import no.schibstedsok.searchportal.site.Site;
+import no.schibstedsok.searchportal.site.config.SiteConfiguration;
import org.apache.log4j.Logger;
+
import java.io.IOException;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import no.schibstedsok.commons.ioc.ContextWrapper;
-import no.schibstedsok.searchportal.datamodel.DataModel;
-import no.schibstedsok.searchportal.query.Visitor;
-import no.schibstedsok.searchportal.site.SiteContext;
-import no.schibstedsok.searchportal.site.config.SiteConfiguration;
/**
*
@@ -74,6 +72,7 @@
private static final Logger LOG =
Logger.getLogger(AbstractESPFastSearchCommand.class);
private static final String ERR_CALL_SET_VIEW = "setView() must be called
prior to calling this method";
+
private enum ReservedWord {
AND("and"),
OR("or"),
@@ -308,7 +307,10 @@
private boolean isEmptyLeaf(final Clause clause) {
if (clause instanceof LeafClause) {
final LeafClause leaf = (LeafClause) clause;
- return null != leaf.getField() && null != getFieldFilter(leaf);
+ // Changed logic to include: no field and no term. - Geir H.
Pettersen - T-Rank
+ String transformedTerm = getTransformedTerm(clause);
+ transformedTerm = transformedTerm.length() == 0 ? null :
transformedTerm;
+ return leaf.getField() == null && transformedTerm == null || null
!= leaf.getField() && null != getFieldFilter(leaf);
}
return false;
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
