Author: ssolsagl
Date: 2007-05-24 15:15:23 +0200 (Thu, 24 May 2007)
New Revision: 5163
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractESPFastSearchCommand.java
Log:
collapsing can be dynamic
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-24 08:34:22 UTC (rev 5162)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractESPFastSearchCommand.java
2007-05-24 13:15:23 UTC (rev 5163)
@@ -124,6 +124,18 @@
searchView = initialiseSearchView();
}
+ /**
+ * Default collapsing from the configuration, can be overridden in
subcommands..
+ * @return true if collapsing is enabled
+ */
+ protected boolean isCollapsingEnabled() {
+ return cfg.isCollapsingEnabled();
+ }
+
+ /**
+ * Default sortby, can be overridden by subcommands.
+ * @return sortby field
+ */
protected String getSortBy() {
String sortBy = cfg.getSortBy();
@@ -172,7 +184,7 @@
final IQuery query = new Query(transformedQuery);
- if (cfg.isCollapsingEnabled()) {
+ if (isCollapsingEnabled()) {
if (collapseId == null || "".equals(collapseId) ||
!cfg.isExpansionEnabled()) {
if (cfg.isCollapsingRemoves()) {
query.setParameter(new SearchParameter("collapseon",
"batvcollapseid"));
@@ -277,7 +289,7 @@
}
}
- if (cfg.isCollapsingEnabled() && cfg.isExpansionEnabled()) {
+ if (isCollapsingEnabled() && cfg.isExpansionEnabled()) {
final String collapseId = getParameter(COLLAPSE_PARAMETER);
if (collapseId != null && !collapseId.equals("")) {
if (searchResult.getResults().size() > 0) {
@@ -481,7 +493,7 @@
}
}
- if (cfg.isCollapsingEnabled()) {
+ if (isCollapsingEnabled()) {
final String currCollapseId = getParameter(COLLAPSE_PARAMETER);
if (currCollapseId == null || currCollapseId.equals("")) {
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
