Author: ssmiweve
Date: 2009-01-05 20:25:20 +0100 (Mon, 05 Jan 2009)
New Revision: 7128
Modified:
branches/2.18/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractFast4SearchCommand.java
branches/2.18/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
Log:
mapped field filters were broken. bring back to life.
Modified:
branches/2.18/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractFast4SearchCommand.java
===================================================================
---
branches/2.18/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractFast4SearchCommand.java
2009-01-03 02:05:49 UTC (rev 7127)
+++
branches/2.18/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractFast4SearchCommand.java
2009-01-05 19:25:20 UTC (rev 7128)
@@ -524,11 +524,6 @@
}
}
- if (null !=getFilter()) {
- filter.append(' ');
- filter.append(getFilter());
- }
-
if (getSearchConfiguration().getFilter() != null &&
getSearchConfiguration().getFilter().length() > 0) {
// TODO create NowMacroFilterQueryTransfomer to do this instead
final Calendar c = Calendar.getInstance();
@@ -540,7 +535,6 @@
}
// Init dynamic filters
- // TODO: Is the following used anywhere?
final String superFilter = null == super.getFilter() ? "" :
super.getFilter();
LOG.debug("createQuery: superFilter=" + superFilter);
Modified:
branches/2.18/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
===================================================================
---
branches/2.18/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
2009-01-03 02:05:49 UTC (rev 7127)
+++
branches/2.18/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
2009-01-05 19:25:20 UTC (rev 7128)
@@ -807,7 +807,7 @@
if (null != clause.getField()) {
final Map<String, String> fieldFilters =
getSearchConfiguration().getFieldFilterMap();
if (fieldFilters.containsKey(clause.getField())) {
- field = clause.getField();
+ field = fieldFilters.get(clause.getField());
} else {
for (String fieldFilter : fieldFilters.keySet()) {
@@ -821,7 +821,7 @@
&& getEngine().evaluateTerm(tp,
clause.getField());
if (result) {
- field = fieldFilter;
+ field = fieldFilters.get(fieldFilter);
break;
}
} catch (IllegalArgumentException iae) {
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
