Author: daniele
Date: 2007-01-23 17:06:04 +0100 (Tue, 23 Jan 2007)
New Revision: 4366
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueSearchCommand.java
Log:
rewrote search command to new query.
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueSearchCommand.java
===================================================================
---
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueSearchCommand.java
2007-01-23 09:36:28 UTC (rev 4365)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueSearchCommand.java
2007-01-23 16:06:04 UTC (rev 4366)
@@ -11,7 +11,13 @@
import no.fast.ds.search.ISearchParameters;
import no.fast.ds.search.SearchParameter;
+import no.schibstedsok.searchportal.query.AndClause;
+import no.schibstedsok.searchportal.query.AndNotClause;
+import no.schibstedsok.searchportal.query.Clause;
+import no.schibstedsok.searchportal.query.DefaultOperatorClause;
import no.schibstedsok.searchportal.query.LeafClause;
+import no.schibstedsok.searchportal.query.NotClause;
+import no.schibstedsok.searchportal.query.OrClause;
import no.schibstedsok.searchportal.query.Query;
import no.schibstedsok.searchportal.result.BasicSearchResultItem;
import no.schibstedsok.searchportal.result.CatalogueSearchResultItem;
@@ -24,7 +30,7 @@
/**
*
*/
-public class CatalogueSearchCommand extends AbstractSimpleFastSearchCommand {
+public class CatalogueSearchCommand extends AdvancedFastSearchCommand {
private static final Logger LOG =
Logger.getLogger(CatalogueSearchCommand.class);
private String queryTwo = null;
@@ -62,8 +68,11 @@
LOG.info("Søk med keyword query is :" + getTransformedQuery());
SearchResult result = super.execute();
+
+ searchForName=true;
+ super.performQueryTransformation();
+
// søk etter firmanavn
- searchForName=true;
LOG.info("Søk med firmanavn query is :" + getTransformedQuery());
SearchResult nameQueryResult = super.execute();
@@ -97,18 +106,13 @@
return result;
}
-
- /** TODO comment me. **/
- public String getTransformedQuery() {
- LOG.info("Catalogue Transformed Query");
+
+ @Override
+ protected String getAdditionalFilter() {
String query=null;
- if(searchForName){
- // hvis det finnes en ekstra query, legg til denne i søket.
- query = queryTwo!=null ? queryName +"
iypcfgeo:\""+queryTwo+"\"" : queryName;
- }else{
- query = queryTwo!=null ? super.getTransformedQuery()+"
iypcfgeo:\""+queryTwo+"\"" : super.getTransformedQuery();
- }
+ // hvis det finnes en ekstra query, legg til denne i søket som
et filter.
+ query = queryTwo!=null&&queryTwo.length()>0 ? "
+iypcfgeo:\""+queryTwo.trim()+"\"" : "";
return query;
}
@@ -118,11 +122,45 @@
*
*/
protected void visitImpl(final LeafClause clause) {
-//
- queryName += " lemiypcfkeywords:"+clause.getTerm()+" ";
- appendToQueryRepresentation(clause.getTerm());
-// super.visitImpl(clause);
+ String transformed = getTransformedTerm(clause);
+
+ // to ulike søk utføres av denne komponenten, søk med keywords og søk
med firmanavn.
+ if(!searchForName){
+ appendToQueryRepresentation("(lemiypcfkeywords:"+transformed+"
ANY lemiypcfkeywordslow:"+transformed+")");
+ }else{
+ appendToQueryRepresentation("(iypcfnavn:"+transformed+" ANDNOT
(lemiypcfkeywords:"+transformed+" OR lemiypcfkeywordslow:"+transformed+"))");
+
+ }
}
-
+
+ protected void visitImpl(final AndClause clause) {
+ super.visitImpl(clause);
+ }
+
+ @Override
+ protected void visitImpl(DefaultOperatorClause clause) {
+ // TODO Auto-generated method stub
+ super.visitImpl(clause);
+ }
+
+ @Override
+ protected void visitImpl(OrClause clause) {
+ // TODO Auto-generated method stub
+ super.visitImpl(clause);
+ }
+
+ @Override
+ protected void visitImpl(AndNotClause clause) {
+ // TODO Auto-generated method stub
+ super.visitImpl(clause);
+ }
+
+ @Override
+ protected void visitImpl(NotClause clause) {
+ // TODO Auto-generated method stub
+ super.visitImpl(clause);
+ }
+
+
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
