svn commit: r499218 - in /lucene/solr/trunk/client/ruby/solrb: lib/solr/request/standard.rb solr/webapps/solr.war test/unit/standard_request_test.rb

[eh...@apache.org]

Author: ehatcher
Date: Tue Jan 23 18:59:17 2007
New Revision: 499218

URL: http://svn.apache.org/viewvc?view=rev&rev=499218
Log:
Add support for new facet.prefix feature

Modified:
    lucene/solr/trunk/client/ruby/solrb/lib/solr/request/standard.rb
    lucene/solr/trunk/client/ruby/solrb/solr/webapps/solr.war
    lucene/solr/trunk/client/ruby/solrb/test/unit/standard_request_test.rb

Modified: lucene/solr/trunk/client/ruby/solrb/lib/solr/request/standard.rb
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/solrb/lib/solr/request/standard.rb?view=diff&rev=499218&r1=499217&r2=499218
==============================================================================
--- lucene/solr/trunk/client/ruby/solrb/lib/solr/request/standard.rb (original)
+++ lucene/solr/trunk/client/ruby/solrb/lib/solr/request/standard.rb Tue Jan 23 18:59:17 2007
@@ -66,6 +66,7 @@
         
         # facet parameter processing
         if @params[:facets]
+          # TODO need validation of all that is under the :facets Hash too
           hash[:facet] = true
           hash[:"facet.field"] = []
           hash[:"facet.query"] = @params[:facets][:queries]
@@ -73,6 +74,7 @@
           hash[:"facet.limit"] = @params[:facets][:limit]
           hash[:"facet.missing"] = @params[:facets][:missing]
           hash[:"facet.mincount"] = @params[:facets][:mincount]
+          hash[:"facet.prefix"] = @params[:facets][:prefix]
           @params[:facets][:fields].each do |f|
             if f.kind_of? Hash
               key = f.keys[0]
@@ -82,6 +84,7 @@
               hash[:"f.#{key}.facet.limit"] = value[:limit]
               hash[:"f.#{key}.facet.missing"] = value[:missing]
               hash[:"f.#{key}.facet.mincount"] = value[:mincount]
+              hash[:"f.#{key}.facet.prefix"] = value[:prefix]
             else
               hash[:"facet.field"] << f
             end

Modified: lucene/solr/trunk/client/ruby/solrb/solr/webapps/solr.war
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/solrb/solr/webapps/solr.war?view=diff&rev=499218&r1=499217&r2=499218
==============================================================================
Binary files - no diff available.

Modified: lucene/solr/trunk/client/ruby/solrb/test/unit/standard_request_test.rb
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/solrb/test/unit/standard_request_test.rb?view=diff&rev=499218&r1=499217&r2=499218
==============================================================================
--- lucene/solr/trunk/client/ruby/solrb/test/unit/standard_request_test.rb (original)
+++ lucene/solr/trunk/client/ruby/solrb/test/unit/standard_request_test.rb Tue Jan 23 18:59:17 2007
@@ -58,21 +58,27 @@
   def test_facet_params_all
     request = Solr::Request::Standard.new(:query => 'query',
        :facets => {
-         :fields => [:genre,
-                     {:year => {:limit => 50, :mincount => 0, :missing => false, :sort => :term}}], # field that overrides the global facet parameters
+         :fields => [:genre,           
+                     # field that overrides the global facet parameters
+                     {:year => {:limit => 50, :mincount => 0, :missing => false, :sort => :term, :prefix=>"199"}}], 
          :queries => ["q1", "q2"],
+         :prefix => "cat",
          :limit => 5, :zeros => true, :mincount => 20, :sort => :count  # global facet parameters
         }
     )
-    assert_equal true, request.to_hash[:facet]
-    assert_equal [:genre, :year], request.to_hash[:"facet.field"]
-    assert_equal ["q1", "q2"], request.to_hash[:"facet.query"]
-    assert_equal 5, request.to_hash[:"facet.limit"]
-    assert_equal 20, request.to_hash[:"facet.mincount"]
-    assert_equal true, request.to_hash[:"facet.sort"]
-    assert_equal 50, request.to_hash[:"f.year.facet.limit"]
-    assert_equal 0, request.to_hash[:"f.year.facet.mincount"]
-    assert_equal false, request.to_hash[:"f.year.facet.sort"]
+    
+    hash = request.to_hash
+    assert_equal true, hash[:facet]
+    assert_equal [:genre, :year], hash[:"facet.field"]
+    assert_equal ["q1", "q2"], hash[:"facet.query"]
+    assert_equal 5, hash[:"facet.limit"]
+    assert_equal 20, hash[:"facet.mincount"]
+    assert_equal true, hash[:"facet.sort"]
+    assert_equal "cat", hash[:"facet.prefix"]
+    assert_equal 50, hash[:"f.year.facet.limit"]
+    assert_equal 0, hash[:"f.year.facet.mincount"]
+    assert_equal false, hash[:"f.year.facet.sort"]
+    assert_equal "199", hash[:"f.year.facet.prefix"]
   end
 
   def test_basic_sort