Inline method InfoRequest.full_search

8 files changed, 84 insertions, 80 deletions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index df522519d..4f3624ab7 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -378,7 +378,13 @@ class ApplicationController < ActionController::Base
         else
             @page = this_page
         end
-        result = InfoRequest.full_search(models, @query, order, ascending, collapse, @per_page, @page)
+        result = ActsAsXapian::Search.new(models, @query,
+            :offset => (@page - 1) * @per_page,
+            :limit => @per_page,
+            :sort_by_prefix => order,
+            :sort_by_ascending => ascending,
+            :collapse_by_prefix => collapse
+        )
         result.results # Touch the results to load them, otherwise accessing them from the view
                        # might fail later if the database has subsequently been reopened.
         return result
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 658daeeff..ed05b750b 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -119,7 +119,11 @@ class UserController < ApplicationController
             @track_things = TrackThing.find(:all, :conditions => ["tracking_user_id = ? and track_medium = ?", @display_user.id, 'email_daily'], :order => 'created_at desc')
             for track_thing in @track_things
                 # XXX factor out of track_mailer.rb
-                xapian_object = InfoRequest.full_search([InfoRequestEvent], track_thing.track_query, 'described_at', true, nil, 20, 1)
+                xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], track_thing.track_query,
+                    :sort_by_prefix => 'described_at',
+                    :sort_by_ascending => true,
+                    :collapse_by_prefix => nil,
+                    :limit => 20)
                 feed_results += xapian_object.results.map {|x| x[:model]}
             end
         end
diff --git a/app/mailers/track_mailer.rb b/app/mailers/track_mailer.rb
index ea5489726..bd9ce658d 100644
--- a/app/mailers/track_mailer.rb
+++ b/app/mailers/track_mailer.rb
@@ -67,7 +67,11 @@ class TrackMailer < ApplicationMailer
                 # Query for things in this track. We use described_at for the
                 # ordering, so we catch anything new (before described), or
                 # anything whose new status has been described.
-                xapian_object = InfoRequest.full_search([InfoRequestEvent], track_thing.track_query, 'described_at', true, nil, 100, 1)
+                xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], track_thing.track_query,
+                    :sort_by_prefix => 'described_at',
+                    :sort_by_ascending => true,
+                    :collapse_by_prefix => nil,
+                    :limit => 100)
                 # Go through looking for unalerted things
                 alert_results = []
                 for result in xapian_object.results
diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index 156399b99..4db4dadb0 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -189,21 +189,6 @@ class InfoRequest < ActiveRecord::Base
         self.comments.find(:all, :conditions => 'visible')
     end
 
-    # Central function to do all searches
-    # (Not really the right place to put it, but everything can get it here, and it
-    # does *mainly* find info requests, via their events, so hey)
-    def InfoRequest.full_search(models, query, order, ascending, collapse, per_page, page)
-        offset = (page - 1) * per_page
-
-        return ::ActsAsXapian::Search.new(
-            models, query,
-            :offset => offset, :limit => per_page,
-            :sort_by_prefix => order,
-            :sort_by_ascending => ascending,
-            :collapse_by_prefix => collapse
-        )
-    end
-
     # If the URL name has changed, then all request: queries will break unless
     # we update index for every event. Also reindex if prominence changes.
     after_update :reindex_some_request_events
diff --git a/lib/tasks/translation.rake b/lib/tasks/translation.rake
index 351faef2c..6458d9268 100644
--- a/lib/tasks/translation.rake
+++ b/lib/tasks/translation.rake
@@ -142,13 +142,11 @@ namespace :translation do
                     output_file)
 
         # track mailer
-        xapian_object = InfoRequest.full_search([InfoRequestEvent],
-                                                track_thing.track_query,
-                                                'described_at',
-                                                true,
-                                                nil,
-                                                100,
-                                                1)
+        xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], track_thing.track_query,
+              :sort_by_prefix => 'described_at',
+              :sort_by_ascending => true,
+              :collapse_by_prefix => nil,
+              :limit => 100)
         event_digest_email = TrackMailer.event_digest(info_request.user,
                                                             [[track_thing,
                                                               xapian_object.results,
diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb
index ccbf6b8ab..5dd628dc9 100644
--- a/spec/controllers/request_controller_spec.rb
+++ b/spec/controllers/request_controller_spec.rb
@@ -93,8 +93,10 @@ describe RequestController, "when listing recent requests" do
                    :results => (1..25).to_a.map { |m| { :model => m } },
                    :matches_estimated => 1000000)
 
-        InfoRequest.should_receive(:full_search).
-          with([InfoRequestEvent]," (variety:sent OR variety:followup_sent OR variety:response OR variety:comment)", "created_at", anything, anything, anything, anything).
+        ActsAsXapian::Search.should_receive(:new).
+          with([InfoRequestEvent]," (variety:sent OR variety:followup_sent OR variety:response OR variety:comment)",
+            :sort_by_prefix => "created_at", :offset => 0, :limit => 25, :sort_by_ascending => true,
+            :collapse_by_prefix => "request_collapse").
           and_return(xap_results)
         get :list, :view => 'all'
         assigns[:list_results].size.should == 25
diff --git a/spec/mailers/track_mailer_spec.rb b/spec/mailers/track_mailer_spec.rb
index 07f0e073e..346aa79c3 100644
--- a/spec/mailers/track_mailer_spec.rb
+++ b/spec/mailers/track_mailer_spec.rb
@@ -69,11 +69,15 @@ describe TrackMailer do
                     @xapian_search = mock('xapian search', :results => [])
                     @found_event = mock_model(InfoRequestEvent, :described_at => @track_thing.created_at + 1.day)
                     @search_result = {:model => @found_event}
-                    InfoRequest.stub!(:full_search).and_return(@xapian_search)
+                    ActsAsXapian::Search.stub!(:new).and_return(@xapian_search)
                 end
 
                 it 'should ask for the events returned by the tracking query' do
-                    InfoRequest.should_receive(:full_search).with([InfoRequestEvent], 'test query', 'described_at', true, nil, 100, 1).and_return(@xapian_search)
+                    ActsAsXapian::Search.should_receive(:new).with([InfoRequestEvent], 'test query',
+                        :sort_by_prefix => 'described_at',
+                        :sort_by_ascending => true,
+                        :collapse_by_prefix => nil,
+                        :limit => 100).and_return(@xapian_search)
                     TrackMailer.alert_tracks
                 end
 
diff --git a/spec/models/xapian_spec.rb b/spec/models/xapian_spec.rb
index 8c99d550f..b7c8b4dbe 100644
--- a/spec/models/xapian_spec.rb
+++ b/spec/models/xapian_spec.rb
@@ -8,8 +8,7 @@ describe User, " when indexing users with Xapian" do
     end
 
     it "should search by name" do
-        # def InfoRequest.full_search(models, query, order, ascending, collapse, per_page, page)
-        xapian_object = InfoRequest.full_search([User], "Silly", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([User], "Silly", :limit => 100)
         xapian_object.results.size.should == 1
         xapian_object.results[0][:model].should == users(:silly_name_user)
     end
@@ -17,8 +16,7 @@ describe User, " when indexing users with Xapian" do
     it "should search by 'about me' text" do
         user = users(:bob_smith_user)
 
-        # def InfoRequest.full_search(models, query, order, ascending, collapse, per_page, page)
-        xapian_object = InfoRequest.full_search([User], "stuff", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([User], "stuff", :limit => 100)
         xapian_object.results.size.should == 1
         xapian_object.results[0][:model].should == user
 
@@ -26,10 +24,10 @@ describe User, " when indexing users with Xapian" do
         user.save!
         update_xapian_index
 
-        xapian_object = InfoRequest.full_search([User], "stuff", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([User], "stuff", :limit => 100)
         xapian_object.results.size.should == 0
 
-        xapian_object = InfoRequest.full_search([User], "aardvark", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([User], "aardvark", :limit => 100)
         xapian_object.results.size.should == 1
         xapian_object.results[0][:model].should == user
     end
@@ -42,26 +40,26 @@ describe PublicBody, " when indexing public bodies with Xapian" do
     end
 
     it "should search index the main name field" do
-        xapian_object = InfoRequest.full_search([PublicBody], "humpadinking", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([PublicBody], "humpadinking", :limit => 100)
         xapian_object.results.size.should == 1
         xapian_object.results[0][:model].should == public_bodies(:humpadink_public_body)
     end
 
     it "should search index the notes field" do
-        xapian_object = InfoRequest.full_search([PublicBody], "albatross", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([PublicBody], "albatross", :limit => 100)
         xapian_object.results.size.should == 1
         xapian_object.results[0][:model].should == public_bodies(:humpadink_public_body)
     end
 
     it "should delete public bodies from the index when they are destroyed" do
-        xapian_object = InfoRequest.full_search([PublicBody], "albatross", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([PublicBody], "albatross", :limit => 100)
         xapian_object.results.size.should == 1
         xapian_object.results[0][:model].should == public_bodies(:humpadink_public_body)
 
         public_bodies(:forlorn_public_body).destroy
 
         update_xapian_index
-        xapian_object = InfoRequest.full_search([PublicBody], "lonely", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([PublicBody], "lonely", :limit => 100)
         xapian_object.results.should == []
     end
 
@@ -75,13 +73,13 @@ describe PublicBody, " when indexing requests by body they are to" do
     end
 
     it "should find requests to the body" do
-        xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_from:tgq", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "requested_from:tgq", :limit => 100)
         xapian_object.results.size.should == PublicBody.find_by_url_name("tgq").info_requests.map(&:info_request_events).flatten.size
     end
 
     it "should update index correctly when URL name of body changes" do
         # initial search
-        xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_from:tgq", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "requested_from:tgq", :limit => 100)
         xapian_object.results.size.should == PublicBody.find_by_url_name("tgq").info_requests.map(&:info_request_events).flatten.size
         models_found_before = xapian_object.results.map { |x| x[:model] }
 
@@ -93,9 +91,9 @@ describe PublicBody, " when indexing requests by body they are to" do
         update_xapian_index
 
         # check we get results expected
-        xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_from:tgq", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "requested_from:tgq", :limit => 100)
         xapian_object.results.size.should == 0
-        xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_from:gq", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "requested_from:gq", :limit => 100)
         xapian_object.results.size.should == PublicBody.find_by_url_name("gq").info_requests.map(&:info_request_events).flatten.size
         models_found_after = xapian_object.results.map { |x| x[:model] }
 
@@ -113,11 +111,11 @@ describe PublicBody, " when indexing requests by body they are to" do
         update_xapian_index
 
         # check we get results expected
-        xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_from:tgq", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "requested_from:tgq", :limit => 100)
         xapian_object.results.size.should == 0
-        xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_from:gq", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "requested_from:gq", :limit => 100)
         xapian_object.results.size.should == 0
-        xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_from:" + body.url_name, 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "requested_from:#{body.url_name}", :limit => 100)
         xapian_object.results.size.should == public_bodies(:geraldine_public_body).info_requests.map(&:info_request_events).flatten.size
         models_found_after = xapian_object.results.map { |x| x[:model] }
     end
@@ -130,13 +128,14 @@ describe User, " when indexing requests by user they are from" do
     end
 
     it "should find requests from the user" do
-        xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_by:bob_smith", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "requested_by:bob_smith",
+            :sort_by_prefix => 'created_at', :sort_by_ascending => true, :limit => 100)
         xapian_object.results.map{|x|x[:model]}.should =~ InfoRequestEvent.all(:conditions => "info_request_id in (select id from info_requests where user_id = #{users(:bob_smith_user).id})")
     end
 
     it "should find just the sent message events from a particular user" do
-          # def InfoRequest.full_search(models, query, order, ascending, collapse, per_page, page)
-        xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_by:bob_smith variety:sent", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "requested_by:bob_smith variety:sent",
+            :sort_by_prefix => 'created_at', :sort_by_ascending => true, :limit => 100)
         xapian_object.results.map{|x|x[:model]}.should =~ InfoRequestEvent.all(:conditions => "info_request_id in (select id from info_requests where user_id = #{users(:bob_smith_user).id}) and event_type = 'sent'")
         xapian_object.results[2][:model].should == info_request_events(:useless_outgoing_message_event)
         xapian_object.results[1][:model].should == info_request_events(:silly_outgoing_message_event)
@@ -150,8 +149,9 @@ describe User, " when indexing requests by user they are from" do
 
         update_xapian_index
 
-          # def InfoRequest.full_search(models, query, order, ascending, collapse, per_page, page)
-        xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_by:bob_smith", 'created_at', true, 'request_collapse', 100, 1)
+        xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "requested_by:bob_smith",
+            :sort_by_prefix => 'created_at', :sort_by_ascending => true,
+            :collapse_by_prefix => 'request_collapse', :limit => 100)
         xapian_object.results.map{|x|x[:model].info_request}.should =~ InfoRequest.all(:conditions => "user_id = #{users(:bob_smith_user).id}")
     end
 
@@ -172,8 +172,7 @@ describe User, " when indexing requests by user they are from" do
 
         update_xapian_index
 
-          # def InfoRequest.full_search(models, query, order, ascending, collapse, per_page, page)
-        xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_by:john_k", 'created_at', true, 'request_collapse', 100, 1)
+        xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "requested_by:john_k", :limit => 100)
         xapian_object.results.size.should == 1
         xapian_object.results[0][:model].should == info_request_events(:silly_outgoing_message_event)
     end
@@ -181,7 +180,8 @@ describe User, " when indexing requests by user they are from" do
 
     it "should update index correctly when URL name of user changes" do
         # initial search
-        xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_by:bob_smith", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "requested_by:bob_smith",
+            :sort_by_prefix => 'created_at', :sort_by_ascending => true, :limit => 100)
         xapian_object.results.map{|x|x[:model]}.should =~ InfoRequestEvent.all(:conditions => "info_request_id in (select id from info_requests where user_id = #{users(:bob_smith_user).id})")
         models_found_before = xapian_object.results.map { |x| x[:model] }
 
@@ -193,9 +193,10 @@ describe User, " when indexing requests by user they are from" do
         update_xapian_index
 
         # check we get results expected
-        xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_by:bob_smith", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "requested_by:bob_smith", :limit => 100)
         xapian_object.results.size.should == 0
-        xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_by:robert_smith", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "requested_by:robert_smith",
+            :sort_by_prefix => 'created_at', :sort_by_ascending => true, :limit => 100)
         models_found_after = xapian_object.results.map { |x| x[:model] }
         models_found_before.should == models_found_after
     end
@@ -208,13 +209,13 @@ describe User, " when indexing comments by user they are by" do
     end
 
     it "should find requests from the user" do
-        xapian_object = InfoRequest.full_search([InfoRequestEvent], "commented_by:silly_emnameem", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "commented_by:silly_emnameem", :limit => 100)
         xapian_object.results.size.should == 1
     end
 
     it "should update index correctly when URL name of user changes" do
         # initial search
-        xapian_object = InfoRequest.full_search([InfoRequestEvent], "commented_by:silly_emnameem", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "commented_by:silly_emnameem", :limit => 100)
         xapian_object.results.size.should == 1
         models_found_before = xapian_object.results.map { |x| x[:model] }
 
@@ -226,9 +227,9 @@ describe User, " when indexing comments by user they are by" do
         update_xapian_index
 
         # check we get results expected
-        xapian_object = InfoRequest.full_search([InfoRequestEvent], "commented_by:silly_emnameem", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "commented_by:silly_emnameem", :limit => 100)
         xapian_object.results.size.should == 0
-        xapian_object = InfoRequest.full_search([InfoRequestEvent], "commented_by:silly_name", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "commented_by:silly_name", :limit => 100)
         xapian_object.results.size.should == 1
         models_found_after = xapian_object.results.map { |x| x[:model] }
 
@@ -243,7 +244,7 @@ describe InfoRequest, " when indexing requests by their title" do
     end
 
     it "should find events for the request" do
-        xapian_object = InfoRequest.full_search([InfoRequestEvent], "request:how_much_public_money_is_wasted_o", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "request:how_much_public_money_is_wasted_o", :limit => 100)
         xapian_object.results.size.should == 1
         xapian_object.results[0][:model] == info_request_events(:silly_outgoing_message_event)
     end
@@ -257,9 +258,9 @@ describe InfoRequest, " when indexing requests by their title" do
         update_xapian_index
 
         # check we get results expected
-        xapian_object = InfoRequest.full_search([InfoRequestEvent], "request:how_much_public_money_is_wasted_o", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "request:how_much_public_money_is_wasted_o", :limit => 100)
         xapian_object.results.size.should == 0
-        xapian_object = InfoRequest.full_search([InfoRequestEvent], "request:really_naughty", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "request:really_naughty", :limit => 100)
         xapian_object.results.size.should == 1
         xapian_object.results[0][:model] == info_request_events(:silly_outgoing_message_event)
     end
@@ -277,11 +278,11 @@ describe InfoRequest, " when indexing requests by tag" do
         ir.save!
         update_xapian_index
 
-        xapian_object = InfoRequest.full_search([InfoRequestEvent], "tag:bunnyrabbit", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "tag:bunnyrabbit", :limit => 100)
         xapian_object.results.size.should == 1
         xapian_object.results[0][:model] == info_request_events(:silly_outgoing_message_event)
 
-        xapian_object = InfoRequest.full_search([InfoRequestEvent], "tag:orangeaardvark", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], "tag:orangeaardvark", :limit => 100)
         xapian_object.results.size.should == 0
     end
 end
@@ -298,14 +299,14 @@ describe PublicBody, " when indexing authorities by tag" do
         body.save!
         update_xapian_index
 
-        xapian_object = InfoRequest.full_search([PublicBody], "tag:mice", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([PublicBody], "tag:mice", :limit => 100)
         xapian_object.results.size.should == 1
         xapian_object.results[0][:model] == public_bodies(:geraldine_public_body)
-        xapian_object = InfoRequest.full_search([PublicBody], "tag:mice:3", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([PublicBody], "tag:mice:3", :limit => 100)
         xapian_object.results.size.should == 1
         xapian_object.results[0][:model] == public_bodies(:geraldine_public_body)
 
-        xapian_object = InfoRequest.full_search([PublicBody], "tag:orangeaardvark", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([PublicBody], "tag:orangeaardvark", :limit => 100)
         xapian_object.results.size.should == 0
     end
 end
@@ -327,11 +328,11 @@ describe PublicBody, " when only indexing selected things on a rebuild" do
         values = false
         texts = false
         rebuild_xapian_index(terms, values, texts, dropfirst)
-        xapian_object = InfoRequest.full_search([PublicBody], "tag:mice", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([PublicBody], "tag:mice", :limit => 100)
         xapian_object.results.size.should == 0
-        xapian_object = InfoRequest.full_search([PublicBody], "frobzn", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([PublicBody], "frobzn", :limit => 100)
         xapian_object.results.size.should == 0
-        xapian_object = InfoRequest.full_search([PublicBody], "variety:authority", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([PublicBody], "variety:authority", :limit => 100)
         xapian_object.results.map{|x|x[:model]}.should =~ PublicBody.all
         # only reindex 'tag' and text
         dropfirst = true
@@ -339,31 +340,31 @@ describe PublicBody, " when only indexing selected things on a rebuild" do
         values = false
         texts = true
         rebuild_xapian_index(terms, values, texts, dropfirst)
-        xapian_object = InfoRequest.full_search([PublicBody], "tag:mice", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([PublicBody], "tag:mice", :limit => 100)
         xapian_object.results.size.should == 1
-        xapian_object = InfoRequest.full_search([PublicBody], "frobzn", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([PublicBody], "frobzn", :limit => 100)
         xapian_object.results.size.should == 1
-        xapian_object = InfoRequest.full_search([PublicBody], "variety:authority", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([PublicBody], "variety:authority", :limit => 100)
         xapian_object.results.size.should == 0
         # only reindex 'variety' term, but keeping the existing data in-place
         dropfirst = false
         terms = "V"
         texts = false
         rebuild_xapian_index(terms, values, texts, dropfirst)
-        xapian_object = InfoRequest.full_search([PublicBody], "tag:mice", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([PublicBody], "tag:mice", :limit => 100)
         xapian_object.results.size.should == 1
-        xapian_object = InfoRequest.full_search([PublicBody], "frobzn", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([PublicBody], "frobzn", :limit => 100)
         xapian_object.results.size.should == 1
-        xapian_object = InfoRequest.full_search([PublicBody], "variety:authority", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([PublicBody], "variety:authority", :limit => 100)
         xapian_object.results.map{|x|x[:model]}.should =~ PublicBody.all
         # only reindex 'variety' term, blowing away existing data
         dropfirst = true
         rebuild_xapian_index(terms, values, texts, dropfirst)
-        xapian_object = InfoRequest.full_search([PublicBody], "tag:mice", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([PublicBody], "tag:mice", :limit => 100)
         xapian_object.results.size.should == 0
-        xapian_object = InfoRequest.full_search([PublicBody], "frobzn", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([PublicBody], "frobzn", :limit => 100)
         xapian_object.results.size.should == 0
-        xapian_object = InfoRequest.full_search([PublicBody], "variety:authority", 'created_at', true, nil, 100, 1)
+        xapian_object = ActsAsXapian::Search.new([PublicBody], "variety:authority", :limit => 100)
         xapian_object.results.map{|x|x[:model]}.should =~ PublicBody.all
     end
 end