Author: ssmiweve
Date: 2008-03-18 21:37:04 +0100 (Tue, 18 Mar 2008)
New Revision: 6263
Modified:
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/NavigatableESPFastCommand.java
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/NewsSearchCommand.java
Log:
SEARCH-1747 - TV + Nyheter s?\195?\184k: Masse treff ved s?\195?\184k
p?\195?\165 spesialtegn og site:
Modified:
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/NavigatableESPFastCommand.java
===================================================================
---
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/NavigatableESPFastCommand.java
2008-03-17 10:01:12 UTC (rev 6262)
+++
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/NavigatableESPFastCommand.java
2008-03-18 20:37:04 UTC (rev 6263)
@@ -240,12 +240,13 @@
@Override
protected String getAdditionalFilter() {
+
+ final StringBuilder result = new StringBuilder();
if (!getSearchConfiguration().isIgnoreNavigation() && getNavigators()
!= null) {
- final Collection navStrings = createNavigationFilterStrings();
- return StringUtils.join(navStrings.iterator(), " ");
- } else {
- return null;
+ final Collection navStrings = createNavigationFilterStrings();
+ result.append( StringUtils.join(navStrings.iterator(), " "));
}
+ return result.append(' ' +
super.getAdditionalFilter()).toString().trim();
}
protected boolean isNavigatable() { return true; }
Modified:
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/NewsSearchCommand.java
===================================================================
---
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/NewsSearchCommand.java
2008-03-17 10:01:12 UTC (rev 6262)
+++
branches/2.16/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/NewsSearchCommand.java
2008-03-18 20:37:04 UTC (rev 6263)
@@ -90,6 +90,7 @@
if (filterBuilder == null) {
filterBuilder = new StringBuilder(super.getAdditionalFilter());
+ // <-start- TODO this needs to be put into its own
NewsSearchCOmmand.getAdditionalFilter() in genericse.seam.se
if ("se".equals(getSearchConfiguration().getProject())) {
// Add filter to retrieve all documents.
if (containsJustThePrefix() ||
getTransformedQuery().equals("")) {
@@ -113,7 +114,8 @@
if (newsCountry != null && !newsCountry.equals("")) {
filterBuilder.append(" +newscountry:"+
newsCountry);
}
- }
+ } // -end->
+
// need a date clause in the query to get the last 50 dates
for the lastnews navigator
} else if
("lastnews".equals(getSearchConfiguration().getProject())) {
GregorianCalendar calendar = new
java.util.GregorianCalendar();
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
