Author: ssmiweve
Date: 2007-08-19 00:10:09 +0200 (Sun, 19 Aug 2007)
New Revision: 5630
Modified:
trunk/core-api/src/main/java/no/schibstedsok/searchportal/run/RunningWebQuery.java
trunk/view-config-spi/src/main/java/no/schibstedsok/searchportal/view/SearchTabFactory.java
trunk/war/src/main/java/no/schibstedsok/searchportal/http/servlet/SearchServlet.java
Log:
SEARCH-1622 - Present tab frontpages without having to execute RunningQuery
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-18 19:14:30 UTC (rev 5629)
+++
trunk/core-api/src/main/java/no/schibstedsok/searchportal/run/RunningWebQuery.java
2007-08-18 22:10:09 UTC (rev 5630)
@@ -177,7 +177,6 @@
// ...and...
request.setAttribute("enrichments", getEnrichments());
request.setAttribute("hits",getHits());
- request.setAttribute("tab", datamodel.getPage().getCurrentTab());
}
}
}
Modified:
trunk/view-config-spi/src/main/java/no/schibstedsok/searchportal/view/SearchTabFactory.java
===================================================================
---
trunk/view-config-spi/src/main/java/no/schibstedsok/searchportal/view/SearchTabFactory.java
2007-08-18 19:14:30 UTC (rev 5629)
+++
trunk/view-config-spi/src/main/java/no/schibstedsok/searchportal/view/SearchTabFactory.java
2007-08-18 22:10:09 UTC (rev 5630)
@@ -409,7 +409,7 @@
parseBoolean(tabE.getAttribute("display-css"), true),
parseBoolean(tabE.getAttribute("execute-on-blank"),
inherit != null
? inherit.isExecuteOnBlank()
- : true),
+ : false),
layout);
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-08-18 19:14:30 UTC (rev 5629)
+++
trunk/war/src/main/java/no/schibstedsok/searchportal/http/servlet/SearchServlet.java
2007-08-18 22:10:09 UTC (rev 5630)
@@ -427,6 +427,9 @@
datamodel.getPage().setCurrentTab(result);
}
+ // this is legacy. shorter to write in templates than
$datamodel.page.currentTab
+ request.setAttribute("tab", datamodel.getPage().getCurrentTab());
+
}catch(AssertionError ae){
// it's not normal to catch assert errors but we really want a 404
not 500 response error.
LOG.error("Caught Assertion: " + ae);
@@ -487,21 +490,21 @@
final RunningQuery query =
QueryFactory.getInstance().createQuery(rqCxt, request, response);
if( !datamodel.getQuery().getQuery().isBlank() ||
searchTab.isExecuteOnBlank() ){
+
query.run();
- }
+ stopWatch.stop();
+ LOG.info("Search took " + stopWatch + " " +
datamodel.getQuery().getString());
- stopWatch.stop();
- LOG.info("Search took " + stopWatch + " " +
datamodel.getQuery().getString());
+ if(!"NOCOUNT".equals(request.getParameter("IGNORE"))){
- if(!"NOCOUNT".equals(request.getParameter("IGNORE"))){
-
- STATISTICS_LOG.info(
- "<search-servlet"
- + (null != output ? " output=\"" +
output.getXmlEscaped() + "\">" : ">")
- + "<query>" + datamodel.getQuery().getXmlEscaped()
+ "</query>"
- + "<time>" + stopWatch + "</time>"
- +
((StringBuffer)request.getAttribute("no.schibstedsok.Statistics")).toString()
- + "</search-servlet>");
+ STATISTICS_LOG.info(
+ "<search-servlet"
+ + (null != output ? " output=\"" +
output.getXmlEscaped() + "\">" : ">")
+ + "<query>" +
datamodel.getQuery().getXmlEscaped() + "</query>"
+ + "<time>" + stopWatch + "</time>"
+ +
((StringBuffer)request.getAttribute("no.schibstedsok.Statistics")).toString()
+ + "</search-servlet>");
+ }
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
