Author: ssmiweve
Date: 2008-04-02 16:28:45 +0200 (Wed, 02 Apr 2008)
New Revision: 6332
Modified:
branches/2.16/war/src/main/java/no/sesat/search/http/servlet/SearchServlet.java
Log:
SEARCH-4410 - Move out SearchServlet.checkFinn
Modified:
branches/2.16/war/src/main/java/no/sesat/search/http/servlet/SearchServlet.java
===================================================================
---
branches/2.16/war/src/main/java/no/sesat/search/http/servlet/SearchServlet.java
2008-04-02 12:52:47 UTC (rev 6331)
+++
branches/2.16/war/src/main/java/no/sesat/search/http/servlet/SearchServlet.java
2008-04-02 14:28:45 UTC (rev 6332)
@@ -377,39 +377,6 @@
}
- /* TODO Move into a RunningQueryHandler
- *
- * redirects to yellowinfopage if request is from finn.no ->
req.param("finn") = "finn"
- * finn sends orgnumber as queryparam, if only 1 hit, then redirect.
- * @return true if a response.sendRedirect(..) was performed.
- */
- private static boolean checkFinn(
- final HttpServletRequest request,
- final HttpServletResponse response, final DataModel datamodel)
throws IOException{
-
- if ("finn".equalsIgnoreCase(request.getParameter("finn"))) {
-
- if (datamodel.getSearch("catalogue").getResults().getHitCount() >
0) {
-
- 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 !=
datamodel.getParameters().getValue("showtab").getUtf8UrlEncoded()
- ? "&showtab=" +
datamodel.getParameters().getValue("showtab").getUtf8UrlEncoded()
- : "");
-
- LOG.info("Finn.no redirect: " + url);
- response.sendRedirect(url);
- return true;
- }
- }
- }
- return false;
- }
-
private static SearchTab updateSearchTab(
final HttpServletRequest request,
final DataModelFactory dmFactory,
@@ -537,9 +504,6 @@
}
}
- // FIXME move out to a RunHandler implementation.
- checkFinn(request, response, datamodel);
-
} catch (InterruptedException e) {
LOG.error("Task timed out");
} catch (SiteKeyedFactoryInstantiationException e) {
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
