From 0861936a2e848c6d7bbd1fb3cec2035663f637aa Mon Sep 17 00:00:00 2001 From: David Caruana Date: Fri, 12 Jan 2007 16:39:41 +0000 Subject: [PATCH] OpenSearch - provide access to requested format in response template - search response links render appropriate format argument git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4812 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/web/api/APIRequest.java | 11 +++++++ .../alfresco/web/api/services/TextSearch.java | 32 +++++++++---------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/source/java/org/alfresco/web/api/APIRequest.java b/source/java/org/alfresco/web/api/APIRequest.java index 63a5e26f45..d9fa3c4e5e 100644 --- a/source/java/org/alfresco/web/api/APIRequest.java +++ b/source/java/org/alfresco/web/api/APIRequest.java @@ -110,4 +110,15 @@ public class APIRequest extends HttpServletRequestWrapper return Boolean.valueOf(getParameter("guest")); } + /** + * Get Requested Format + * + * @return content type requested + */ + public String getFormat() + { + String format = getParameter("format"); + return (format == null || format.length() == 0) ? "" : format; + } + } diff --git a/source/java/org/alfresco/web/api/services/TextSearch.java b/source/java/org/alfresco/web/api/services/TextSearch.java index 99038ffb45..c8985abfb3 100644 --- a/source/java/org/alfresco/web/api/services/TextSearch.java +++ b/source/java/org/alfresco/web/api/services/TextSearch.java @@ -154,19 +154,16 @@ public class TextSearch extends APIServiceImpl String template = HTML_TEMPLATE; // TODO: data-drive this - String format = req.getParameter("format"); - if (format != null) + String format = req.getFormat(); + if (format.equals("atom")) { - if (format.equals("atom")) - { - contentType = APIResponse.ATOM_TYPE; - template = ATOM_TEMPLATE; - } - else if (format.equals("xml")) - { - contentType = APIResponse.XML_TYPE; - template = ATOM_TEMPLATE; - } + contentType = APIResponse.ATOM_TYPE; + template = ATOM_TEMPLATE; + } + else if (format.equals("xml")) + { + contentType = APIResponse.XML_TYPE; + template = ATOM_TEMPLATE; } Map model = createTemplateModel(req, res); @@ -429,15 +426,15 @@ public class TextSearch extends APIServiceImpl " ${search.itemsPerPage}\n" + " \n" + " \n" + - " \n" + - " \n" + + " \n" + + " \n" + "<#if search.startPage > 1>" + - " \n" + + " \n" + "" + "<#if search.startPage < search.totalPages>" + - " \n" + + " \n" + "" + - " \n" + + " \n" + " \n" + "<#list search.results as row>" + " \n" + @@ -555,6 +552,7 @@ public class TextSearch extends APIServiceImpl request.put("servicePath", "http://localhost:8080/alfresco/service"); request.put("path", "http://localhost:8080/alfresco"); request.put("guest", false); + request.put("format", "xml"); searchModel.put("xmldate", new ISO8601DateFormatMethod()); searchModel.put("urlencode", new UrlEncodeMethod()); searchModel.put("date", new Date());