Author: alexparvulescu Date: Thu Sep 12 15:30:20 2013 New Revision: 1522616
URL: http://svn.apache.org/r1522616 Log: OAK-1008 Query parser splits token: FulltextQueryTest#testPredefinedEntityReference Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextParser.java jackrabbit/oak/trunk/oak-lucene/pom.xml Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java?rev=1522616&r1=1522615&r2=1522616&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java Thu Sep 12 15:30:20 2013 @@ -50,14 +50,6 @@ public class FullTextSearchImpl extends */ public static final boolean JACKRABBIT_2_SINGLE_QUOTED_PHRASE = true; - /** - * Compatibility for Jackrabbit 2.0 queries with ampersand. - * (contains(., "max&moritz")) - * The ampersand is converted to a space, and a search is made for the - * two words "max" and "moritz" (not a phrase search). - */ - public static final boolean JACKRABBIT_2_AMPERSAND_TO_SPACE = true; - private final String selectorName; private final String relativePath; private final String propertyName; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextParser.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextParser.java?rev=1522616&r1=1522615&r2=1522616&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextParser.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextParser.java Thu Sep 12 15:30:20 2013 @@ -45,11 +45,6 @@ public class FullTextParser { public static FullTextExpression parse(String propertyName, String text) throws ParseException { FullTextParser p = new FullTextParser(); p.propertyName = propertyName; - if (FullTextSearchImpl.JACKRABBIT_2_AMPERSAND_TO_SPACE) { - if (text.indexOf('&') >= 0) { - text = text.replace('&', ' '); - } - } p.text = text; FullTextExpression e = p.parseOr(); return e; Modified: jackrabbit/oak/trunk/oak-lucene/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/pom.xml?rev=1522616&r1=1522615&r2=1522616&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-lucene/pom.xml (original) +++ jackrabbit/oak/trunk/oak-lucene/pom.xml Thu Sep 12 15:30:20 2013 @@ -91,8 +91,6 @@ org.apache.jackrabbit.core.query.SimpleQueryTest#testNegativeNumber <!-- OAK-327 --> org.apache.jackrabbit.core.query.SQL2OrderByTest#testOrderByScore org.apache.jackrabbit.oak.jcr.query.QueryFulltextTest#testFulltextRelativeProperty <!-- OAK-828 --> - org.apache.jackrabbit.core.query.FulltextQueryTest#testPredefinedEntityReference <!-- OAK-XXX --> - </known.issues> </properties>
