Add solr's 'facets' option support to finders

Braulio Bhavamitra
1 parent 4a811975
Showing 3 changed files with 12 additions and 3 deletions Show diff stats
app/controllers/public/search_controller.rb
app/models/category_finder.rb
app/models/environment_finder.rb
@@ -89,7 +89,8 @@ class SearchController &lt; PublicController
     # REFACTOR DUPLICATED CODE inner loop doing the same thing that outter loop
     if !@query.blank? || @region && !params[:radius].blank?
-      @result_ids = @noosfero_finder.find(asset, @query, calculate_find_options(asset, nil, params[:page], @product_category, @region, params[:radius], params[:year], params[:month]).merge({:limit => :all}))
+      ret = @noosfero_finder.find(asset, @query, calculate_find_options(asset, nil, params[:page], @product_category, @region, params[:radius], params[:year], params[:month]).merge({:limit => :all}))
+      @result_ids = ret.is_a?(Hash) ? ret[:results] : ret
     end
   end
@@ -157,12 +158,16 @@ class SearchController &lt; PublicController
     number_of_result_assets = @searching.values.select{|v| v}.size
     @results = {}
+    @facets = {}
     @order = []
     @names = {}
     where_to_search.select { |key,description| @searching[key]  }.each do |key, description|
       @order << key
-      @results[key] = @noosfero_finder.find(key, @query, calculate_find_options(key, limit, params[:page], @product_category, @region, params[:radius], params[:year], params[:month]))
+      find_options = calculate_find_options(key, limit, params[:page], @product_category, @region, params[:radius], params[:year], params[:month]);
+      ret = @noosfero_finder.find(key, @query, find_options)
+      @results[key] = ret.is_a?(Hash) ? ret[:results] : ret
+      @facets[key] = ret.is_a?(Hash) ? ret[:facets] : {}
       @names[key] = getterm(description)
     end
@@ -28,10 +28,12 @@ class CategoryFinder
     end
     if query.blank?
+      options.delete(:facets)
       asset_class(asset).send(finder_method, :all, options_for_find(asset_class(asset), {:order => "#{asset_table(asset)}.name"}.merge(options), date_range))
     else
       pg_options = {:page => options.delete(:page), :per_page => options.delete(:per_page)}
-      asset_class(asset).find_by_contents(query, pg_options, {}, options_for_find(asset_class(asset), options, date_range))[:results]
+      solr_options = {:facets => options.delete(:facets)}
+      asset_class(asset).find_by_contents(query, pg_options, solr_options, options_for_find(asset_class(asset), options, date_range))[:results]
     end
   end
@@ -22,6 +22,8 @@ class EnvironmentFinder
     end
     if query.blank?
+      options.delete(:facets)
+
       # FIXME this test is in more than one place
       if finder_method == 'paginate'
         options = {:order => "#{asset_table(asset)}.name"}.merge(options)