svn commit: r724087 - /lucene/solr/trunk/src/java/org/apache/solr/handler/component/FacetComponent.java

[yonik]

Author: yonik
Date: Sat Dec  6 22:06:39 2008
New Revision: 724087

URL: http://svn.apache.org/viewvc?rev=724087&view=rev
Log:
don't over-request for facet.sort=lex

Modified:
    
lucene/solr/trunk/src/java/org/apache/solr/handler/component/FacetComponent.java

Modified: 
lucene/solr/trunk/src/java/org/apache/solr/handler/component/FacetComponent.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/component/FacetComponent.java?rev=724087&r1=724086&r2=724087&view=diff
==============================================================================
--- 
lucene/solr/trunk/src/java/org/apache/solr/handler/component/FacetComponent.java
 (original)
+++ 
lucene/solr/trunk/src/java/org/apache/solr/handler/component/FacetComponent.java
 Sat Dec  6 22:06:39 2008
@@ -122,7 +122,7 @@
         }
 
         refine.purpose |= ShardRequest.PURPOSE_REFINE_FACETS;
-        
refine.params.set(FacetParams.FACET,FacetParams.FACET_SORT_COUNT_LEGACY);
+        refine.params.set(FacetParams.FACET, "true");
         refine.params.remove(FacetParams.FACET_FIELD);
         // TODO: perhaps create a more compact facet.terms method?
         refine.params.set(FacetParams.FACET_QUERY, fqueries.toArray(new 
String[fqueries.size()]));
@@ -160,8 +160,8 @@
           sreq.params.remove(paramStart + FacetParams.FACET_MINCOUNT);
           sreq.params.remove(paramStart + FacetParams.FACET_OFFSET);
 
-          if(dff.limit > 0) {          
-            // set the initial limit higher in increase accuracy
+          if(dff.sort.equals(FacetParams.FACET_SORT_COUNT) && dff.limit > 0) { 
         
+            // set the initial limit higher to increase accuracy
             dff.initialLimit = dff.offset + dff.limit;
             dff.initialLimit = (int)(dff.initialLimit * 1.5) + 10;
           } else {
@@ -176,7 +176,7 @@
       }
     } else {
       // turn off faceting on other requests
-      sreq.params.set(FacetParams.FACET, FacetParams.FACET_SORT_LEX_LEGACY);
+      sreq.params.set(FacetParams.FACET, "false");
       // we could optionally remove faceting params
     }
   }