Author: ssanthor
Date: 2007-05-09 15:11:11 +0200 (Wed, 09 May 2007)
New Revision: 5037
Modified:
trunk/site-spi/src/main/java/no/schibstedsok/searchportal/site/config/SiteConfiguration.java
trunk/war/src/main/java/no/schibstedsok/searchportal/http/servlet/SearchServlet.java
Log:
fix for SEARCH-1853
Modified:
trunk/site-spi/src/main/java/no/schibstedsok/searchportal/site/config/SiteConfiguration.java
===================================================================
---
trunk/site-spi/src/main/java/no/schibstedsok/searchportal/site/config/SiteConfiguration.java
2007-05-09 12:13:31 UTC (rev 5036)
+++
trunk/site-spi/src/main/java/no/schibstedsok/searchportal/site/config/SiteConfiguration.java
2007-05-09 13:11:11 UTC (rev 5037)
@@ -42,6 +42,8 @@
*/
public static final String IS_SITESEARCH_KEY = "site.issitesearch";
+ public static final String DEFAULTTAB_KEY = "site.defaultTab";
+
public interface Context extends BaseContext, PropertiesContext,
SiteContext {
}
Modified:
trunk/war/src/main/java/no/schibstedsok/searchportal/http/servlet/SearchServlet.java
===================================================================
---
trunk/war/src/main/java/no/schibstedsok/searchportal/http/servlet/SearchServlet.java
2007-05-09 12:13:31 UTC (rev 5036)
+++
trunk/war/src/main/java/no/schibstedsok/searchportal/http/servlet/SearchServlet.java
2007-05-09 13:11:11 UTC (rev 5037)
@@ -155,10 +155,11 @@
// determine the c parameter. default is 'd' unless there
exists a page parameter when it becomes 'i'.
final StringDataObject c = parametersDO.getValue("c");
final StringDataObject page = parametersDO.getValue("page");
+ final String defaultSearchTabKey =
datamodel.getSite().getSiteConfiguration().getProperty(SiteConfiguration.DEFAULTTAB_KEY);
final String searchTabKey = null != c && null !=
c.getString() && 0 < c.getString().length()
? c.getString()
- : null != page && null != page.getString() && 0 <
page.getString().length() ? "i" : "d";
-
+ : null != page && null != page.getString() && 0 <
page.getString().length() ? "i" : null != defaultSearchTabKey &&
!defaultSearchTabKey.equals("") ? defaultSearchTabKey: "c";
+ LOG.info("searchTabKey:" +searchTabKey);
final SearchTab searchTab = findSearchTab(genericCxt,
searchTabKey);
if (searchTab == null) {
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
