Author: ssmiweve
Date: 2008-06-05 15:15:27 +0200 (Thu, 05 Jun 2008)
New Revision: 6675
Modified:
branches/2.17/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractESPFastSearchCommand.java
Log:
Issue SKER4769: (S?\195?\184k med "MAX" i sp?\195?\184rringen gir -1
p?\195?\165 nyhetss?\195?\184ket og 0 treff p?\195?\165 bloggs?\195?\184ket)
Modified:
branches/2.17/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractESPFastSearchCommand.java
===================================================================
---
branches/2.17/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractESPFastSearchCommand.java
2008-06-05 11:35:53 UTC (rev 6674)
+++
branches/2.17/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractESPFastSearchCommand.java
2008-06-05 13:15:27 UTC (rev 6675)
@@ -60,7 +60,7 @@
/**
* Base class for commands querying a FAST EPS Server.
* See
https://dev.sesat.no/confluence/display/TECHDEV/FAST+ESP+5.0+Documentation
- *
+ *
* @version $Id$
*/
public abstract class AbstractESPFastSearchCommand extends
AbstractSearchCommand {
@@ -186,19 +186,19 @@
query.setParameter(new SearchParameter(BaseParameter.OFFSET,
getOffset()));
query.setParameter(new SearchParameter(BaseParameter.HITS,
cfg.getResultsToReturn()));
query.setParameter(new SearchParameter(BaseParameter.SORT_BY,
sortBy));
- query.setParameter(new SearchParameter(BaseParameter.LEMMATIZE,
cfg.isLemmatize()));
+ query.setParameter(new SearchParameter(BaseParameter.LEMMATIZE,
cfg.isLemmatize()));
query.setParameter(new SearchParameter(BaseParameter.FILTER,
filterBuilder.toString()));
if (!isNavigatable()) {
query.setParameter(new
SearchParameter(BaseParameter.NAVIGATION, 0));
- }
+ }
if (!"".equals(cfg.getQtPipeline())) {
query.setParameter(new
SearchParameter(BaseParameter.QT_PIPELINE, cfg.getQtPipeline()));
}
modifyQuery(query);
-
+
DUMP.info(query);
result = searchView.search(query);
@@ -266,7 +266,7 @@
return sortBy;
}
-
+
/**
* [EMAIL PROTECTED]
*/
@@ -336,10 +336,14 @@
*/
@Override
protected final String escapeTerm(final String term) {
+
+ final String termLC = term.toLowerCase();
+
for (ReservedWord word : ReservedWord.values()) {
+
// Term might already be prefixed by the TermPrefixTransformer.
- if (term.contains(":") && term.endsWith(':' + word.getWord()) ||
term.equals(word.getWord())) {
- return term.replace(word.getWord(), '"' + word.getWord() +
'"');
+ if (termLC.contains(":") && termLC.endsWith(':' + word.getWord())
|| termLC.equals(word.getWord())) {
+ return termLC.replace(word.getWord(), '"' + word.getWord() +
'"');
}
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
