Author: ssthkjer
Date: 2007-03-14 11:21:44 +0100 (Wed, 14 Mar 2007)
New Revision: 4573
Modified:
trunk/war/src/main/java/no/schibstedsok/searchportal/http/servlet/SearchServlet.java
Log:
katalog.no empty query redirect fix
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-03-13 23:05:50 UTC (rev 4572)
+++
trunk/war/src/main/java/no/schibstedsok/searchportal/http/servlet/SearchServlet.java
2007-03-14 10:21:44 UTC (rev 4573)
@@ -174,6 +174,7 @@
final Map<String,StringDataObject> params = parametersDO.getValues();
final String qParam = null != params.get("q") ?
params.get("q").getString() : "";
final String cParm = null != params.get("c") ?
params.get("c").getString() : "";
+ final String wParam = null != params.get("where") ?
params.get("where").getString() : "";
// check if this is a sitesearch
final Properties props =
datamodel.getSite().getSiteConfiguration().getProperties();
@@ -187,8 +188,14 @@
}else if (null != cParm && ("d".equals(cParm) || "g".equals(cParm) ||
"cat".equals(cParm) || "catip".equals(cParm)) && !isSitesearch) {
// Extra check for the Norwegian web search. Search with an empty
query string
// should return the first page.
- if (qParam.trim().length() == 0) {
- redirect = "/";
+ if ("cat".equals(cParm) || "catip".equals(cParm)) {
+ if (wParam.trim().length() == 0 && qParam.trim().length() ==
0) {
+ redirect = "/";
+ }
+ } else {
+ if (qParam.trim().length() == 0) {
+ redirect = "/";
+ }
}
}
@@ -196,8 +203,7 @@
LOG.info("doGet(): Empty Query String redirect=" + redirect);
response.sendRedirect(redirect);
}
- return null != redirect;
- }
+ return null != redirect; }
private static void performFactoryReloads(
final String reload,
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
