Author: ssolsagl
Date: 2007-05-09 13:16:21 +0200 (Wed, 09 May 2007)
New Revision: 5032
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractESPFastSearchCommand.java
Log:
added getSortBy wich can be overridden in the searchcommands
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractESPFastSearchCommand.java
===================================================================
---
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractESPFastSearchCommand.java
2007-05-09 11:15:08 UTC (rev 5031)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractESPFastSearchCommand.java
2007-05-09 11:16:21 UTC (rev 5032)
@@ -11,6 +11,7 @@
import com.fastsearch.esp.search.ConfigurationException;
import com.fastsearch.esp.search.SearchEngineException;
import com.fastsearch.esp.search.SearchFactory;
+import com.fastsearch.esp.search.view.ISearchView;
import com.fastsearch.esp.search.query.BaseParameter;
import com.fastsearch.esp.search.query.IQuery;
import com.fastsearch.esp.search.query.Query;
@@ -123,6 +124,24 @@
searchView = initialiseSearchView();
}
+ protected String getSortBy() {
+ String sortBy = cfg.getSortBy();
+
+ if (getParameters().containsKey("userSortBy")) {
+
+ final String userSortBy = getParameter("userSortBy");
+ LOG.debug("execute: SortBy " + userSortBy);
+
+ if ("standard".equals(userSortBy)) {
+ sortBy = "-frontpagename -contentprofile -docdatetime";
+ } else if ("datetime".equals(userSortBy)) {
+ sortBy = "-frontpagename -docdatetime";
+ }
+ }
+
+ return sortBy;
+ }
+
// Public --------------------------------------------------------
/**
@@ -162,21 +181,9 @@
filterBuilder.append("+collapseid:").append(collapseId);
}
}
+
+ String sortBy = getSortBy();
- //check sortby
- String sortBy = cfg.getSortBy();
- if (getParameters().containsKey("userSortBy")) {
-
- final String userSortBy = getParameter("userSortBy");
- LOG.debug("execute: SortBy " + userSortBy);
-
- if ("standard".equals(userSortBy)) {
- sortBy = "-frontpagename -contentprofile -docdatetime";
- } else if ("datetime".equals(userSortBy)) {
- sortBy = "-frontpagename -docdatetime";
- }
- }
-
query.setParameter(new SearchParameter(BaseParameter.OFFSET,
getCurrentOffset(0)));
query.setParameter(new SearchParameter(BaseParameter.HITS,
cfg.getResultsToReturn()));
query.setParameter(new SearchParameter(BaseParameter.SORT_BY,
sortBy));
@@ -415,6 +422,7 @@
final String searchViewKey = queryServer + "/" + view;
+ System.out.println("*** searchViewKey = " + searchViewKey);
// XXX There is no synchronisation around this static map.
// Not critical as any clashing threads will just override the
values,
// and the cost of the occasional double-up creation probably
doesn't compare
@@ -436,7 +444,7 @@
final String serverName = queryServer.substring(0,
queryServer.indexOf(':'));
final String serverPort =
queryServer.substring(queryServer.indexOf(':') + 1);
searchView.setServerAddress(serverName,
Integer.parseInt(serverPort), false);
-
+ System.out.println("*** ServerName =" + serverName);
} catch (ConfigurationException e) {
throw new InfrastructureException(e);
} catch (SearchEngineException e) {
@@ -462,7 +470,6 @@
final SearchResultItem item = new BasicSearchResultItem();
for (final Map.Entry<String, String> entry :
cfg.getResultFields().entrySet()) {
-
final IDocumentSummaryField summary =
document.getSummaryField(entry.getKey());
if (summary != null && !summary.isEmpty())
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
