Adapt search controllers to Solr

Solr uses stop words configuration on the server and not on application level. So stop words code and tests were deleted Do not throw 'Out of sync' exceptions when ordering with acts_as_solr. Use the results from the database ignoring index results not present in the database.

Adapt search controllers to Solr
Solr uses stop words configuration on the server and not on application level. So stop words code and tests were deleted Do not throw 'Out of sync' exceptions when ordering with acts_as_solr. Use the results from the database ignoring index results not present in the database.
Braulio Bhavamitra
1 parent 12ce7514
Showing 7 changed files with 12 additions and 45 deletions Show diff stats
app/controllers/public/profile_search_controller.rb
app/controllers/public/search_controller.rb
app/helpers/search_helper.rb
test/factories.rb
test/functional/profile_search_controller_test.rb
test/functional/search_controller_test.rb
vendor/plugins/acts_as_solr/lib/parser_methods.rb
@@ -8,11 +8,10 @@ class ProfileSearchController &lt; PublicController
   def index
     @q = params[:q]
     unless @q.blank?
-      @filtered_query = remove_stop_words(@q)
       if params[:where] == 'environment'
         redirect_to :controller => 'search', :query => @q
       else
-        @results = profile.articles.published.find_by_contents(@filtered_query).paginate(:per_page => 10, :page => params[:page])
+        @results = profile.articles.published.find_by_contents(@q)[:results].paginate(:per_page => 10, :page => params[:page])
       end
     end
   end
@@ -89,7 +89,7 @@ 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, @filtered_query, calculate_find_options(asset, nil, params[:page], @product_category, @region, params[:radius], params[:year], params[:month]).merge({:limit => :all}))
+      @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}))
     end
   end
@@ -149,7 +149,6 @@ class SearchController &lt; PublicController
   def index
     @query = params[:query] || ''
-    @filtered_query = remove_stop_words(@query)
     @product_category = ProductCategory.find(params[:product_category]) if params[:product_category]
     @region = City.find_by_id(params[:city]) if !params[:city].blank? && params[:city] =~ /^\d+$/
@@ -163,7 +162,7 @@ class SearchController &lt; PublicController
     where_to_search.select { |key,description| @searching[key]  }.each do |key, description|
       @order << key
-      @results[key] = @noosfero_finder.find(key, @filtered_query, calculate_find_options(key, limit, params[:page], @product_category, @region, params[:radius], params[:year], params[:month]))
+      @results[key] = @noosfero_finder.find(key, @query, calculate_find_options(key, limit, params[:page], @product_category, @region, params[:radius], params[:year], params[:month]))
       @names[key] = getterm(description)
     end
@@ -3,21 +3,12 @@ module SearchHelper
   # FIXME remove it after search_controler refactored
   include EventsHelper
-  STOP_WORDS = {
-    'pt_BR' => Ferret::Analysis::FULL_PORTUGUESE_STOP_WORDS,
-    'en'    => Ferret::Analysis::FULL_ENGLISH_STOP_WORDS,
-  }
-  
   def relevance_for(hit)
     n = (hit.ferret_score if hit.respond_to?(:ferret_score))
     n ||= 1.0
     (n * 100.0).round
   end
-  def remove_stop_words(query)
-    (query.downcase.scan(/"[^"]*"?|'[^']*'?|[^'"\s]+/) - (STOP_WORDS[locale] || [])).join(' ')
-  end
-
   def display_results(use_map = true)
     unless use_map && GoogleMaps.enabled?(environment.default_hostname)
@@ -22,7 +22,7 @@ module Noosfero::Factory
       end
     end
     if options[:search]
-      obj.ferret_create
+      obj.solr_save
     end
     obj
   end
@@ -6,6 +6,7 @@ class ProfileSearchController; def rescue_action(e) raise e end; end
 class ProfileSearchControllerTest < Test::Unit::TestCase
   def setup
+    Test::Unit::TestCase::setup
     @controller = ProfileSearchController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
@@ -14,14 +15,6 @@ class ProfileSearchControllerTest &lt; Test::Unit::TestCase
   end
   attr_reader :person
-  should 'filter stop words' do
-    @controller.expects(:locale).returns('en').at_least_once
-    get 'index', :profile => person.identifier, :q => 'an article about something'
-    assert_response :success
-    assert_template 'index'
-    assert_equal 'article something', assigns('filtered_query')
-  end
-
   should 'espape xss attack' do
     @controller.expects(:profile).returns(person).at_least_once
     get 'index', :profile => person.identifier, :q => '<wslite>'
@@ -41,8 +34,8 @@ class ProfileSearchControllerTest &lt; Test::Unit::TestCase
   end
   should 'display search results' do
-    article1 = fast_create(Article, :body => '<p>Article to test profile search</p>', :profile_id => person.id)
-    article2 = fast_create(Article, :body => '<p>Another article to test profile search</p>', :profile_id => person.id)
+    article1 = fast_create(Article, {:body => '<p>Article to test profile search</p>', :profile_id => person.id}, :search => true)
+    article2 = fast_create(Article, {:body => '<p>Another article to test profile search</p>', :profile_id => person.id}, :search => true)
     get 'index', :profile => person.identifier, :q => 'article'
@@ -6,6 +6,7 @@ class SearchController; def rescue_action(e) raise e end; end
 class SearchControllerTest < Test::Unit::TestCase
   def setup
+    Test::Unit::TestCase::setup
     @controller = SearchController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
@@ -35,21 +36,6 @@ class SearchControllerTest &lt; Test::Unit::TestCase
     assert_valid_xhtml
   end
-  should 'filter stop words' do
-    @controller.expects(:locale).returns('pt_BR').at_least_once
-    get 'index', :query => 'a carne da vaca'
-    assert_response :success
-    assert_template 'index'
-    assert_equal 'carne vaca', assigns('filtered_query')
-  end
-
-  should 'search with filtered query' do
-    @controller.expects(:locale).returns('pt_BR').at_least_once
-    get 'index', :query => 'a carne da vaca'
-
-    assert_equal 'carne vaca', assigns('filtered_query')
-  end
-
   should 'espape xss attack' do
     get 'index', :query => '<wslite>'
     assert_no_tag :tag => 'wslite'
@@ -135,11 +135,10 @@ module ActsAsSolr #:nodoc:
     # Reorders the instances keeping the order returned from Solr
     def reorder(things, ids)
-      ordered_things = Array.new(things.size)
-      raise "Out of sync! Found #{ids.size} items in index, but only #{things.size} were found in database!" unless things.size == ids.size
-      things.each do |thing|
-        position = ids.index(thing.id)
-        ordered_things[position] = thing
+      ordered_things = []
+      ids.each do |id|
+        thing = things.find { |t| t.id.to_s == id.to_s }
+        ordered_things |= [thing] if thing
       end
       ordered_things
     end
	@@ -22,7 +22,7 @@ module Noosfero::Factory		@@ -22,7 +22,7 @@ module Noosfero::Factory
22	end	22	end
23	end	23	end
24	if options[:search]	24	if options[:search]
25	- obj.ferret_create	25	+ obj.solr_save
26	end	26	end
27	obj	27	obj
28	end	28	end
	@@ -6,6 +6,7 @@ class SearchController; def rescue_action(e) raise e end; end		@@ -6,6 +6,7 @@ class SearchController; def rescue_action(e) raise e end; end
6		6
7	class SearchControllerTest < Test::Unit::TestCase	7	class SearchControllerTest < Test::Unit::TestCase
8	def setup	8	def setup
		9	+ Test::Unit::TestCase::setup
9	@controller = SearchController.new	10	@controller = SearchController.new
10	@request = ActionController::TestRequest.new	11	@request = ActionController::TestRequest.new
11	@response = ActionController::TestResponse.new	12	@response = ActionController::TestResponse.new
	@@ -35,21 +36,6 @@ class SearchControllerTest < Test::Unit::TestCase		@@ -35,21 +36,6 @@ class SearchControllerTest < Test::Unit::TestCase
35	assert_valid_xhtml	36	assert_valid_xhtml
36	end	37	end
37		38
38	- should 'filter stop words' do
39	- @controller.expects(:locale).returns('pt_BR').at_least_once
40	- get 'index', :query => 'a carne da vaca'
41	- assert_response :success
42	- assert_template 'index'
43	- assert_equal 'carne vaca', assigns('filtered_query')
44	- end
45	-
46	- should 'search with filtered query' do
47	- @controller.expects(:locale).returns('pt_BR').at_least_once
48	- get 'index', :query => 'a carne da vaca'
49	-
50	- assert_equal 'carne vaca', assigns('filtered_query')
51	- end
52	-
53	should 'espape xss attack' do	39	should 'espape xss attack' do
54	get 'index', :query => '<wslite>'	40	get 'index', :query => '<wslite>'
55	assert_no_tag :tag => 'wslite'	41	assert_no_tag :tag => 'wslite'