Author: ssthkjer Date: 2007-02-15 09:09:52 +0100 (Thu, 15 Feb 2007) New Revision: 4443
Added: trunk/war/src/webapp/WEB-INF/jsp/decorators/opensearchDecorator.jsp Modified: trunk/war/src/main/java/no/schibstedsok/searchportal/http/servlet/SearchServlet.java trunk/war/src/webapp/WEB-INF/decorators.xml trunk/war/src/webapp/index.jsp Log: https://jira.sesam.no/jira/browse/PRIO-27 / Lage s?\195?\184kebokser for IE7 og Firefox 2.0 basert p?\195?\165 Opensearch 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-02-14 16:23:12 UTC (rev 4442) +++ trunk/war/src/main/java/no/schibstedsok/searchportal/http/servlet/SearchServlet.java 2007-02-15 08:09:52 UTC (rev 4443) @@ -295,7 +295,10 @@ response.setCharacterEncoding(charset); response.setContentType("text/x-vcard; charset=" +charset); response.setHeader("Content-Disposition","attachment;filename=vcard-" +showid + ".vcf"); - + } else if (request.getParameter("output") != null && request.getParameter("output").equals("opensearch")) { + String charset = "utf-8"; + response.setCharacterEncoding(charset); + response.setContentType("text/xml; charset=utf-8"); } else { response.setContentType("text/html; charset=utf-8"); Modified: trunk/war/src/webapp/WEB-INF/decorators.xml =================================================================== --- trunk/war/src/webapp/WEB-INF/decorators.xml 2007-02-14 16:23:12 UTC (rev 4442) +++ trunk/war/src/webapp/WEB-INF/decorators.xml 2007-02-15 08:09:52 UTC (rev 4443) @@ -11,7 +11,7 @@ <decorator name="mobiledecorator" page="mobileDecorator.jsp"/> <decorator name="savedecorator" page="saveDecorator.jsp"/> - + <decorator name="opensearch" page="opensearchDecorator.jsp"/> <decorator name="vcarddecorator" page="vcardDecorator.jsp"/> <decorator name="maindecorator" page="mainDecorator.jsp"> Added: trunk/war/src/webapp/WEB-INF/jsp/decorators/opensearchDecorator.jsp =================================================================== --- trunk/war/src/webapp/WEB-INF/jsp/decorators/opensearchDecorator.jsp (rev 0) +++ trunk/war/src/webapp/WEB-INF/jsp/decorators/opensearchDecorator.jsp 2007-02-15 08:09:52 UTC (rev 4443) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/";> + <InputEncoding>utf-8</InputEncoding> + <ShortName>Sesam.no</ShortName> + <Description>Search with Sesam Search</Description> + <Url type="text/html" template="http://sesam.no/search/?q={searchTerms}&c=d"; /> +</OpenSearchDescription> + + Modified: trunk/war/src/webapp/index.jsp =================================================================== --- trunk/war/src/webapp/index.jsp 2007-02-14 16:23:12 UTC (rev 4442) +++ trunk/war/src/webapp/index.jsp 2007-02-15 08:09:52 UTC (rev 4443) @@ -26,6 +26,8 @@ <link href="css/ps.css" rel="stylesheet" type="text/css" /> <link rel="icon" href="favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" /> + <link rel="search" type="application/opensearchdescription+xml" title="Sesam.no" href="search/?q=bil&c=d&output=opensearch" /> + </link> <script type="text/javascript" language="JavaScript" src="javascript/common.js"></script> <script type="text/javascript" language="JavaScript"><!-- function strep(qtag) { _______________________________________________ Kernel-commits mailing list [email protected] http://sesat.no/mailman/listinfo/kernel-commits
