Author: ssthkjer Date: 2007-01-30 16:40:21 +0100 (Tue, 30 Jan 2007) New Revision: 4381
Modified: trunk/war/src/main/java/no/schibstedsok/searchportal/http/servlet/SearchServlet.java Log: https://jira.sesam.no/jira/browse/SEARCH-1353 - Implementere vcard 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-01-30 15:32:33 UTC (rev 4380) +++ trunk/war/src/main/java/no/schibstedsok/searchportal/http/servlet/SearchServlet.java 2007-01-30 15:40:21 UTC (rev 4381) @@ -239,7 +239,7 @@ /* Setting default encoding */ response.setCharacterEncoding("UTF-8"); - + // TODO. Any better way to do this. Sitemesh? if (request.getParameter("output") != null && request.getParameter("output").equals("rss")) { if (request.getParameter("encoding") != null && request.getParameter("encoding").equals("iso-8859-1")){ @@ -256,7 +256,7 @@ "<html><head><META name=\"decorator\" content=\"mobiledecorator\"/></head></html>"); } catch (IOException ex) { LOG.error(ex.getMessage(), ex); - } + } } else if (request.getParameter("output") != null && request.getParameter("output").equals("savedecorator")) { String showid = request.getParameter("showId"); String userAgent = request.getHeader("User-Agent"); @@ -270,7 +270,20 @@ showid=""; response.setContentType("text/calendar; charset=" +charset); response.setHeader("Content-Disposition","attachment;filename=sesam-tvsok-" +showid +fileName ); - + } else if (request.getParameter("output") != null && request.getParameter("output").equals("vcarddecorator")) { + String showid = request.getParameter("showId"); + String userAgent = request.getHeader("User-Agent"); + String fileName = ".vcf"; + 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/x-vcard; charset=" +charset); + response.setHeader("Content-Disposition","attachment;filename=vcard-" +showid + ".vcf"); + } else { response.setContentType("text/html; charset=utf-8"); } _______________________________________________ Kernel-commits mailing list [email protected] http://sesat.no/mailman/listinfo/kernel-commits
