Author: stianh
Date: 2007-03-09 14:09:31 +0100 (Fri, 09 Mar 2007)
New Revision: 4553
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueBannersSearchCommand.java
Log:
GULD-103 Added support for multiple values in both search fields.
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueBannersSearchCommand.java
===================================================================
---
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueBannersSearchCommand.java
2007-03-08 14:50:04 UTC (rev 4552)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueBannersSearchCommand.java
2007-03-09 13:09:31 UTC (rev 4553)
@@ -9,7 +9,13 @@
package no.schibstedsok.searchportal.mode.command;
import no.schibstedsok.searchportal.datamodel.DataModel;
+import no.schibstedsok.searchportal.query.AndClause;
+import no.schibstedsok.searchportal.query.AndNotClause;
+import no.schibstedsok.searchportal.query.DefaultOperatorClause;
import no.schibstedsok.searchportal.query.LeafClause;
+import no.schibstedsok.searchportal.query.NotClause;
+import no.schibstedsok.searchportal.query.OperationClause;
+import no.schibstedsok.searchportal.query.OrClause;
import no.schibstedsok.searchportal.query.Query;
import no.schibstedsok.searchportal.result.SearchResult;
import org.apache.log4j.Logger;
@@ -22,6 +28,39 @@
*/
public class CatalogueBannersSearchCommand extends AdvancedFastSearchCommand {
+ @Override
+ protected void visitImpl(AndClause clause) {
+ clause.getFirstClause().accept(this);
+ clause.getSecondClause().accept(this);
+ }
+
+ @Override
+ protected void visitImpl(AndNotClause clause) {
+ clause.getFirstClause().accept(this);
+ }
+
+ @Override
+ protected void visitImpl(DefaultOperatorClause clause) {
+ clause.getFirstClause().accept(this);
+ clause.getSecondClause().accept(this);
+ }
+
+ @Override
+ protected void visitImpl(NotClause clause) {
+ clause.getFirstClause().accept(this);
+ }
+
+ @Override
+ protected void visitImpl(OperationClause clause) {
+ clause.getFirstClause().accept(this);
+ }
+
+ @Override
+ protected void visitImpl(OrClause clause) {
+ clause.getFirstClause().accept(this);
+ clause.getSecondClause().accept(this);
+ }
+
/** Logger for this class. */
private static final Logger LOG =
Logger.getLogger(CatalogueBannersSearchCommand.class);
@@ -47,7 +86,7 @@
final Query query = rq.getQuery();
queryTwo = query.getQueryString();
- queryTwo.replaceAll(" ", "");
+ queryTwo = queryTwo.replaceAll(" ", "");
}else{
queryTwo = "ingensteds";
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
