Author: ssthkjer Date: 2007-07-19 10:02:27 +0200 (Thu, 19 Jul 2007) New Revision: 5533
Modified: trunk/war/src/main/java/no/schibstedsok/searchportal/http/servlet/SearchServlet.java Log: https://jira.sesam.no/jira/browse/SEARCH-2827 - Feil p?\195?\165 regnskapstall/rolleregister faner. 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-07-18 16:24:48 UTC (rev 5532) +++ trunk/war/src/main/java/no/schibstedsok/searchportal/http/servlet/SearchServlet.java 2007-07-19 08:02:27 UTC (rev 5533) @@ -377,33 +377,24 @@ */ private static boolean checkFinn( final HttpServletRequest request, - final HttpServletResponse response) throws IOException{ + final HttpServletResponse response, final DataModel datamodel) throws IOException{ if ("finn".equalsIgnoreCase(request.getParameter("finn"))) { - final Map<String,Integer> hits = (Map<String,Integer>)request.getAttribute("hits"); - final Map<String,ResultList<ResultItem>> res - = (Map<String,ResultList<ResultItem>>)request.getAttribute("results"); + if (datamodel.getSearch("catalogue").getResults().getHitCount() > 0) { - final ResultList<ResultItem> sr = res.get("yellowPages"); - if (sr.getResults().size() > 0) { - - final ResultItem sri = sr.getResults().get(0); - final String recordid = sri.getField("recordid").toString(); - final Integer yHits = hits.get("yellowPages"); - - if (yHits == 1) { - - final String url = "/search/?c=yip&q=" + request.getParameter("q") + if (datamodel.getSearch("catalogue").getResults().getHitCount() == 1) { + final ResultItem sri = datamodel.getSearch("catalogue").getResults().getResults().get(0); + final String recordid = sri.getField("contentid").toString(); + final String url = "/search/?c=yip&q=" + datamodel.getQuery().getQuery().getQueryString() + "&companyId=" + recordid + "&companyId_x=" + new MD5Generator("S3SAM rockz").generateMD5(recordid) - + (null != request.getParameter("showtab") - ? "&showtab=" + request.getParameter("showtab") + + (null != datamodel.getParameters().getValue("showtab").getUtf8UrlEncoded() + ? "&showtab=" + datamodel.getParameters().getValue("showtab").getUtf8UrlEncoded() : ""); LOG.info("Finn.no redirect: " + url); response.sendRedirect(url); - return true; } } @@ -495,7 +486,7 @@ } - checkFinn(request, response); + checkFinn(request, response, datamodel); } catch (InterruptedException e) { LOG.error("Task timed out"); _______________________________________________ Kernel-commits mailing list [email protected] http://sesat.no/mailman/listinfo/kernel-commits
