diff options
| author | Matthew Landauer <matthew@openaustralia.org> | 2013-03-25 16:22:06 +1100 |
|---|---|---|
| committer | Matthew Landauer <matthew@openaustralia.org> | 2013-03-25 16:22:06 +1100 |
| commit | 7330ad14103642fb8c13707fe4ce61f67ab649cf (patch) | |
| tree | 0582a1fa4e550f06d91cbb97f1e17160485f6e29 | |
| parent | b340c98efcdf41a3c189631e4af5042d507ecf4d (diff) | |
ActsAsXapian doesn't need to be referenced from the global namespace
| -rw-r--r-- | app/controllers/general_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/request_controller.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index 83f890077..53cf58170 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -160,7 +160,7 @@ class GeneralController < ApplicationController # structured query which should show newest first, rather than a free text search # where we want most relevant as default. begin - dummy_query = ::ActsAsXapian::Search.new([InfoRequestEvent], @query, :limit => 1) + dummy_query = ActsAsXapian::Search.new([InfoRequestEvent], @query, :limit => 1) rescue => e flash[:error] = "Your query was not quite right. " + CGI.escapeHTML(e.to_str) redirect_to search_url("") diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index ad1918005..cad5d5597 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -101,7 +101,7 @@ class RequestController < ApplicationController # ... requests that have similar imporant terms begin limit = 10 - @xapian_similar = ::ActsAsXapian::Similar.new([InfoRequestEvent], @info_request.info_request_events, + @xapian_similar = ActsAsXapian::Similar.new([InfoRequestEvent], @info_request.info_request_events, :limit => limit, :collapse_by_prefix => 'request_collapse') @xapian_similar_more = (@xapian_similar.matches_estimated > limit) rescue @@ -149,7 +149,7 @@ class RequestController < ApplicationController render :template => 'request/hidden', :status => 410 # gone return end - @xapian_object = ::ActsAsXapian::Similar.new([InfoRequestEvent], @info_request.info_request_events, + @xapian_object = ActsAsXapian::Similar.new([InfoRequestEvent], @info_request.info_request_events, :offset => (@page - 1) * @per_page, :limit => @per_page, :collapse_by_prefix => 'request_collapse') @matches_estimated = @xapian_object.matches_estimated @show_no_more_than = (@matches_estimated > MAX_RESULTS) ? MAX_RESULTS : @matches_estimated |