Author: daniele
Date: 2007-03-29 22:56:39 +0200 (Thu, 29 Mar 2007)
New Revision: 4685
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/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/CatalogueEmptyQueryQueryTransformer.java
trunk/war/src/main/java/no/schibstedsok/searchportal/http/servlet/SearchServlet.java
Log:
reverted old code, cat again.
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 17:59:34 UTC (rev 4684)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractSearchCommand.java
2007-03-29 20:56:39 UTC (rev 4685)
@@ -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("y");
+ executeQuery |= null != parameters.get("c") &&
parameters.get("c").equals("cat");
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 17:59:34 UTC (rev 4684)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueSearchCommand.java
2007-03-29 20:56:39 UTC (rev 4685)
@@ -12,6 +12,10 @@
import java.util.regex.Pattern;
import no.schibstedsok.commons.ioc.BaseContext;
import no.schibstedsok.commons.ioc.ContextWrapper;
+import no.schibstedsok.searchportal.datamodel.generic.StringDataObject;
+import no.schibstedsok.searchportal.datamodel.generic.StringDataObjectSupport;
+import no.schibstedsok.searchportal.datamodel.query.QueryDataObject;
+import no.schibstedsok.searchportal.datamodel.request.ParametersDataObject;
import
no.schibstedsok.searchportal.mode.command.AbstractSearchCommand.ReconstructedQuery;
import no.schibstedsok.searchportal.mode.config.CatalogueSearchConfiguration;
import no.schibstedsok.searchportal.query.AndClause;
@@ -116,10 +120,10 @@
public CatalogueSearchCommand(final Context cxt) {
super(cxt);
-
+
final CatalogueSearchConfiguration conf =
(CatalogueSearchConfiguration) cxt
.getSearchConfiguration();
-
+
LOG.debug(DEBUG_CONF_NFO + conf.getSearchBy() + ' '
+ conf.getQueryParameterWhere() + ' '
+ conf.getSplit());
@@ -373,7 +377,7 @@
appendToQueryRepresentation(
createPhraseQuerySyntax("\""+getTransformedTerms().get(clause) + "\""));
- }else if(!getTransformedTerms().get(clause).equals("*")) {
+ }else if(!getTransformedTerms().get(clause).equals("")) {
StringBuilder sb = new StringBuilder();
sb.append("(");
@@ -407,7 +411,7 @@
}
if(useTerm){
- if (!getTransformedTerms().get(clause).equals("*")) {
+ if (!getTransformedTerms().get(clause).equals("")) {
appendToQueryRepresentation(
createPhraseQuerySyntax(getTransformedTerms().get(clause)));
}
Modified:
trunk/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/CatalogueEmptyQueryQueryTransformer.java
===================================================================
---
trunk/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/CatalogueEmptyQueryQueryTransformer.java
2007-03-29 17:59:34 UTC (rev 4684)
+++
trunk/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/CatalogueEmptyQueryQueryTransformer.java
2007-03-29 20:56:39 UTC (rev 4685)
@@ -2,6 +2,7 @@
package no.schibstedsok.searchportal.query.transform;
+import no.schibstedsok.searchportal.datamodel.generic.StringDataObjectSupport;
import no.schibstedsok.searchportal.query.LeafClause;
@@ -24,13 +25,10 @@
*/
public CatalogueEmptyQueryQueryTransformer(final QueryTransformerConfig
config){}
- /** TODO comment me. *
- * @param clause
- */
- protected void visitImpl(final LeafClause clause) {
- if (getContext().getQuery().isBlank()) {
- getContext().getTransformedTerms().put(clause, BLANK);
- }
- }
+ /** TODO comment me. *
+ * @param clause
+ */
+ protected void visitImpl(final LeafClause clause) {
+ }
}
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 17:59:34 UTC (rev 4684)
+++
trunk/war/src/main/java/no/schibstedsok/searchportal/http/servlet/SearchServlet.java
2007-03-29 20:56:39 UTC (rev 4685)
@@ -197,10 +197,10 @@
? parametersDO.getContextPath()
: "/";
- }else if (null != cParm && ("d".equals(cParm) || "g".equals(cParm) ||
"y".equals(cParm) || "yip".equals(cParm)) && !isSitesearch) {
+ }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 ("y".equals(cParm) || "yip".equals(cParm)) {
+ if ("cat".equals(cParm) || "catip".equals(cParm)) {
if (wParam.trim().length() == 0 && qParam.trim().length() ==
0) {
redirect = "/";
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
