Author: daniele
Date: 2007-01-18 12:19:21 +0100 (Thu, 18 Jan 2007)
New Revision: 4349
Added:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueAdsSearchCommand.java
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/config/CatalogueAdsSearchConfiguration.java
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/SearchModeFactory.java
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueSearchCommand.java
Log:
new search command for Catalogue Sponsor Ads
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/SearchModeFactory.java
===================================================================
---
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/SearchModeFactory.java
2007-01-18 11:12:12 UTC (rev 4348)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/SearchModeFactory.java
2007-01-18 11:19:21 UTC (rev 4349)
@@ -9,6 +9,7 @@
import
no.schibstedsok.searchportal.mode.config.BlendingNewsSearchConfiguration;
import no.schibstedsok.searchportal.mode.config.BlocketSearchConfiguration;
import no.schibstedsok.searchportal.mode.config.BlogSearchConfiguration;
+import
no.schibstedsok.searchportal.mode.config.CatalogueAdsSearchConfiguration;
import no.schibstedsok.searchportal.mode.config.CatalogueSearchConfiguration;
import no.schibstedsok.searchportal.mode.config.DailyWordConfiguration;
import no.schibstedsok.searchportal.mode.config.ESPFastSearchConfiguration;
@@ -368,9 +369,9 @@
BLOG_COMMAND(BlogSearchConfiguration.class),
PRISJAKT_COMMAND(PrisjaktSearchConfiguration.class),
BLOCKET_COMMAND(BlocketSearchConfiguration.class),
- CATALOGUE_COMMAND(CatalogueSearchConfiguration.class);
+ CATALOGUE_COMMAND(CatalogueSearchConfiguration.class),
+ CATALOGUE_ADS_COMMAND(CatalogueAdsSearchConfiguration.class);
-
private final Class<? extends SearchConfiguration> clazz;
private final String xmlName;
private static final String ERR_INIT_SEARCH_VIEW = "Search view could
not be initialized for ";
@@ -687,6 +688,12 @@
final CatalogueSearchConfiguration csc =
(CatalogueSearchConfiguration) sc;
fillBeanProperty(csc, inherit, "queryParameterWhere",
ParseType.String , commandE, "");
}
+ if(sc instanceof CatalogueAdsSearchConfiguration){
+ final CatalogueAdsSearchConfiguration casc =
(CatalogueAdsSearchConfiguration) sc;
+ fillBeanProperty(casc, inherit, "queryParameterWhere",
ParseType.String , commandE, "");
+ }
+
+
// query transformers
NodeList qtNodeList =
commandE.getElementsByTagName("query-transformers");
Added:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueAdsSearchCommand.java
===================================================================
---
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueAdsSearchCommand.java
(rev 0)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueAdsSearchCommand.java
2007-01-18 11:19:21 UTC (rev 4349)
@@ -0,0 +1,77 @@
+// Copyright (2006) Schibsted Søk AS
+/*
+ * WebSearchCommand.java
+ *
+ * Created on March 7, 2006, 1:01 PM
+ *
+ */
+
+package no.schibstedsok.searchportal.mode.command;
+
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+
+import no.fast.ds.search.SearchParameter;
+import
no.schibstedsok.searchportal.mode.command.AbstractSearchCommand.ReconstructedQuery;
+import no.schibstedsok.searchportal.query.LeafClause;
+import no.schibstedsok.searchportal.query.Query;
+import no.schibstedsok.searchportal.query.Visitor;
+import no.schibstedsok.searchportal.query.XorClause;
+import no.schibstedsok.searchportal.result.SearchResult;
+
+/**
+ *
+ * A search command for the web search.
+ * @author magnuse
+ */
+public class CatalogueAdsSearchCommand extends FastSearchCommand {
+
+ private static final Logger LOG =
Logger.getLogger(CatalogueAdsSearchCommand.class);
+
+
+ private String queryTwo=null;
+
+ /** Creates a new instance of WebSearchCommand.
+ *
+ * @param cxt Search command context.
+ * @param parameters Search command parameters.
+ */
+ public CatalogueAdsSearchCommand(final Context cxt, final Map parameters) {
+ super(cxt, parameters);
+
+ // hvis "where" parametern er sendt inn, så tar vi og leser inn query
fra
+ // den.
+ if(getSingleParameter("where") != null &&
getSingleParameter("where").length()>0){
+ final ReconstructedQuery rq =
createQuery(getSingleParameter("where"));
+
+ final Query query = rq.getQuery();
+
+ queryTwo = query.getQueryString();
+ }else{
+ queryTwo = " ingen";
+ }
+
+ }
+
+
+ /**
+ * Legg til iypcfspkeywords forran alle ord.
+ *
+ */
+ protected void visitImpl(final LeafClause clause) {
+ appendToQueryRepresentation("iypcfspkeywords:");
+ super.visitImpl(clause);
+
+ }
+
+
+ /**
+ * hent hele den transformerte querien.
+ * Den innholder query to også for qeo.
+ */
+ public String getTransformedQuery() {
+ // hvis det finnes en ekstra query, legg til denne i søket.
+ return queryTwo!=null ? super.getTransformedQuery()+"
iypcfspgeo:\""+queryTwo+"\"" : super.getTransformedQuery();
+ }
+}
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-01-18 11:12:12 UTC (rev 4348)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueSearchCommand.java
2007-01-18 11:19:21 UTC (rev 4349)
@@ -9,6 +9,8 @@
import java.util.List;
import java.util.Map;
+import no.fast.ds.search.ISearchParameters;
+import no.fast.ds.search.SearchParameter;
import no.schibstedsok.searchportal.query.Query;
import no.schibstedsok.searchportal.result.BasicSearchResultItem;
import no.schibstedsok.searchportal.result.CatalogueSearchResultItem;
@@ -42,6 +44,7 @@
final Query query = rq.getQuery();
queryTwo = query.getQueryString();
+
}
}
Added:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/config/CatalogueAdsSearchConfiguration.java
===================================================================
---
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/config/CatalogueAdsSearchConfiguration.java
(rev 0)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/config/CatalogueAdsSearchConfiguration.java
2007-01-18 11:19:21 UTC (rev 4349)
@@ -0,0 +1,23 @@
+/*
+ * Copyright (2005-2006) Schibsted Søk AS
+ */
+package no.schibstedsok.searchportal.mode.config;
+
+/**
+ *
+ * An implementation of Search Configuration for yellow searches.
+ *
+ * @author <a href="[EMAIL PROTECTED]">Lars Johansson</a>
+ * @version $Revision: 1 $
+ */
+public class CatalogueAdsSearchConfiguration extends FastSearchConfiguration {
+
+ public CatalogueAdsSearchConfiguration(){
+ super(null);
+ }
+
+ public CatalogueAdsSearchConfiguration(final SearchConfiguration asc){
+ super(asc);
+ }
+
+}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
