Author: magnuse
Date: 2006-05-02 18:16:29 +0200 (Tue, 02 May 2006)
New Revision: 2847
Added:
trunk/src/webapp/WEB-INF/jsp/decorators/mobileDecorator.jsp
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/servlet/SearchServlet.java
trunk/src/webapp/WEB-INF/decorators.xml
trunk/src/webapp/WEB-INF/sitemesh.xml
Log:
Sitemesh fixes for mobile.
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/servlet/SearchServlet.java
===================================================================
---
trunk/src/java/no/schibstedsok/front/searchportal/servlet/SearchServlet.java
2006-05-02 15:15:45 UTC (rev 2846)
+++
trunk/src/java/no/schibstedsok/front/searchportal/servlet/SearchServlet.java
2006-05-02 16:16:29 UTC (rev 2847)
@@ -96,7 +96,7 @@
// TODO. Any better way to do this. Sitemesh?
- if (site.getName().startsWith("mobile")) {
+ if (site.getName().startsWith("mobil")) {
httpServletResponse.setContentType("text/xml; charset=utf-8");
} else {
httpServletResponse.setContentType("text/html; charset=utf-8");
Modified: trunk/src/webapp/WEB-INF/decorators.xml
===================================================================
--- trunk/src/webapp/WEB-INF/decorators.xml 2006-05-02 15:15:45 UTC (rev
2846)
+++ trunk/src/webapp/WEB-INF/decorators.xml 2006-05-02 16:16:29 UTC (rev
2847)
@@ -5,8 +5,11 @@
<decorator name="printable" page="printDecorator.jsp" >
</decorator>
+ <decorator name="mobiledecorator" page="mobileDecorator.jsp"/>
+
<decorator name="maindecorator" page="mainDecorator.jsp">
<pattern>*</pattern>
</decorator>
+
</decorators>
Added: trunk/src/webapp/WEB-INF/jsp/decorators/mobileDecorator.jsp
===================================================================
--- trunk/src/webapp/WEB-INF/jsp/decorators/mobileDecorator.jsp
(rev 0)
+++ trunk/src/webapp/WEB-INF/jsp/decorators/mobileDecorator.jsp 2006-05-02
16:16:29 UTC (rev 2847)
@@ -0,0 +1,30 @@
+<%@ page import="java.io.StringWriter"%><%@ page
import="java.net.URLEncoder"%><%@ page import="java.util.List"%><%@ page
import="java.util.Iterator"%><%@ page
import="com.opensymphony.module.sitemesh.Page"%><%@ page
import="com.opensymphony.module.sitemesh.RequestConstants"%><%@ page
import="com.opensymphony.module.sitemesh.util.OutputConverter"%><%@ page
import="no.schibstedsok.front.searchportal.i18n.TextMessages"%><%@ page
import="no.schibstedsok.front.searchportal.output.VelocityResultHandler"%><%@
page import="no.schibstedsok.front.searchportal.query.run.RunningQuery" %><%@
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="org.apache.commons.lang.StringEscapeUtils" %><%@ page
import="org.apache.velocity.Template"%><%@ page
import="org.apache.velocity.VelocityContext"%><%@ page
import="org.apache.velocit
y.app.VelocityEngine"%><%
+ final Site site = (Site)request.getAttribute(Site.NAME_KEY);
+ final Page siteMeshPage = (Page)
request.getAttribute(RequestConstants.PAGE);
+ final TextMessages text = (TextMessages) request.getAttribute("text");
+ final VelocityEngine engine = VelocityResultHandler.getEngine(site);
+ final Template template = VelocityResultHandler.getTemplate(engine, site,
"/pages/main");
+ final RunningQuery query = (RunningQuery) request.getAttribute("query");
+ final List sources = query.getSources();
+
+ if (template != null){
+ final VelocityContext context =
VelocityResultHandler.newContextInstance(engine);
+
+ for (Iterator iter = sources.iterator(); iter.hasNext();) {
+ Modifier mod = (Modifier) iter.next();
+ if ( mod.getName().equals("sesam_hits")) {
+ context.put("sesam_hits", text.getMessage("numberFormat", new
Integer(mod.getCount())));
+ }
+ }
+ context.put("request", request);
+ context.put("response", response);
+ context.put("page", siteMeshPage);
+ context.put("base", request.getContextPath());
+ context.put("title", OutputConverter.convert(siteMeshPage.getTitle()));
+ context.put("text", text);
+ {
+ final StringWriter buffer = new StringWriter();
+ siteMeshPage.writeBody(OutputConverter.getWriter(buffer));
+ context.put("body", buffer.toString());
+ }
+ template.merge(context, out);}%>
\ No newline at end of file
Modified: trunk/src/webapp/WEB-INF/sitemesh.xml
===================================================================
--- trunk/src/webapp/WEB-INF/sitemesh.xml 2006-05-02 15:15:45 UTC (rev
2846)
+++ trunk/src/webapp/WEB-INF/sitemesh.xml 2006-05-02 16:16:29 UTC (rev
2847)
@@ -4,6 +4,7 @@
<page-parsers>
<parser content-type="text/html"
class="com.opensymphony.module.sitemesh.parser.HTMLPageParser"/>
+ <parser content-type="text/xml"
class="com.opensymphony.module.sitemesh.parser.HTMLPageParser"/>
<parser content-type="text/html;charset=ISO-8859-1"
class="com.opensymphony.module.sitemesh.parser.HTMLPageParser"/>
</page-parsers>
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
