Author: ssmiweve
Date: 2008-02-13 18:23:55 +0100 (Wed, 13 Feb 2008)
New Revision: 6110
Modified:
branches/2.16/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/YahooIdpSearchCommand.java
branches/2.16/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
Log:
SEARCH-4251 - Or (..) searches do not work against yahoo
Modified:
branches/2.16/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/YahooIdpSearchCommand.java
===================================================================
---
branches/2.16/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/YahooIdpSearchCommand.java
2008-02-11 22:47:30 UTC (rev 6109)
+++
branches/2.16/generic.sesam/search-command-control/default/src/main/java/no/sesat/search/mode/command/YahooIdpSearchCommand.java
2008-02-13 17:23:55 UTC (rev 6110)
@@ -49,7 +49,7 @@
/**
* Search against Yahoo! Index Data Protocol 2.0.
*
- * @author mick
+ * @author <a href="mailto:[EMAIL PROTECTED]">Mck</a>
* @version $Id$
*/
public class YahooIdpSearchCommand extends AbstractYahooSearchCommand {
@@ -181,8 +181,7 @@
final String wrappedTransformedQuery = ANYWORDS
// support "*" searches that return everything in the index.
+ ("*".equals(getQuery().getQueryString()) ? OMNISEARCH_HACK :
getTransformedQuery()) + ' '
- // HACK since AbstractSearchCommand.FilterVisitor is built for
FAST prepending filters with +
- + getAdditionalFilter().replaceAll("\\+", "") + ')';
+ + getAdditionalFilter() + ')';
final StringBuilder fields = new StringBuilder();
@@ -257,10 +256,12 @@
@Override
protected void visitImpl(final LeafClause clause) {
- if(Boolean.TRUE == clauseState){
- appendToQueryRepresentation('+');
- }else if(Boolean.FALSE == clauseState){
- appendToQueryRepresentation('-');
+ if(!isEmptyLeaf(clause)){
+ if(Boolean.TRUE == clauseState){
+ appendToQueryRepresentation('+');
+ }else if(Boolean.FALSE == clauseState){
+ appendToQueryRepresentation('-');
+ }
}
super.visitImpl(clause);
}
Modified:
branches/2.16/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
===================================================================
---
branches/2.16/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
2008-02-11 22:47:30 UTC (rev 6109)
+++
branches/2.16/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
2008-02-13 17:23:55 UTC (rev 6110)
@@ -1001,7 +1001,7 @@
filterBuilder.append(' ');
LOG.debug(transformer.getClass().getSimpleName() + "-->
TransformedQuery=" + transformedQuery);
- LOG.debug(transformer.getClass().getSimpleName() + "-->
Filter=" + filter);
+ LOG.debug(transformer.getClass().getSimpleName() + "-->
Filter=" + filterBuilder.toString());
}
// avoid the trailing space.
filter = filterBuilder.substring(0, Math.max(0,
filterBuilder.length() - 2)).trim();
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
