Author: ajamtli
Date: 2006-05-05 17:02:06 +0200 (Fri, 05 May 2006)
New Revision: 2866
Modified:
trunk/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp
Log:
Included tv enrichment.
Modified: trunk/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp
===================================================================
--- trunk/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp 2006-05-05
13:33:17 UTC (rev 2865)
+++ trunk/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp 2006-05-05
15:02:06 UTC (rev 2866)
@@ -12,6 +12,7 @@
<%@ page import="no.schibstedsok.front.searchportal.result.Enrichment"%>
<%@ page import="no.schibstedsok.front.searchportal.result.Modifier"%>
<%@ page import="no.schibstedsok.front.searchportal.site.Site"%>
+<%@ page import="no.schibstedsok.front.searchportal.util.TvEnrichmentHelper"%>
<%@ page import="org.apache.commons.lang.StringEscapeUtils" %>
<%@ page import="org.apache.velocity.Template"%>
<%@ page import="org.apache.velocity.VelocityContext"%>
@@ -502,14 +503,23 @@
</c:forEach> -->
<decorator:getProperty
property="page.globalSearchTips" />
+
+ <%-- Find webtv and tv enrichments and
merge them --%>
+ <%
TvEnrichmentHelper.mergeEnrichments(request, engine, siteMeshPage,
"tvEnrichMerge"); %>
- <%-- Display enrichments in order --%>
-
<%-- Show tab's leading enrichments --%>
<c:forEach var="ee"
items="${enrichments}" varStatus="i">
<c:if test="${i.index <
tab.enrichmentOnTop && ee.analysisResult >= tab.enrichmentOnTopScore}">
- <c:set var="pageName"
value="page.${ee.name}"/>
- <c:out
value="${siteMeshPage.properties[pageName]}" escapeXml="false"/>
+ <c:choose>
+ <c:when test="${ee
== webtvEnrich || ee == tvEnrich}">
+ <c:out
value="${tvEnrichStr}" escapeXml="false"/>
+ <c:set
var="tvEnrichStr" value=""/>
+ </c:when>
+ <c:otherwise>
+ <c:set
var="pageName" value="page.${ee.name}"/>
+ <c:out
value="${siteMeshPage.properties[pageName]}" escapeXml="false"/>
+ </c:otherwise>
+ </c:choose>
</c:if>
</c:forEach>
@@ -517,14 +527,23 @@
<%-- Shows the 3 first hits if
more than 1 enrichment --%>
<decorator:getProperty
property="page.fast-results-norwegian_part1"/>
- <%-- Show tab's proceeding
enrichments --%>
- <c:forEach var="ee"
items="${enrichments}" varStatus="i">
- <c:if test="${(i.index >=
tab.enrichmentOnTop || ee.analysisResult < tab.enrichmentOnTopScore) && i.index
< tab.enrichmentLimit}">
- <c:set var="pageName"
value="page.${ee.name}"/>
- <c:out
value="${siteMeshPage.properties[pageName]}" escapeXml="false"/>
- </c:if>
- </c:forEach>
+ <%-- Show tab's proceeding enrichments
--%>
+ <c:forEach var="ee"
items="${enrichments}" varStatus="i">
+ <c:if test="${(i.index >=
tab.enrichmentOnTop || ee.analysisResult < tab.enrichmentOnTopScore) && i.index
< tab.enrichmentLimit}">
+ <c:choose>
+ <c:when
test="${ee == webtvEnrich || ee == tvEnrich}">
+ <c:out
value="${tvEnrichStr}" escapeXml="false"/>
+ <c:set
var="tvEnrichStr" value=""/>
+ </c:when>
+ <c:otherwise>
+ <c:set
var="pageName" value="page.${ee.name}"/>
+ <c:out
value="${siteMeshPage.properties[pageName]}" escapeXml="false"/>
+ </c:otherwise>
+ </c:choose>
+ </c:if>
+ </c:forEach>
+
<%-- Shows the 7 next hits after
the second/third enrichments --%>
<decorator:getProperty
property="page.fast-results-norwegian_part2"/>
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
