Author: gttersen
Date: 2007-04-17 19:29:03 +0200 (Tue, 17 Apr 2007)
New Revision: 4827
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractSearchCommand.java
trunk/core-api/src/main/java/no/schibstedsok/searchportal/result/handler/ResultHandler.java
trunk/data-model-api/src/main/java/no/schibstedsok/searchportal/datamodel/site/SiteDataObject.java
trunk/site-spi/src/main/java/no/schibstedsok/searchportal/site/config/SiteConfiguration.java
Log:
Changes to make SiteContext available in ResultHandler:
- SiteConfiguration no longer exposes context,
- SiteDatObject now extends SiteContext
- ResultHandler.Context no longer extends SiteContext
- AbstarctSearchCommand no longer uses SiteConfiguration.getSiteContext()
Tests run ok.
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-04-17 15:29:50 UTC (rev 4826)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/AbstractSearchCommand.java
2007-04-17 17:29:03 UTC (rev 4827)
@@ -415,8 +415,9 @@
executeQuery |= null != parameters.get("c") &&
parameters.get("c").equals("nn");
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("na");
- executeQuery |= null != parameters.get("c") &&
parameters.get("c").equals("nm");
+ executeQuery |= null != parameters.get("c") &&
parameters.get("c").equals("na") && getTransformedQuery().trim().length() > 0;
+ executeQuery |= null != parameters.get("c") &&
parameters.get("c").equals("nc") && getTransformedQuery().trim().length() > 0;
+ executeQuery |= null != parameters.get("c") &&
parameters.get("c").equals("nm") && getTransformedQuery().trim().length() > 0;
executeQuery |= null != filter && filter.length() > 0;
LOG.info("executeQuery==" + executeQuery
@@ -483,7 +484,6 @@
context.getRunningQuery().addSource(modifier);
}
},
-
context.getDataModel().getSite().getSiteConfiguration().getSiteContext(),
context
);
resultHandler.handleResult(resultHandlerContext, datamodel);
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/result/handler/ResultHandler.java
===================================================================
---
trunk/core-api/src/main/java/no/schibstedsok/searchportal/result/handler/ResultHandler.java
2007-04-17 15:29:50 UTC (rev 4826)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/result/handler/ResultHandler.java
2007-04-17 17:29:03 UTC (rev 4827)
@@ -4,7 +4,6 @@
import no.schibstedsok.searchportal.datamodel.DataModel;
import no.schibstedsok.searchportal.result.Modifier;
import no.schibstedsok.searchportal.result.SearchResult;
-import no.schibstedsok.searchportal.site.SiteContext;
import no.schibstedsok.searchportal.site.config.ResourceContext;
import no.schibstedsok.searchportal.view.config.SearchTab;
@@ -19,7 +18,7 @@
* Slightly unusual in that the context never becomes a member field but
is only used inside the
* handleResult method.
*/
- public interface Context extends SiteContext, ResourceContext {
+ public interface Context extends ResourceContext {
SearchResult getSearchResult();
Modified:
trunk/data-model-api/src/main/java/no/schibstedsok/searchportal/datamodel/site/SiteDataObject.java
===================================================================
---
trunk/data-model-api/src/main/java/no/schibstedsok/searchportal/datamodel/site/SiteDataObject.java
2007-04-17 15:29:50 UTC (rev 4826)
+++
trunk/data-model-api/src/main/java/no/schibstedsok/searchportal/datamodel/site/SiteDataObject.java
2007-04-17 17:29:03 UTC (rev 4827)
@@ -8,23 +8,31 @@
package no.schibstedsok.searchportal.datamodel.site;
-import java.io.Serializable;
import no.schibstedsok.searchportal.datamodel.generic.DataObject;
import no.schibstedsok.searchportal.site.Site;
+import no.schibstedsok.searchportal.site.SiteContext;
import no.schibstedsok.searchportal.site.config.SiteConfiguration;
-/** The SiteDataObject is the datamodel's container for Site related classes.
+import java.io.Serializable;
+
+/**
+ * The SiteDataObject is the datamodel's container for Site related classes.
* These objects are intended to be shared instances corresponding to each
site and therefore thread-safe.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Mck</a>
* @version <tt>$Id$</tt>
*/
@DataObject
-public interface SiteDataObject extends Serializable {
+public interface SiteDataObject extends Serializable, SiteContext {
- /** The Site class is a key used by other classes that return
site-dependent results. **/
+ /**
+ * The Site class is a key used by other classes that return
site-dependent results. *
+ */
Site getSite();
- /** The SiteConfiguration class contains properties from the site's
configuration.properties. **/
+
+ /**
+ * The SiteConfiguration class contains properties from the site's
configuration.properties. *
+ */
SiteConfiguration getSiteConfiguration();
//Channels getChannels();
//TextMessage getTextMessage();
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-04-17 15:29:50 UTC (rev 4826)
+++
trunk/site-spi/src/main/java/no/schibstedsok/searchportal/site/config/SiteConfiguration.java
2007-04-17 17:29:03 UTC (rev 4827)
@@ -69,10 +69,6 @@
}
}
- public SiteContext getSiteContext() {
- return context;
- }
-
/**
* TODO comment me. *
*/
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
