Author: ssmiweve
Date: 2009-08-27 17:15:49 +0200 (Thu, 27 Aug 2009)
New Revision: 7273
Modified:
branches/2.18/search-command-control-spi/src/main/java/no/sesat/search/mode/command/querybuilder/InfixQueryBuilder.java
branches/2.18/search-command-control-spi/src/main/java/no/sesat/search/mode/command/querybuilder/PrefixQueryBuilder.java
Log:
a blank word isn't a valid word to escape.
Modified:
branches/2.18/search-command-control-spi/src/main/java/no/sesat/search/mode/command/querybuilder/InfixQueryBuilder.java
===================================================================
---
branches/2.18/search-command-control-spi/src/main/java/no/sesat/search/mode/command/querybuilder/InfixQueryBuilder.java
2009-08-27 13:27:22 UTC (rev 7272)
+++
branches/2.18/search-command-control-spi/src/main/java/no/sesat/search/mode/command/querybuilder/InfixQueryBuilder.java
2009-08-27 15:15:49 UTC (rev 7273)
@@ -19,11 +19,9 @@
import java.util.Collection;
import java.util.HashSet;
-import java.util.Set;
import no.sesat.search.mode.config.querybuilder.InfixQueryBuilderConfig;
import no.sesat.search.mode.config.querybuilder.QueryBuilderConfig;
import no.sesat.search.query.AndClause;
-import no.sesat.search.query.AndNotClause;
import no.sesat.search.query.DefaultOperatorClause;
import no.sesat.search.query.EmailClause;
import no.sesat.search.query.LeafClause;
@@ -77,9 +75,9 @@
final Collection<String> words = new
HashSet<String>(super.getWordsToEscape());
- words.add(getConfig().getAndInfix());
- words.add(getConfig().getNotPrefix());
- words.add(getConfig().getOrInfix());
+ if(!getConfig().getAndInfix().isEmpty()){
words.add(getConfig().getAndInfix()); }
+ if(!getConfig().getNotPrefix().isEmpty()){
words.add(getConfig().getNotPrefix()); }
+ if(!getConfig().getOrInfix().isEmpty()){
words.add(getConfig().getOrInfix()); }
return words;
}
Modified:
branches/2.18/search-command-control-spi/src/main/java/no/sesat/search/mode/command/querybuilder/PrefixQueryBuilder.java
===================================================================
---
branches/2.18/search-command-control-spi/src/main/java/no/sesat/search/mode/command/querybuilder/PrefixQueryBuilder.java
2009-08-27 13:27:22 UTC (rev 7272)
+++
branches/2.18/search-command-control-spi/src/main/java/no/sesat/search/mode/command/querybuilder/PrefixQueryBuilder.java
2009-08-27 15:15:49 UTC (rev 7273)
@@ -22,7 +22,6 @@
import no.sesat.search.mode.config.querybuilder.PrefixQueryBuilderConfig;
import no.sesat.search.mode.config.querybuilder.QueryBuilderConfig;
import no.sesat.search.query.AndClause;
-import no.sesat.search.query.Clause;
import no.sesat.search.query.DefaultOperatorClause;
import no.sesat.search.query.EmailClause;
import no.sesat.search.query.LeafClause;
@@ -79,9 +78,9 @@
final Collection<String> words = new
HashSet<String>(super.getWordsToEscape());
- words.add(getConfig().getAndPrefix());
- words.add(getConfig().getNotPrefix());
- words.add(getConfig().getOrPrefix());
+ if(!getConfig().getAndPrefix().isEmpty()){
words.add(getConfig().getAndPrefix()); }
+ if(!getConfig().getNotPrefix().isEmpty()){
words.add(getConfig().getNotPrefix()); }
+ if(!getConfig().getOrPrefix().isEmpty()){
words.add(getConfig().getOrPrefix()); }
return words;
}
_______________________________________________
Kernel-commits mailing list
Kernel-commits@sesat.no
http://sesat.no/mailman/listinfo/kernel-commits
