svn commit: r1578905 - /jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java

[tommaso]

Author: tommaso
Date: Tue Mar 18 13:59:15 2014
New Revision: 1578905

URL: http://svn.apache.org/r1578905
Log:
OAK-1563 - FullTextConstraint support for SolrQueryIndex, minor improvements

Modified:
    
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/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=1578905&r1=1578904&r2=1578905&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
 Tue Mar 18 13:59:15 2014
@@ -228,9 +228,13 @@ public class SolrQueryIndex implements F
             @Override
             public boolean visit(FullTextOr or) {
                 fullTextString.append('(');
-                for (FullTextExpression e : or.list) {
+                for (int i = 0; i < or.list.size(); i++) {
+                    FullTextExpression e = or.list.get(i);
                     String orTerm = getFullTextQuery(e);
-                    fullTextString.append(orTerm).append(" OR ");
+                    fullTextString.append(orTerm);
+                    if (i > 0 && i < or.list.size()) {
+                        fullTextString.append(" OR ");
+                    }
                 }
                 fullTextString.append(')');
                 fullTextString.append(' ');
@@ -240,9 +244,13 @@ public class SolrQueryIndex implements F
             @Override
             public boolean visit(FullTextAnd and) {
                 fullTextString.append('(');
-                for (FullTextExpression e : and.list) {
+                for (int i = 0; i < and.list.size(); i++) {
+                    FullTextExpression e = and.list.get(i);
                     String andTerm = getFullTextQuery(e);
-                    fullTextString.append(andTerm).append(" AND ");
+                    fullTextString.append(andTerm);
+                    if (i > 0 && i < and.list.size()) {
+                        fullTextString.append(" AND ");
+                    }
                 }
                 fullTextString.append(')');
                 fullTextString.append(' ');