diff options
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/application_controller.rb | 5 | ||||
| -rw-r--r-- | app/controllers/general_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/request_controller.rb | 12 |
3 files changed, 15 insertions, 6 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 959caf7ef..41108ad19 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -251,12 +251,15 @@ class ApplicationController < ActionController::Base # Peform the search @per_page = per_page if this_page.nil? - @page = (params[:page] || "1").to_i + @page = get_search_page_from_params else @page = this_page end return InfoRequest.full_search(models, @query, order, ascending, collapse, @per_page, @page) end + def get_search_page_from_params + return (params[:page] || "1").to_i + end # Store last visited pages, for contact form def set_last_request(info_request) diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index 7cde689c1..00fcb6bf5 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -37,8 +37,8 @@ class GeneralController < ApplicationController query = 'variety:response (status:successful OR status:partially_successful)' # query = 'variety:response' # XXX debug sortby = "described" - @xapian_object = perform_search([InfoRequestEvent], query, sortby, 'request_title_collapse', 8) - @successful_request_events = @xapian_object.results.map { |r| r[:model] } + xapian_object = perform_search([InfoRequestEvent], query, sortby, 'request_title_collapse', 8) + @successful_request_events = xapian_object.results.map { |r| r[:model] } @successful_request_events = @successful_request_events.sort_by { |e| e.described_at }.reverse rescue @successful_request_events = [] diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index f56d391a3..4588ef369 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -119,7 +119,15 @@ class RequestController < ApplicationController else raise "unknown request list view " + @view.to_s end - @xapian_object = perform_search([InfoRequestEvent], query, sortby, 'request_collapse') + + #behavior_cache do + xapian_object = perform_search([InfoRequestEvent], query, sortby, 'request_collapse') + @list_results = xapian_object.results.map { |r| r[:model] } + @matches_estimated = xapian_object.matches_estimated + + #end + #@page = get_search_page_from_params if !@page # used in cache case, as perform_search sets @page as side effect + @title = @title + " (page " + @page.to_s + ")" if (@page > 1) @feed_autodetect = [ { :url => do_track_url(@track_thing, 'feed'), :title => @track_thing.params[:title_in_rss] } ] @@ -128,8 +136,6 @@ class RequestController < ApplicationController if @page > 20 @no_crawl = true end - - cache_in_squid end # Page new form posts to |