Author: sshafroi Date: 2008-06-10 14:02:03 +0200 (Tue, 10 Jun 2008) New Revision: 6685
Modified: trunk/ trunk/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractSimpleFastSearchCommand.java trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/pages/sesam.com/index.jsp trunk/war/src/main/java/no/sesat/search/http/servlet/BoomerangServlet.java trunk/war/src/main/java/no/sesat/search/http/servlet/SearchServlet.java trunk/war/src/main/webapp/WEB-INF/web.xml Log: Merged revisions 6666-6684 via svnmerge from http://sesat.no/svn/sesat-kernel/branches/2.17 ........ r6669 | ssmiweve | 2008-06-04 15:17:55 +0200 (Wed, 04 Jun 2008) | 1 line Issue SKER4766: (Collection relevant query with no weight from Fast fails) ........ r6670 | ssmiweve | 2008-06-04 23:48:01 +0200 (Wed, 04 Jun 2008) | 2 lines make hunting boomerangs work again ........ r6671 | ssmiweve | 2008-06-05 11:07:26 +0200 (Thu, 05 Jun 2008) | 1 line Issue SKER4763: (Is it possible to add more information to the <boomerang> log-entries?) ........ r6672 | ssmiweve | 2008-06-05 13:10:04 +0200 (Thu, 05 Jun 2008) | 1 line SEARCH-4689 - Innhold p?\195?\165 Sesam.com ........ r6673 | ssmiweve | 2008-06-05 13:35:05 +0200 (Thu, 05 Jun 2008) | 1 line SEARCH-4689 - Innhold p?\195?\165 Sesam.com ........ r6675 | ssmiweve | 2008-06-05 15:15:27 +0200 (Thu, 05 Jun 2008) | 1 line Issue SKER4769: (S?\195?\184k med "MAX" i sp?\195?\184rringen gir -1 p?\195?\165 nyhetss?\195?\184ket og 0 treff p?\195?\165 bloggs?\195?\184ket) ........ Property changes on: trunk ___________________________________________________________________ Name: svnmerge-integrated - /branches/2.10:1-4690,4692-4745 /branches/2.11:1-4933 /branches/2.12:1-5051,5053-5106 /branches/2.13:1-5378 /branches/2.14:1-5508 /branches/2.15:1-5995 /branches/2.16:1-6499 /branches/2.17:1-6665 /branches/2.6:1-3877 /branches/2.7:1-4160 /branches/2.8:1-4446 /branches/2.9:1-4626 /branches/MAP_SEARCHv2:1-4544 + /branches/2.10:1-4690,4692-4745 /branches/2.11:1-4933 /branches/2.12:1-5051,5053-5106 /branches/2.13:1-5378 /branches/2.14:1-5508 /branches/2.15:1-5995 /branches/2.16:1-6499 /branches/2.17:1-6684 /branches/2.6:1-3877 /branches/2.7:1-4160 /branches/2.8:1-4446 /branches/2.9:1-4626 /branches/MAP_SEARCHv2:1-4544 Modified: trunk/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractSimpleFastSearchCommand.java =================================================================== --- trunk/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractSimpleFastSearchCommand.java 2008-06-10 10:01:45 UTC (rev 6684) +++ trunk/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractSimpleFastSearchCommand.java 2008-06-10 12:02:03 UTC (rev 6685) @@ -415,7 +415,6 @@ * TODO comment me */ protected void setAdditionalParameters(final ISearchParameters params) { - for(Map.Entry<String,String> entry : getSearchConfiguration().getSearchParameterMap().entrySet()){ params.setParameter(new SearchParameter(entry.getKey(), entry.getValue())); } @@ -856,32 +855,35 @@ return BasicWeightedSuggestion.instanceOf(orig, string, string, 1000); } + @SuppressWarnings("unchecked") private void collectRelevantQueries(IQueryResult result, FastSearchResult searchResult) { if (result.getQueryTransformations(false).getSuggestions().size() > 0) { - for (Iterator iterator = result.getQueryTransformations(false).getAllQueryTransformations().iterator(); iterator.hasNext();) - { - IQueryTransformation transformation = (IQueryTransformation) iterator.next(); + for (IQueryTransformation transformation + : (Collection<IQueryTransformation>)result + .getQueryTransformations(false).getAllQueryTransformations()){ + if (transformation.getName().equals("FastQT_Synonym") && transformation.getMessageID() == 8) { - String query = transformation.getQuery(); - String[] forWords = query.split("#!#"); + final String query = transformation.getQuery(); + final String[] forWords = query.split("#!#"); for (int i = 0; i < forWords.length; i++) { - String[] forOneWord = forWords[i].split("###"); + final String[] forOneWord = forWords[i].split("###"); + for (int j = 0; j < forOneWord.length; j++) { - String[] suggAndWeight = forOneWord[j].split("@"); + final String[] suggNweight = forOneWord[j].split("@"); - if (!datamodel.getQuery().getString().equalsIgnoreCase(suggAndWeight[0])) { + if (!datamodel.getQuery().getString().equalsIgnoreCase(suggNweight[0])) { final WeightedSuggestion rq = BasicWeightedSuggestion.instanceOf( getQuery().getQueryString(), - suggAndWeight[0], - suggAndWeight[0], - Integer.valueOf(suggAndWeight[1])); + suggNweight[0], + suggNweight[0], + 2 == suggNweight.length ? Integer.valueOf(suggNweight[1]) : Integer.MIN_VALUE); searchResult.addRelevantQuery(rq); } Modified: trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/pages/sesam.com/index.jsp =================================================================== --- trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/pages/sesam.com/index.jsp 2008-06-10 10:01:45 UTC (rev 6684) +++ trunk/generic.sesam/sesam.com/war/src/main/webapp/WEB-INF/classes/pages/sesam.com/index.jsp 2008-06-10 12:02:03 UTC (rev 6685) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?><jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"; - xmlns:search="urn:jsptld:/WEB-INF/SearchPortal.tld"><!-- XXX a little awkward since SearchPortal.tld never exists in the skin --><jsp:output - doctype-root-element="html" - doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" - doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"; /><!-- + xmlns:search="urn:jsptld:/WEB-INF/SearchPortal.tld"><!-- XXX a little awkward since SearchPortal.tld never exists in the skin --><jsp:output + doctype-root-element="html" + doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" + doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"; /><!-- * Copyright (2008) Schibsted Søk AS * This file is part of SESAT. * @@ -32,9 +32,42 @@ <div id="header"> <search:include include="top-col-one" /> </div> + + <br/><br/><br/><br/><br/><hr/><br/> + <p style="padding-left: 50px; font-size:16px;font-weight:bold;">Other Sesam search engines:</p> + <p style="padding: 5px 0px 0px 50px; margin-bottom:20px; font-size:14px;"> + <a href="http://www.sesam.no/";>Click here to visit the Norwegian site.</a><br/> + <a href="http://www.sesam.se/";>Click here to visit the Swedish site.</a><br/> + </p> + + <hr/> + <p style="padding: 5px 0px 0px 50px; margin-bottom:20px; font-size:14px; font-weight: bold;"> + For more information, please contact us:</p> + + <p style="padding-left: 50px; margin-top:20px;"> + <b>Schibsted Søk AS</b><br /> + Postboks 277 Sentrum<br /> + 0103 Oslo<br /> + Norway<br/><br /> + Telephone: +47 23 05 97 00<br /> + Fax:<![CDATA[ ]]> +47 22 42 96 97 <br /> + Email:<![CDATA[ ]]> + <a href="mailto:[EMAIL PROTECTED] fra www.sesam.com">[EMAIL PROTECTED]</a><br/><br/> + </p> + <p style="padding-left: 50px; margin-top:20px;"> + <b>Schibsted Sök AB</b><br /> + 105 17 STOCKHOLM<br /> + Sweden<br/><br /> + Telephone: +46 08 13 53 10<br /> + Fax:<![CDATA[ ]]>+46 08 20 96 70<br /> + Email:<![CDATA[ ]]> + <a href="mailto:[EMAIL PROTECTED] fra www.sesam.com">[EMAIL PROTECTED]</a><br /> + </p> + <br/><hr/> + <div id="footer"> <search:include include="bottom-col-four" /> - </div> + </div> </td></tr></table> </body> Modified: trunk/war/src/main/java/no/sesat/search/http/servlet/BoomerangServlet.java =================================================================== --- trunk/war/src/main/java/no/sesat/search/http/servlet/BoomerangServlet.java 2008-06-10 10:01:45 UTC (rev 6684) +++ trunk/war/src/main/java/no/sesat/search/http/servlet/BoomerangServlet.java 2008-06-10 12:02:03 UTC (rev 6685) @@ -1,5 +1,5 @@ /* - * Copyright (2006-2007) Schibsted Søk AS + * Copyright (2006-2008) Schibsted Søk AS * This file is part of SESAT. * * SESAT is free software: you can redistribute it and/or modify @@ -42,9 +42,11 @@ * Javascript functionality (or user behavour) is logged with <b>hunting</b> boomerangs that do not come back. * * A cermonial example is: + * http://sesam.no/boomerang/category=results;subcategory=main/http://wever.org * + * A hunting example is: + * http://sesam.no/hunting/?parameter-list * - * * @version <tt>$Id: 3361 $</tt> * */ @@ -53,7 +55,7 @@ private static final Logger LOG = Logger.getLogger(BoomerangServlet.class); private static final Logger ACCESS = Logger.getLogger("no.sesat.Access"); - private static final String CEREMONIAL = "/boomerang"; + private static final String CEREMONIAL = "/boomerang/"; @Override public void destroy() { } @@ -70,7 +72,7 @@ res.setHeader("Pragma", "no-cache"); // for old browsers res.setDateHeader("Expires", 0); // to be double-safe - if(req.getServletPath().startsWith(CEREMONIAL)){ + if(req.getRequestURI().startsWith(CEREMONIAL)){ // ceremonial boomerang final StringBuffer url = req.getRequestURL(); @@ -79,7 +81,7 @@ } // pick out the entrails - final int boomerangStart = url.indexOf(CEREMONIAL) + CEREMONIAL.length() + 1; + final int boomerangStart = url.indexOf(CEREMONIAL) + CEREMONIAL.length(); try{ final String grub = url.substring(boomerangStart, url.indexOf("/", boomerangStart)); @@ -89,8 +91,17 @@ final String destination = url.substring( url.indexOf("/", url.indexOf(CEREMONIAL) + CEREMONIAL.length() + 1) + 1); - // grub it up final Map<String,String> entrails = new HashMap<String,String>(); + + // request attribute to keep + entrails.put("referer", req.getHeader("Referer")); + entrails.put("method", req.getMethod()); + entrails.put("ipaddress", req.getRemoteAddr()); + entrails.put("user-agent", req.getHeader("User-Agent")); + entrails.put("user-id", SearchServlet.getCookieValue(req, "SesamID")); + entrails.put("user", SearchServlet.getCookieValue(req, "SesamUser")); + + // the grub details to add if(0 < grub.length()){ final StringTokenizer tokeniser = new StringTokenizer(grub, ";"); while(tokeniser.hasMoreTokens()){ @@ -121,7 +132,7 @@ }else{ - // hunting boomerang, just grub + // hunting boomerang, just grub, and the grub comes as clean parameters. final DataModel datamodel = (DataModel) req.getSession().getAttribute(DataModel.KEY); kangerooGrub(datamodel.getParameters().getValues()); Modified: trunk/war/src/main/java/no/sesat/search/http/servlet/SearchServlet.java =================================================================== --- trunk/war/src/main/java/no/sesat/search/http/servlet/SearchServlet.java 2008-06-10 10:01:45 UTC (rev 6684) +++ trunk/war/src/main/java/no/sesat/search/http/servlet/SearchServlet.java 2008-06-10 12:02:03 UTC (rev 6685) @@ -504,7 +504,7 @@ } // probably apache commons could simplify this // duplicated in SiteLocatorFilter - private static String getCookieValue(final HttpServletRequest request, final String cookieName){ + static String getCookieValue(final HttpServletRequest request, final String cookieName){ String value = ""; // Look in attributes (it could have already been updated this request) Modified: trunk/war/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/war/src/main/webapp/WEB-INF/web.xml 2008-06-10 10:01:45 UTC (rev 6684) +++ trunk/war/src/main/webapp/WEB-INF/web.xml 2008-06-10 12:02:03 UTC (rev 6685) @@ -218,13 +218,15 @@ </servlet-mapping> <servlet-mapping> + <!-- Ceremonial boomerangs --> <servlet-name>Boomerang</servlet-name> <url-pattern>/boomerang/*</url-pattern> </servlet-mapping> <servlet-mapping> + <!-- Hunting boomerangs --> <servlet-name>Boomerang</servlet-name> - <url-pattern>/search/writeLog.do</url-pattern> + <url-pattern>/hunting/*</url-pattern> </servlet-mapping> <servlet-mapping> _______________________________________________ Kernel-commits mailing list [email protected] http://sesat.no/mailman/listinfo/kernel-commits
