Author: ssthkjer Date: 2007-01-26 12:52:51 +0100 (Fri, 26 Jan 2007) New Revision: 4375
Modified: trunk/core-api/src/main/java/no/schibstedsok/searchportal/result/handler/DataModelResultHandler.java trunk/war/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp Log: https://jira.sesam.no/jira/browse/SEARCH-194 - global number search from yp and wp Modified: trunk/core-api/src/main/java/no/schibstedsok/searchportal/result/handler/DataModelResultHandler.java =================================================================== --- trunk/core-api/src/main/java/no/schibstedsok/searchportal/result/handler/DataModelResultHandler.java 2007-01-25 10:06:03 UTC (rev 4374) +++ trunk/core-api/src/main/java/no/schibstedsok/searchportal/result/handler/DataModelResultHandler.java 2007-01-26 11:52:51 UTC (rev 4375) @@ -13,6 +13,7 @@ import no.schibstedsok.searchportal.result.SearchResult; import no.schibstedsok.searchportal.util.PagingDisplayHelper; import no.schibstedsok.searchportal.view.config.SearchTab; +import no.schibstedsok.searchportal.run.RunningQuery; import org.apache.log4j.Logger; /** @@ -55,12 +56,12 @@ synchronized( parameters ){ if( parameters.get("results") == null ){ parameters.put("results", new Hashtable<String,SearchResult>()); + parameters.put("runningQuery", (RunningQuery) parameters.get("query")); LOG.debug(DEBUG_CREATED_RESULTS); } } final Hashtable<String,SearchResult> results = (Hashtable<String,SearchResult>)parameters.get("results"); - LOG.debug(DEBUG_ADD_RESULT + config.getName()); results.put(config.getName(), cxt.getSearchResult()); Modified: trunk/war/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp =================================================================== --- trunk/war/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp 2007-01-25 10:06:03 UTC (rev 4374) +++ trunk/war/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp 2007-01-26 11:52:51 UTC (rev 4375) @@ -25,6 +25,7 @@ final String ss = request.getParameter("ss"); final String ssr = request.getParameter("ssr"); final String vertikal = request.getParameter("vertikal") == null ? "" : request.getParameter("vertikal"); +String commandname = "defaultSearch"; final Page siteMeshPage = (Page) request.getAttribute(RequestConstants.PAGE); pageContext.setAttribute("siteMeshPage", siteMeshPage); @@ -172,7 +173,7 @@ <% if (currentC.equals("p")) {%> <decorator:getProperty property="page.picsearch-results"/> <% } else { %> - <search:velocity template="results/scanpix" command="scanpix"/> + <search:velocity template="results/scanpix" command="scanpix"/> <decorator:getProperty property="page.picsearch-results"/> <%}%> <div class="clearFloat"> </div> @@ -181,6 +182,8 @@ <search:velocity template="results/tvSearch" command="tvSearch"/> <% } else { %> <decorator:getProperty property="page.search-results"/> + <search:velocity template="results/whitePages" command="whitePages"/> + <search:velocity template="results/yellowPages" command="yellowPages"/> <search:velocity template="results/giftProviders" command="giftProviders"/> <%}%> _______________________________________________ Kernel-commits mailing list [email protected] http://sesat.no/mailman/listinfo/kernel-commits
