You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by to...@apache.org on 2014/04/30 12:00:57 UTC
svn commit: r1591226 - in /jackrabbit/oak/trunk/oak-solr-core: pom.xml
src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
Author: tommaso
Date: Wed Apr 30 10:00:57 2014
New Revision: 1591226
URL: http://svn.apache.org/r1591226
Log:
OAK-1783 - ignore rep:excerpt property in SolrQueryIndex, enabled RepExcerpt tests accoringly
Modified:
jackrabbit/oak/trunk/oak-solr-core/pom.xml
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
Modified: jackrabbit/oak/trunk/oak-solr-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/pom.xml?rev=1591226&r1=1591225&r2=1591226&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-solr-core/pom.xml Wed Apr 30 10:00:57 2014
@@ -58,7 +58,12 @@
org.apache.jackrabbit.core.query.DerefTest <!-- ? -->
org.apache.jackrabbit.core.query.ParentNodeTest <!-- ? -->
org.apache.jackrabbit.core.query.QueryResultTest <!-- ? -->
- org.apache.jackrabbit.core.query.ExcerptTest <!-- ? -->
+ org.apache.jackrabbit.core.query.ExcerptTest#testMoreTextDotsAtEnd <!-- OAK-318 -->
+ org.apache.jackrabbit.core.query.ExcerptTest#testMoreTextDotsAtStart <!-- OAK-318 -->
+ org.apache.jackrabbit.core.query.ExcerptTest#testMoreTextDotsAtStartAndEnd <!-- OAK-318 -->
+ org.apache.jackrabbit.core.query.ExcerptTest#testPunctuationStartsFragment <!-- OAK-318 -->
+ org.apache.jackrabbit.core.query.ExcerptTest#testPunctuationStartsFragmentEndsWithDots <!-- OAK-318 -->
+ org.apache.jackrabbit.core.query.ExcerptTest#testPreferPhrase <!-- OAK-318 -->
org.apache.jackrabbit.core.query.SQL2OuterJoinTest <!-- ? -->
org.apache.jackrabbit.core.query.MixinTest <!-- ? -->
</known.issues>
Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java?rev=1591226&r1=1591225&r2=1591226&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java Wed Apr 30 10:00:57 2014
@@ -166,6 +166,11 @@ public class SolrQueryIndex implements F
// cannot handle child-level property restrictions
continue;
}
+
+ if ("rep:excerpt".equals(pr.propertyName)) {
+ continue;
+ }
+
String first = null;
if (pr.first != null) {
first = partialEscape(String.valueOf(pr.first.getValue(pr.first.getType()))).toString();
@@ -332,7 +337,7 @@ public class SolrQueryIndex implements F
solrQuery.setParam("df", catchAllField);
}
- solrQuery.setParam("rows", "100000");
+ solrQuery.setParam("rows", String.valueOf(configuration.getRows()));
}
private static String createRangeQuery(String first, String last, boolean firstIncluding, boolean lastIncluding) {