Author: ssmiweve Date: 2008-01-25 18:17:42 +0100 (Fri, 25 Jan 2008) New Revision: 6039
Modified: trunk/ trunk/core-api/src/main/java/no/sesat/search/run/RunningQueryImpl.java trunk/generic.sesam/search-command-control/default/src/test/java/no/sesat/search/mode/config/SearchModeTest.java trunk/generic.sesam/war/pom.xml trunk/pom.xml trunk/query-api/src/main/java/no/sesat/search/query/parser/QueryParser.java trunk/query-api/src/main/java/no/sesat/search/query/token/VeryFastTokenEvaluator.java trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/SearchMode.java trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/SearchModeFactory.java trunk/war/src/main/java/no/sesat/search/http/filters/UserFilter.java trunk/war/src/main/webapp/index.jsp Log: Merged revisions 6025-6038 via svnmerge from http://sesat.no/svn/sesat-kernel/branches/2.16 ........ r6026 | ssmiweve | 2008-01-23 21:16:59 +0100 (Wed, 23 Jan 2008) | 2 lines classifiers hadn't been updated correctly. copy and past nightmare. ........ r6027 | ssmiweve | 2008-01-23 21:26:09 +0100 (Wed, 23 Jan 2008) | 1 line corrections to scm details ........ r6028 | ssmiweve | 2008-01-23 21:27:30 +0100 (Wed, 23 Jan 2008) | 1 line all one version typically. separate mvn release:branch commands can be used otherwise. ........ r6031 | ssmiweve | 2008-01-24 10:54:59 +0100 (Thu, 24 Jan 2008) | 1 line take out this stacktrace that fills up the logs ........ r6034 | ssmiweve | 2008-01-24 19:27:23 +0100 (Thu, 24 Jan 2008) | 1 line fix for sesat building without include-fast ........ r6035 | ssmiweve | 2008-01-24 20:12:02 +0100 (Thu, 24 Jan 2008) | 2 lines SEARCH-3967 - Splitting av geo med bindestrek (word joining hyphons) ........ r6036 | ssenrogn | 2008-01-24 22:11:07 +0100 (Thu, 24 Jan 2008) | 1 line SEARCH-4055 - fixed link to news front page. ........ r6037 | ssmiweve | 2008-01-25 13:20:50 +0100 (Fri, 25 Jan 2008) | 2 lines SEARCH-4072 - RunningQueryImpl.performResultHandlers ConcurrentModificationException ........ 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-6024 /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-6038 /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/core-api/src/main/java/no/sesat/search/run/RunningQueryImpl.java =================================================================== --- trunk/core-api/src/main/java/no/sesat/search/run/RunningQueryImpl.java 2008-01-25 16:29:49 UTC (rev 6038) +++ trunk/core-api/src/main/java/no/sesat/search/run/RunningQueryImpl.java 2008-01-25 17:17:42 UTC (rev 6039) @@ -206,7 +206,7 @@ /** * Thread run. Guts of the logic behind this class. - * XXX Insanely long method. Divide & Conquer. + * XXX long method. Divide & Conquer. * * @throws InterruptedException */ @@ -610,7 +610,9 @@ }, context); - final List<RunHandlerConfig> rhcList = context.getSearchMode().getRunHandlers(); + final List<RunHandlerConfig> rhcList + = new ArrayList<RunHandlerConfig>(context.getSearchMode().getRunHandlers()); + /* Adding NavigationRunHandler to all search modes */ rhcList.add(new NavigationRunHandlerConfig()); Modified: trunk/generic.sesam/search-command-control/default/src/test/java/no/sesat/search/mode/config/SearchModeTest.java =================================================================== --- trunk/generic.sesam/search-command-control/default/src/test/java/no/sesat/search/mode/config/SearchModeTest.java 2008-01-25 16:29:49 UTC (rev 6038) +++ trunk/generic.sesam/search-command-control/default/src/test/java/no/sesat/search/mode/config/SearchModeTest.java 2008-01-25 17:17:42 UTC (rev 6039) @@ -17,6 +17,8 @@ */ package no.sesat.search.mode.config; +import java.util.ArrayList; +import java.util.Collection; import javax.xml.parsers.DocumentBuilder; import no.schibstedsok.commons.ioc.ContextWrapper; import no.sesat.search.mode.SearchMode; @@ -68,7 +70,9 @@ webCrawl.setSpellchecklanguage("no"); webCrawl.setResultsToReturn(10); - mode.addSearchConfiguration(webCrawl); + final Collection<SearchConfiguration> searchConfigurations = new ArrayList<SearchConfiguration>(); + searchConfigurations.add(webCrawl); + mode.setSearchConfigurations(searchConfigurations); final DataModel datamodel = getDataModel(); @@ -146,8 +150,11 @@ searchConfiguration.setPartnerId("overturePartnerId"); searchConfiguration.setUrl("/d/search/p/standard/eu/xml/rlb/?mkt=se&adultFilter=clean&accountFilters=schibstedsok_se"); searchConfiguration.setEncoding("UTF-8"); - mode.addSearchConfiguration(searchConfiguration); + final Collection<SearchConfiguration> searchConfigurations = new ArrayList<SearchConfiguration>(); + searchConfigurations.add(searchConfiguration); + mode.setSearchConfigurations(searchConfigurations); + final DataModel datamodel = getDataModel(); final RunningQuery.Context rqCxt = new RunningQuery.Context(){ Modified: trunk/generic.sesam/war/pom.xml =================================================================== --- trunk/generic.sesam/war/pom.xml 2008-01-25 16:29:49 UTC (rev 6038) +++ trunk/generic.sesam/war/pom.xml 2008-01-25 17:17:42 UTC (rev 6039) @@ -44,11 +44,17 @@ </plugins> </build> <dependencies> - <dependency> + <dependency><!-- override making optional --> <groupId>sesat</groupId> <artifactId>generic.sesam.no-search-command-control</artifactId> <version>${version}</version> <optional>true</optional> + </dependency> + <dependency><!-- add the include-fast variant --> + <groupId>sesat</groupId> + <artifactId>generic.sesam.no-search-command-control</artifactId> + <version>${version}</version> + <classifier>include-fast</classifier> </dependency> </dependencies> </profile> @@ -75,7 +81,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <configuration><classifier>alpha</classifier></configuration> + <configuration><classifier>nuclei</classifier></configuration> </plugin> </plugins> </build> @@ -89,7 +95,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <configuration><classifier>alpha</classifier></configuration> + <configuration><classifier>beta</classifier></configuration> </plugin> </plugins> </build> @@ -103,7 +109,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <configuration><classifier>alpha</classifier></configuration> + <configuration><classifier>electron</classifier></configuration> </plugin> </plugins> </build> @@ -117,7 +123,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <configuration><classifier>alpha</classifier></configuration> + <configuration><classifier>gamma</classifier></configuration> </plugin> </plugins> </build> @@ -131,7 +137,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <configuration><classifier>alpha</classifier></configuration> + <configuration><classifier>production</classifier></configuration> </plugin> </plugins> </build> @@ -185,13 +191,6 @@ </dependency> <dependency> <groupId>sesat</groupId> - <artifactId>generic.sesam.no-search-command-control</artifactId> - <version>${version}</version> - <classifier>include-fast</classifier> - <optional>true</optional> - </dependency> - <dependency> - <groupId>sesat</groupId> <artifactId>generic.sesam.no-view-config</artifactId> <version>${version}</version> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2008-01-25 16:29:49 UTC (rev 6038) +++ trunk/pom.xml 2008-01-25 17:17:42 UTC (rev 6039) @@ -142,10 +142,10 @@ <artifactId>maven-release-plugin</artifactId> <version>2.0-beta-6</version> <configuration> - <tagBase>https://dev.schibstedsok.no/svn/${artifactId}/tags</tagBase> <generateReleasePom>false</generateReleasePom> <testmode>false</testmode> <commitByProject>true</commitByProject> + <autoVersionSubmodules>true</autoVersionSubmodules> </configuration> </plugin> <plugin> @@ -556,25 +556,25 @@ <link>http://java.sun.com/javaee/5/docs/api/</link> <link>http://logging.apache.org/log4j/docs/api/</link> <link> - https://dev.schibstedsok.no/maven2/SITE/schibstedsok-search/search-portal/sesat-httpclient-api/apidocs/ + http://sesat.no/projects/sesat-kernel/sesat-httpclient-api/apidocs/ </link> <link> - https://dev.schibstedsok.no/maven2/SITE/schibstedsok-search/search-portal/sesat-site-spi/apidocs/ + http://sesat.no/projects/sesat-kernel/sesat-site-spi/apidocs/ </link> <link> - https://dev.schibstedsok.no/maven2/SITE/schibstedsok-search/search-portal/sesat-query-api/apidocs/ + http://sesat.no/projects/sesat-kernel/sesat-query-api/apidocs/ </link> <link> - https://dev.schibstedsok.no/maven2/SITE/schibstedsok-search/search-portal/sesat-query-transform-spi/apidocs/ + http://sesat.no/projects/sesat-kernel/sesat-query-transform-spi/apidocs/ </link> <link> - https://dev.schibstedsok.no/maven2/SITE/schibstedsok-search/search-portal/sesat-data-model-api/apidocs/ + http://sesat.no/projects/sesat-kernel/sesat-data-model-api/apidocs/ </link> <link> - https://dev.schibstedsok.no/maven2/SITE/schibstedsok-search/search-portal/sesat-core-api/apidocs/ + http://sesat.no/projects/sesat-kernel/sesat-core-api/apidocs/ </link> <link> - https://dev.schibstedsok.no/maven2/SITE/schibstedsok-search/search-portal/sesat-war/apidocs/ + http://sesat.no/projects/sesat-kernel/sesat-war/apidocs/ </link> </links> </configuration> Modified: trunk/query-api/src/main/java/no/sesat/search/query/parser/QueryParser.java =================================================================== --- trunk/query-api/src/main/java/no/sesat/search/query/parser/QueryParser.java 2008-01-25 16:29:49 UTC (rev 6038) +++ trunk/query-api/src/main/java/no/sesat/search/query/parser/QueryParser.java 2008-01-25 17:17:42 UTC (rev 6039) @@ -17,8 +17,6 @@ * * Created on 12 January 2006, 12:32 * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. */ package no.sesat.search.query.parser; @@ -68,7 +66,10 @@ {'\u2010', '\u2015'} }; - char[] OPERATOR_CHARACTERS = {'*', '-', '+', '(', ')'}; + /** + * Duplication of the parser's operators. Must be kept uptodate! + */ + String[] OPERATORS = {"*", " -", " +", "(", ")"}; /** The Context an QueryParser implementation needs to work off. * The QueryParser is not responsible for Modified: trunk/query-api/src/main/java/no/sesat/search/query/token/VeryFastTokenEvaluator.java =================================================================== --- trunk/query-api/src/main/java/no/sesat/search/query/token/VeryFastTokenEvaluator.java 2008-01-25 16:29:49 UTC (rev 6038) +++ trunk/query-api/src/main/java/no/sesat/search/query/token/VeryFastTokenEvaluator.java 2008-01-25 17:17:42 UTC (rev 6039) @@ -50,7 +50,6 @@ import org.apache.log4j.Logger; -import org.apache.commons.lang.StringUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; @@ -121,13 +120,14 @@ final StringBuilder operatorRegexpBuilder = new StringBuilder(); - operatorRegexpBuilder.append("["); + operatorRegexpBuilder.append('('); - for (char c : QueryParser.OPERATOR_CHARACTERS) { - operatorRegexpBuilder.append('\\').append(c); + for (String c : QueryParser.OPERATORS) { + operatorRegexpBuilder.append('"' + Matcher.quoteReplacement(c) + "\"|"); } - operatorRegexpBuilder.append("]"); + operatorRegexpBuilder.setLength(operatorRegexpBuilder.length() - 1); + operatorRegexpBuilder.append(')'); OPERATOR_REGEX = operatorRegexpBuilder.toString(); } @@ -157,8 +157,8 @@ analysisResult = queryFast(context.getQueryString() .replaceAll(" ", "xxKEEPWSxx") // Hack to keep spaces. .replaceAll(SKIP_REGEX, "") - .replaceAll(OPERATOR_REGEX, "") - .replaceAll("xxKEEPWSxx", " ")); // Hack to keep spaces. + .replaceAll("xxKEEPWSxx", " ") // Hack to keep spaces. + .replaceAll(OPERATOR_REGEX, " ")); } // Public -------------------------------------------------------- @@ -174,6 +174,7 @@ * </ul> * * @param token can be any of the above + * @param query * @return true if the query contains any of the above */ public boolean evaluateToken(final TokenPredicate token, final String term, final String query) { @@ -192,7 +193,7 @@ } else { // HACK since DefaultOperatorClause wraps its children in parenthesis - // Also remove any operator characters. (SEARCH-3883) + // Also remove any operator characters. (SEARCH-3883 & SEARCH-3967) final String hackTerm = term.replaceAll("\\(|\\)","").replaceAll(OPERATOR_REGEX, ""); for (TokenMatch occurance : analysisResult.get(listname)) { @@ -326,6 +327,7 @@ * Search fast and find out if the given tokens are company, firstname, lastname etc * @param query */ + @SuppressWarnings("unchecked") private Map<String, List<TokenMatch>> queryFast(final String query) throws VeryFastListQueryException{ LOG.trace("queryFast( " + query + " )"); Modified: trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/SearchMode.java =================================================================== --- trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/SearchMode.java 2008-01-25 16:29:49 UTC (rev 6038) +++ trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/SearchMode.java 2008-01-25 17:17:42 UTC (rev 6039) @@ -29,6 +29,7 @@ import java.util.Collection; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import no.sesat.search.mode.config.SearchConfiguration; import no.sesat.search.run.handler.RunHandlerConfig; @@ -76,7 +77,7 @@ private SearchCommandExecutorConfig searchCommandExecutor = SearchCommandExecutorConfig.SEQUENTIAL; - private Collection<SearchConfiguration> searchConfigurations = new ArrayList<SearchConfiguration>(); + private Collection<SearchConfiguration> searchConfigurations; private SearchMode parentSearchMode; private boolean queryAnalysisEnabled = false; private String parentMode; @@ -136,20 +137,11 @@ * @param searchConfigurations */ public void setSearchConfigurations(Collection<SearchConfiguration> searchConfigurations) { - this.searchConfigurations = searchConfigurations; + this.searchConfigurations = Collections.unmodifiableCollection(searchConfigurations); } /** * - * @param conf - */ - public void addSearchConfiguration(SearchConfiguration conf) { - searchConfigurations.add(conf); - } - - - /** - * * @return */ public SearchCommandExecutorConfig getExecutor() { @@ -232,7 +224,7 @@ * @param runHandlers New list of run handlers */ public void setRunHandlers(final List<RunHandlerConfig> runHandlers) { - this.runHandlers = runHandlers; + this.runHandlers = Collections.unmodifiableList(runHandlers); } /** @@ -248,7 +240,7 @@ * @param runTransformers New List of run transformers */ public void setRunTransformers(final List<RunTransformerConfig> runTransformers) { - this.runTransformers = runTransformers; + this.runTransformers = Collections.unmodifiableList(runTransformers); } /** @@ -258,6 +250,7 @@ public List<RunTransformerConfig> getRunTransformers() { return runTransformers; } + // Inner classes ------------------------------------------------- } Modified: trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/SearchModeFactory.java =================================================================== --- trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/SearchModeFactory.java 2008-01-25 16:29:49 UTC (rev 6038) +++ trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/SearchModeFactory.java 2008-01-25 17:17:42 UTC (rev 6039) @@ -43,6 +43,7 @@ import javax.xml.parsers.ParserConfigurationException; import java.text.MessageFormat; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -266,6 +267,7 @@ final NodeList childNodes = modeE.getChildNodes(); + final Collection<SearchConfiguration> searchConfigurations = new ArrayList<SearchConfiguration>(); for (int j = 0; j < childNodes.getLength(); ++j) { final Node childNode = childNodes.item(j); @@ -273,7 +275,7 @@ continue; } final Element childElement = (Element) childNode; - + if(SEARCH_CONFIGURATION_FACTORY.supported(childElement.getTagName(), context)){ // commands @@ -281,7 +283,7 @@ = SEARCH_CONFIGURATION_FACTORY.parseSearchConfiguration(context, childElement, mode); modesCommands.put(sc.getName(), sc); - mode.addSearchConfiguration(sc); + searchConfigurations.add(sc); // }else if("navigation".equals(childElement.getTagName())){ // // navigation @@ -292,6 +294,7 @@ // mode.setNavigationConfiguration(parseNavigation(id, navigationElements)); } } + mode.setSearchConfigurations(searchConfigurations); // add mode try { Modified: trunk/war/src/main/java/no/sesat/search/http/filters/UserFilter.java =================================================================== --- trunk/war/src/main/java/no/sesat/search/http/filters/UserFilter.java 2008-01-25 16:29:49 UTC (rev 6038) +++ trunk/war/src/main/java/no/sesat/search/http/filters/UserFilter.java 2008-01-25 17:17:42 UTC (rev 6039) @@ -290,7 +290,8 @@ return (BasicUserService) new InitialContext(properties).lookup(jndi); } catch (final NamingException ne) { - LOG.error(ne.getMessage(), ne); + // acceptable for sesat not to have to have a user service backend + LOG.debug(ne.getMessage(), ne); return null; } } Modified: trunk/war/src/main/webapp/index.jsp =================================================================== --- trunk/war/src/main/webapp/index.jsp 2008-01-25 16:29:49 UTC (rev 6038) +++ trunk/war/src/main/webapp/index.jsp 2008-01-25 17:17:42 UTC (rev 6039) @@ -104,7 +104,7 @@ <div class="navMain"> <div> <img src="images/menu/icons/nyheter.png" width="16" height="16" alt="" /> - <a href='<search:boomerang url="/search/?c=m" param="category:front_service"/>' onclick="return strep(this);">Nyhetssøk</a> + <a href='<search:boomerang url="/nyheter/siste/" param="category:front_service"/>' onclick="return strep(this);">Nyhetssøk</a> </div> <div> <img src="images/menu/icons/bedrift.png" width="16" height="16" alt="" /> _______________________________________________ Kernel-commits mailing list [email protected] http://sesat.no/mailman/listinfo/kernel-commits
