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

[tommaso]

Author: tommaso
Date: Thu Mar 27 15:56:03 2014
New Revision: 1582371

URL: http://svn.apache.org/r1582371
Log:
OAK-1632 - fixed primary type restrictions expansion

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=1582371&r1=1582370&r2=1582371&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
 Thu Mar 27 15:56:03 2014
@@ -176,10 +176,10 @@ public class SolrQueryIndex implements F
             if (i == 0) {
                 queryBuilder.append("(");
             }
-            
queryBuilder.append("jcr\\:primaryType").append(':').append(partialEscape(pt)).append("
 ");
-            if (i > 0 && i < pts.length - 1) {
+            if (i > 0 && i < pts.length) {
                 queryBuilder.append("OR ");
             }
+            
queryBuilder.append("jcr\\:primaryType").append(':').append(partialEscape(pt)).append("
 ");
             if (i == pts.length - 1) {
                 queryBuilder.append(")");
                 queryBuilder.append(' ');
@@ -332,15 +332,15 @@ public class SolrQueryIndex implements F
 
     @Override
     public Cursor query(Filter filter, NodeState root) {
-        if (log.isDebugEnabled()) {
-            log.debug("converting filter {}", filter);
-        }
+//        if (log.isDebugEnabled()) {
+            log.info("converting filter {}", filter);
+//        }
         Cursor cursor;
         try {
             SolrQuery query = getQuery(filter);
-            if (log.isDebugEnabled()) {
-                log.debug("sending query {}", query);
-            }
+//            if (log.isDebugEnabled()) {
+                log.info("sending query {}", query);
+//            }
             QueryResponse queryResponse = solrServer.query(query);
             if (log.isDebugEnabled()) {
                 log.debug("getting response {}", queryResponse);