Author: daniele
Date: 2007-03-29 18:48:40 +0200 (Thu, 29 Mar 2007)
New Revision: 4683
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractSearchCommand.java
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueSearchCommand.java
trunk/war/src/main/java/no/schibstedsok/searchportal/http/servlet/SearchServlet.java
Log:
changed all references to c=cat and c=catip to new yellow name.
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractSearchCommand.java
===================================================================
---
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractSearchCommand.java
2007-03-29 14:13:59 UTC (rev 4682)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractSearchCommand.java
2007-03-29 16:48:40 UTC (rev 4683)
@@ -372,7 +372,7 @@
executeQuery |= null != parameters.get("c") &&
parameters.get("c").equals("wt");
executeQuery |= null != parameters.get("c") &&
parameters.get("c").equals("n");
executeQuery |= null != parameters.get("c") &&
parameters.get("c").equals("t");
- executeQuery |= null != parameters.get("c") &&
parameters.get("c").equals("cat");
+ executeQuery |= null != parameters.get("c") &&
parameters.get("c").equals("y");
executeQuery |= null != parameters.get("c") &&
parameters.get("c").equals("na");
executeQuery |= null != filter && filter.length() > 0;
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueSearchCommand.java
===================================================================
---
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueSearchCommand.java
2007-03-29 14:13:59 UTC (rev 4682)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueSearchCommand.java
2007-03-29 16:48:40 UTC (rev 4683)
@@ -269,7 +269,7 @@
@Override
public String getTransformedQuery() {
String query = super.getTransformedQuery();
-
+
boolean hasQueryString= (query!=null && query.length()>0);
boolean hasGeoQueryString = (queryGeoString != null &&
queryGeoString.length() > 0);
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-29 14:13:59 UTC (rev 4682)
+++
trunk/war/src/main/java/no/schibstedsok/searchportal/http/servlet/SearchServlet.java
2007-03-29 16:48:40 UTC (rev 4683)
@@ -197,10 +197,10 @@
? parametersDO.getContextPath()
: "/";
- }else if (null != cParm && ("d".equals(cParm) || "g".equals(cParm) ||
"cat".equals(cParm) || "catip".equals(cParm)) && !isSitesearch) {
+ }else if (null != cParm && ("d".equals(cParm) || "g".equals(cParm) ||
"y".equals(cParm) || "yip".equals(cParm)) && !isSitesearch) {
// Extra check for the Norwegian web search. Search with an empty
query string
// should return the first page.
- if ("cat".equals(cParm) || "catip".equals(cParm)) {
+ if ("y".equals(cParm) || "yip".equals(cParm)) {
if (wParam.trim().length() == 0 && qParam.trim().length() ==
0) {
redirect = "/";
}
@@ -215,7 +215,8 @@
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
