Author: ssanthor
Date: 2006-12-15 20:18:55 +0100 (Fri, 15 Dec 2006)
New Revision: 4195
Added:
branches/2.6.1/war/src/webapp/WEB-INF/jsp/decorators/saveDecorator.jsp
Modified:
branches/2.6.1/core-api/src/main/java/no/schibstedsok/searchportal/view/output/VelocityResultHandler.java
branches/2.6.1/war/src/main/java/no/schibstedsok/searchportal/http/servlet/SearchServlet.java
branches/2.6.1/war/src/webapp/WEB-INF/decorators.xml
branches/2.6.1/war/src/webapp/WEB-INF/sitemesh.xml
Log:
added calendar link
Modified:
branches/2.6.1/core-api/src/main/java/no/schibstedsok/searchportal/view/output/VelocityResultHandler.java
===================================================================
---
branches/2.6.1/core-api/src/main/java/no/schibstedsok/searchportal/view/output/VelocityResultHandler.java
2006-12-15 17:31:35 UTC (rev 4194)
+++
branches/2.6.1/core-api/src/main/java/no/schibstedsok/searchportal/view/output/VelocityResultHandler.java
2006-12-15 19:18:55 UTC (rev 4195)
@@ -27,6 +27,7 @@
import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.tools.generic.MathTool;
+import org.apache.velocity.tools.generic.DateTool;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.StringWriter;
@@ -109,6 +110,9 @@
context.put("decoder", new Decoder());
// math tool
context.put("math", new MathTool());
+ // date tool
+ context.put("date", new DateTool());
+
return context;
}
Modified:
branches/2.6.1/war/src/main/java/no/schibstedsok/searchportal/http/servlet/SearchServlet.java
===================================================================
---
branches/2.6.1/war/src/main/java/no/schibstedsok/searchportal/http/servlet/SearchServlet.java
2006-12-15 17:31:35 UTC (rev 4194)
+++
branches/2.6.1/war/src/main/java/no/schibstedsok/searchportal/http/servlet/SearchServlet.java
2006-12-15 19:18:55 UTC (rev 4195)
@@ -262,7 +262,18 @@
} catch (IOException ex) {
ex.printStackTrace();
}
- } else {
+ } else if (request.getParameter("output") != null &&
request.getParameter("output").equals("savedecorator")) {
+ String showid = request.getParameter("showId");
+ String userAgent = request.getHeader("User-Agent");
+ String fileName = ".vcs";
+ if(userAgent.indexOf("Mac OS X") != -1)
+ fileName=".ics";
+ if(showid == null)
+ showid="";
+ response.setContentType("text/calendar; charset=iso-8859-1");
+
response.setHeader("Content-Disposition","attachment;filename=sesam-tvsok-"
+showid +fileName );
+
+ } else {
response.setContentType("text/html; charset=utf-8");
}
}
Modified: branches/2.6.1/war/src/webapp/WEB-INF/decorators.xml
===================================================================
--- branches/2.6.1/war/src/webapp/WEB-INF/decorators.xml 2006-12-15
17:31:35 UTC (rev 4194)
+++ branches/2.6.1/war/src/webapp/WEB-INF/decorators.xml 2006-12-15
19:18:55 UTC (rev 4195)
@@ -10,6 +10,7 @@
<decorator name="mobiledecorator" page="mobileDecorator.jsp"/>
+ <decorator name="savedecorator" page="saveDecorator.jsp"/>
<decorator name="maindecorator" page="mainDecorator.jsp">
<pattern>*</pattern>
Added: branches/2.6.1/war/src/webapp/WEB-INF/jsp/decorators/saveDecorator.jsp
===================================================================
--- branches/2.6.1/war/src/webapp/WEB-INF/jsp/decorators/saveDecorator.jsp
(rev 0)
+++ branches/2.6.1/war/src/webapp/WEB-INF/jsp/decorators/saveDecorator.jsp
2006-12-15 19:18:55 UTC (rev 4195)
@@ -0,0 +1,5 @@
+<[EMAIL PROTECTED] contentType="text/calendar"%><[EMAIL PROTECTED]
pageEncoding="iso-8859-1"%>
+<%@ taglib uri="/WEB-INF/SearchPortal.tld" prefix="search" %>
+<search:velocity template="/results/tvCalendar"/>
+
+
\ No newline at end of file
Modified: branches/2.6.1/war/src/webapp/WEB-INF/sitemesh.xml
===================================================================
--- branches/2.6.1/war/src/webapp/WEB-INF/sitemesh.xml 2006-12-15 17:31:35 UTC
(rev 4194)
+++ branches/2.6.1/war/src/webapp/WEB-INF/sitemesh.xml 2006-12-15 19:18:55 UTC
(rev 4195)
@@ -5,6 +5,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/calendar"
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
