Author: sshafroi Date: 2008-04-09 08:38:46 +0200 (Wed, 09 Apr 2008) New Revision: 6390
Modified: trunk/ trunk/generic.sesam/query-transform-config/src/main/java/no/sesat/search/query/transform/TokenMaskQueryTransformerConfig.java trunk/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractESPFastSearchCommand.java trunk/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/NewsEspSearchCommand.java trunk/generic.sesam/sesam.com/war/ trunk/mojo/src/main/java/no/sesat/mojo/SearchModesSchemaGenerator.java trunk/query-api/src/main/java/no/sesat/search/query/parser/QueryParser.java Log: Merged revisions 6380-6389 via svnmerge from http://sesat.no/svn/sesat-kernel/branches/2.17 ........ r6381 | ssmiweve | 2008-04-07 15:01:27 +0200 (Mon, 07 Apr 2008) | 1 line SEARCH-3982 - Sortby: word [space] [hyphen] [space] word ........ r6382 | ssenrogn | 2008-04-08 09:10:17 +0200 (Tue, 08 Apr 2008) | 1 line Added Eclipse files to ignore list. ........ r6383 | sshafroi | 2008-04-08 10:03:29 +0200 (Tue, 08 Apr 2008) | 1 line Make it 1.5 compatible ........ r6385 | ssmiweve | 2008-04-08 10:12:09 +0200 (Tue, 08 Apr 2008) | 1 line SEARCH-4470 - Scanpix search times out when the query is an url ........ r6389 | sshafroi | 2008-04-09 08:32:17 +0200 (Wed, 09 Apr 2008) | 2 lines TokenMaskQuertyTransformer's position attribute could not be set without the match attribute set aswell, which was an invalid attribute. Postionon will start working again now, so if you see something related to this then you know where to look. ........ 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-6337 /branches/2.17:1-6379 /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-6337 /branches/2.17:1-6389 /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/query-transform-config/src/main/java/no/sesat/search/query/transform/TokenMaskQueryTransformerConfig.java =================================================================== --- trunk/generic.sesam/query-transform-config/src/main/java/no/sesat/search/query/transform/TokenMaskQueryTransformerConfig.java 2008-04-09 06:32:17 UTC (rev 6389) +++ trunk/generic.sesam/query-transform-config/src/main/java/no/sesat/search/query/transform/TokenMaskQueryTransformerConfig.java 2008-04-09 06:38:46 UTC (rev 6390) @@ -99,7 +99,7 @@ super.readQueryTransformer(qt); addPredicates(qt.getAttribute("predicates").split(",")); - if(qt.getAttribute("match").length() > 0){ + if(qt.getAttribute("position").length() > 0){ setPosition(Position.valueOf(qt.getAttribute("position").toUpperCase())); } if(qt.getAttribute("mask").length() >0){ Modified: trunk/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractESPFastSearchCommand.java =================================================================== --- trunk/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractESPFastSearchCommand.java 2008-04-09 06:32:17 UTC (rev 6389) +++ trunk/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/AbstractESPFastSearchCommand.java 2008-04-09 06:38:46 UTC (rev 6390) @@ -40,6 +40,7 @@ import no.sesat.search.query.LeafClause; import no.sesat.search.query.NotClause; import no.sesat.search.query.OrClause; +import no.sesat.search.query.UrlClause; import no.sesat.search.query.Visitor; import no.sesat.search.query.XorClause; import no.sesat.search.result.BasicResultList; @@ -86,7 +87,6 @@ private static final Logger LOG = Logger.getLogger(AbstractESPFastSearchCommand.class); private static final String ERR_CALL_SET_VIEW = "setView() must be called prior to calling this method"; - private enum ReservedWord { AND("and"), OR("or"), @@ -422,6 +422,16 @@ } /** + * Adds quotes around the URL and replacing the '?'. Failing so will produce syntax error in filter. + * + * @param clause The url clause. + */ + protected void visitImpl(final UrlClause clause) { + + appendToQueryRepresentation('\"' + getTransformedTerm(clause).replace("?", " ") + '\"'); + } + + /** * @param clause The clause to examine. */ @Override Modified: trunk/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/NewsEspSearchCommand.java =================================================================== --- trunk/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/NewsEspSearchCommand.java 2008-04-09 06:32:17 UTC (rev 6389) +++ trunk/generic.sesam/search-command-control/fast/src/main/java/no/sesat/search/mode/command/NewsEspSearchCommand.java 2008-04-09 06:38:46 UTC (rev 6390) @@ -313,21 +313,6 @@ addMedium(clause); } - /** - * Adds quotes around the URL and replacing the '?'. Failing so will produce syntax error in filter. - * - * @param clause The url clause. - */ - protected void visitImpl(final UrlClause clause) { - - LOG.debug("Visiting me with: " + clause - + ", isroot=" + (getQuery().getRootClause() == clause) - + ", rootClause=" + getQuery().getRootClause()); - - // Modifies the query so url searches works. - appendToQueryRepresentation('"' + getTransformedTerm(clause).replace("?", " ") + '"'); - } - @Override public NewsEspCommandConfig getSearchConfiguration() { return (NewsEspCommandConfig) super.getSearchConfiguration(); Property changes on: trunk/generic.sesam/sesam.com/war ___________________________________________________________________ Name: svn:ignore - target + .project .classpath .settings .checkstyle target Modified: trunk/mojo/src/main/java/no/sesat/mojo/SearchModesSchemaGenerator.java =================================================================== --- trunk/mojo/src/main/java/no/sesat/mojo/SearchModesSchemaGenerator.java 2008-04-09 06:32:17 UTC (rev 6389) +++ trunk/mojo/src/main/java/no/sesat/mojo/SearchModesSchemaGenerator.java 2008-04-09 06:38:46 UTC (rev 6390) @@ -144,7 +144,7 @@ File outFolder = new File("target/source/"); outFolder.mkdirs(); - if (!classpath.isEmpty()) { + if (!classpath.equals("")) { classpath += File.pathSeparator; } classpath += outFolder.getAbsolutePath(); 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-04-09 06:32:17 UTC (rev 6389) +++ trunk/query-api/src/main/java/no/sesat/search/query/parser/QueryParser.java 2008-04-09 06:38:46 UTC (rev 6390) @@ -55,6 +55,7 @@ */ char[][] SKIP_CHARACTER_RANGES = { {' ', ' '}, + {'-', '-'}, {'!', '!'}, {'\u0023', '\u0029'}, {'\u003b', '\u0040'}, _______________________________________________ Kernel-commits mailing list [email protected] http://sesat.no/mailman/listinfo/kernel-commits
