Author: ssmiweve
Date: 2007-08-18 21:14:30 +0200 (Sat, 18 Aug 2007)
New Revision: 5629
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/run/RunningQueryImpl.java
trunk/core-api/src/main/java/no/schibstedsok/searchportal/run/RunningWebQuery.java
trunk/war/src/main/java/no/schibstedsok/searchportal/view/taglib/SearchTabIncludeTag.java
Log:
SEARCH-3147 - Hele s?\195?\184keteksten vises ikke i TV-berikelsen
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/run/RunningQueryImpl.java
===================================================================
---
trunk/core-api/src/main/java/no/schibstedsok/searchportal/run/RunningQueryImpl.java
2007-08-17 12:55:31 UTC (rev 5628)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/run/RunningQueryImpl.java
2007-08-18 19:14:30 UTC (rev 5629)
@@ -31,6 +31,7 @@
import no.schibstedsok.searchportal.datamodel.generic.DataObject;
import no.schibstedsok.searchportal.datamodel.generic.MapDataObject;
import no.schibstedsok.searchportal.datamodel.generic.MapDataObjectSupport;
+import no.schibstedsok.searchportal.datamodel.generic.StringDataObject;
import no.schibstedsok.searchportal.datamodel.navigation.NavigationDataObject;
import no.schibstedsok.searchportal.datamodel.query.QueryDataObject;
import no.schibstedsok.searchportal.query.analyser.AnalysisRule;
@@ -125,16 +126,12 @@
assert null == datamodel.getQuery();
- final Map<String,Object> parameters =
datamodel.getJunkYard().getValues();
+ LOG.trace("RunningQuery(cxt," + query + ')');
- LOG.trace("RunningQuery(cxt," + query + "," + parameters + ")");
-
final String queryStr = trimDuplicateSpaces(query);
locale = datamodel.getSite().getSite().getLocale();
- initParameters(cxt);
-
final SiteContext siteCxt = new SiteContext(){
public Site getSite() {
return datamodel.getSite().getSite();
@@ -171,6 +168,7 @@
new DataObject.Property("string", queryStr),
new DataObject.Property("query", parser.getQuery()));
+ @SuppressWarnings("unchecked")
final MapDataObject<NavigationItem> navigations
= new
MapDataObjectSupport<NavigationItem>(Collections.EMPTY_MAP);
final NavigationDataObject navDO = factory.instantiate(
@@ -220,7 +218,7 @@
final StringBuilder analysisReport
= new StringBuilder(" <analyse><query>" +
datamodel.getQuery().getXmlEscaped() + "</query>\n");
- final Map<String,Object> parameters =
datamodel.getJunkYard().getValues();
+ final Map<String,StringDataObject> parameters =
datamodel.getParameters().getValues();
try {
@@ -238,7 +236,8 @@
final Collection<Callable<ResultList<? extends ResultItem>>>
commands
= new ArrayList<Callable<ResultList<? extends
ResultItem>>>();
- final boolean isRss = parameters.get(PARAM_OUTPUT) != null &&
parameters.get(PARAM_OUTPUT).equals("rss");
+ final boolean isRss = parameters.get(PARAM_OUTPUT) != null
+ && parameters.get(PARAM_OUTPUT).getString().equals("rss");
final SearchCommandFactory.Context scfContext = new
SearchCommandFactory.Context() {
public Site getSite() {
@@ -294,7 +293,7 @@
final AnalysisRule rule =
rules.getRule(eHint.getRule());
if (context.getSearchMode().isAnalysis()
- && "0".equals(parameters.get("offset"))
+ && (null == parameters.get("offset") ||
"0".equals(parameters.get("offset")))
&& (null == parameters.get("collapse") ||
"".equals(parameters.get("collapse")))
&& eHint.getWeight() > 0) {
@@ -459,7 +458,9 @@
}
if( noHitsOutput.length() >0 &&
datamodel.getQuery().getString().length() >0 &&
!"NOCOUNT".equals(parameters.get("IGNORE"))){
- final String output = (String) parameters.get("output");
+ final String output = null != parameters.get("output")
+ ? parameters.get("output").getString()
+ : null;
noHitsOutput.insert(0, "<no-hits mode=\"" +
context.getSearchTab().getKey()
+ (null != output ? "\" output=\"" + output : "")
+ "\">"
@@ -563,30 +564,5 @@
navHandler.handleRunningQuery(handlerContext);
}
- /** Used by the constructor. **/
- private void initParameters(final RunningQuery.Context rqCxt){
-
- final Map<String,Object> parameters =
datamodel.getJunkYard().getValues();
-
- parameters.put("query", this);
- parameters.put("locale", locale);
- if( null == parameters.get("offset") ){
- parameters.put("offset", "0");
- }
-
- final Properties props =
datamodel.getSite().getSiteConfiguration().getProperties();
-
- final SiteContext siteCxt = new SiteContext(){
- public Site getSite() {
- return datamodel.getSite().getSite();
- }
- };
-
- parameters.put("configuration", props);
-
- parameters.put("tab", rqCxt.getSearchTab()); // TODO remove
- parameters.put("c", rqCxt.getSearchTab().getKey()); // TODO remove
- }
-
// Inner classes -------------------------------------------------
}
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/run/RunningWebQuery.java
===================================================================
---
trunk/core-api/src/main/java/no/schibstedsok/searchportal/run/RunningWebQuery.java
2007-08-17 12:55:31 UTC (rev 5628)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/run/RunningWebQuery.java
2007-08-18 19:14:30 UTC (rev 5629)
@@ -173,9 +173,11 @@
LOG.trace("Added " + entry.getKey() + ", value: " +
request.getAttribute(entry.getKey()));
}
}
+
// ...and...
request.setAttribute("enrichments", getEnrichments());
request.setAttribute("hits",getHits());
+ request.setAttribute("tab", datamodel.getPage().getCurrentTab());
}
}
}
Modified:
trunk/war/src/main/java/no/schibstedsok/searchportal/view/taglib/SearchTabIncludeTag.java
===================================================================
---
trunk/war/src/main/java/no/schibstedsok/searchportal/view/taglib/SearchTabIncludeTag.java
2007-08-17 12:55:31 UTC (rev 5628)
+++
trunk/war/src/main/java/no/schibstedsok/searchportal/view/taglib/SearchTabIncludeTag.java
2007-08-18 19:14:30 UTC (rev 5629)
@@ -18,6 +18,7 @@
import java.util.Map;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
+import no.schibstedsok.searchportal.datamodel.DataModel;
import no.schibstedsok.searchportal.view.config.SearchTab;
import org.apache.log4j.Logger;
@@ -67,7 +68,8 @@
public void doTag() throws JspException {
final PageContext cxt = (PageContext) getJspContext();
- final SearchTab tab = (SearchTab) cxt.findAttribute("tab");
+ final DataModel datamodel = (DataModel)
cxt.findAttribute(DataModel.KEY);
+ final SearchTab tab = datamodel.getPage().getCurrentTab();
final String template = LAYOUT_DIRECTORY +
tab.getLayout().getInclude(include);
try{
cxt.getOut().println("<!-- " + include + " -->");
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
