Author: ssanthor
Date: 2006-12-19 10:03:04 +0100 (Tue, 19 Dec 2006)
New Revision: 4206

Modified:
   
branches/2.6.1/war/src/main/java/no/schibstedsok/searchportal/http/servlet/SearchServlet.java
Log:
changed encoding for windows

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-18 16:07:46 UTC (rev 4205)
+++ 
branches/2.6.1/war/src/main/java/no/schibstedsok/searchportal/http/servlet/SearchServlet.java
       2006-12-19 09:03:04 UTC (rev 4206)
@@ -266,11 +266,14 @@
                 String showid = request.getParameter("showId");
                 String userAgent = request.getHeader("User-Agent");
                 String fileName = ".vcs";
-                if(userAgent.indexOf("Mac OS X") != -1)
+                String charset = "utf-8";
+                if(userAgent.indexOf("Windows") != -1){
+                       charset = "iso-8859-1";
+                }else if(userAgent.indexOf("Mac OS X") != -1)
                    fileName=".ics";
                 if(showid == null)
                    showid="";
-                response.setContentType("text/calendar; charset=utf-8");
+                response.setContentType("text/calendar; charset=" +charset);
                 
response.setHeader("Content-Disposition","attachment;filename=sesam-tvsok-" 
+showid +fileName  );
                
         } else { 

_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits

Reply via email to