From f759a8af65124374279ecfecd6115bd12efa4d59 Mon Sep 17 00:00:00 2001
From: Louise Crow <louise.crow@gmail.com>
Date: Tue, 3 Feb 2015 12:25:11 +0000
Subject: Do not allow requests for search results after the first 500

The pages for these search results are extremely slow to load. This
is not an ideal solution by any means. Really we want to dig into why
high offsets are so slow, and whether there's anything we can do to
fix that.
---
 app/controllers/general_controller.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'app/controllers/general_controller.rb')

diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb
index 2c8abbaf4..6aef0cb1b 100644
--- a/app/controllers/general_controller.rb
+++ b/app/controllers/general_controller.rb
@@ -9,6 +9,8 @@ require 'open-uri'
 
 class GeneralController < ApplicationController
 
+    MAX_RESULTS = 500
+
     # New, improved front page!
     def frontpage
         medium_cache
@@ -124,11 +126,18 @@ class GeneralController < ApplicationController
             end
         end
 
+        @page = get_search_page_from_params
+
         # Query each type separately for separate display (TODO: we are calling
         # perform_search multiple times and it clobbers per_page for each one,
         # so set as separate var)
         requests_per_page = params[:requests_per_page] ? params[:requests_per_page].to_i : 25
 
+        # Later pages are very expensive to load
+        if @page > MAX_RESULTS / requests_per_page
+            raise ActiveRecord::RecordNotFound.new("Sorry. No pages after #{MAX_RESULTS / requests_per_page}.")
+        end
+
         @this_page_hits = @total_hits = @xapian_requests_hits = @xapian_bodies_hits = @xapian_users_hits = 0
         if @requests
             @xapian_requests = perform_search([InfoRequestEvent], @query, @sortby, 'request_collapse', requests_per_page)
@@ -138,6 +147,7 @@ class GeneralController < ApplicationController
             @xapian_requests_total_hits = @xapian_requests.matches_estimated
             @total_hits += @xapian_requests.matches_estimated
             @request_for_spelling = @xapian_requests
+            @max_requests = (@xapian_requests.matches_estimated > MAX_RESULTS) ? MAX_RESULTS : @xapian_requests.matches_estimated
         end
         if @bodies
             @xapian_bodies = perform_search([PublicBody], @query, @sortby, nil, 5)
@@ -147,6 +157,7 @@ class GeneralController < ApplicationController
             @xapian_bodies_total_hits = @xapian_bodies.matches_estimated
             @total_hits += @xapian_bodies.matches_estimated
             @request_for_spelling = @xapian_bodies
+            @max_bodies = (@xapian_bodies.matches_estimated > MAX_RESULTS) ? MAX_RESULTS : @xapian_bodies.matches_estimated
         end
         if @users
             @xapian_users = perform_search([User], @query, @sortby, nil, 5)
@@ -156,6 +167,7 @@ class GeneralController < ApplicationController
             @xapian_users_total_hits = @xapian_users.matches_estimated
             @total_hits += @xapian_users.matches_estimated
             @request_for_spelling = @xapian_users
+            @max_users = (@xapian_users.matches_estimated > MAX_RESULTS) ? MAX_RESULTS : @xapian_users.matches_estimated
         end
 
         # Spelling and highight words are same for all three queries
-- 
cgit v1.2.3


From d5b3973c614aeadb9a13b54c7540fd2a91b53e8e Mon Sep 17 00:00:00 2001
From: Louise Crow <louise.crow@gmail.com>
Date: Tue, 3 Feb 2015 13:29:46 +0000
Subject: Remove unused variable

---
 app/controllers/general_controller.rb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'app/controllers/general_controller.rb')

diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb
index 6aef0cb1b..438bbfd3f 100644
--- a/app/controllers/general_controller.rb
+++ b/app/controllers/general_controller.rb
@@ -138,11 +138,10 @@ class GeneralController < ApplicationController
             raise ActiveRecord::RecordNotFound.new("Sorry. No pages after #{MAX_RESULTS / requests_per_page}.")
         end
 
-        @this_page_hits = @total_hits = @xapian_requests_hits = @xapian_bodies_hits = @xapian_users_hits = 0
+        @total_hits = @xapian_requests_hits = @xapian_bodies_hits = @xapian_users_hits = 0
         if @requests
             @xapian_requests = perform_search([InfoRequestEvent], @query, @sortby, 'request_collapse', requests_per_page)
             @requests_per_page = @per_page
-            @this_page_hits += @xapian_requests.results.size
             @xapian_requests_hits = @xapian_requests.results.size
             @xapian_requests_total_hits = @xapian_requests.matches_estimated
             @total_hits += @xapian_requests.matches_estimated
@@ -152,7 +151,6 @@ class GeneralController < ApplicationController
         if @bodies
             @xapian_bodies = perform_search([PublicBody], @query, @sortby, nil, 5)
             @bodies_per_page = @per_page
-            @this_page_hits += @xapian_bodies.results.size
             @xapian_bodies_hits = @xapian_bodies.results.size
             @xapian_bodies_total_hits = @xapian_bodies.matches_estimated
             @total_hits += @xapian_bodies.matches_estimated
@@ -162,7 +160,6 @@ class GeneralController < ApplicationController
         if @users
             @xapian_users = perform_search([User], @query, @sortby, nil, 5)
             @users_per_page = @per_page
-            @this_page_hits += @xapian_users.results.size
             @xapian_users_hits = @xapian_users.results.size
             @xapian_users_total_hits = @xapian_users.matches_estimated
             @total_hits += @xapian_users.matches_estimated
-- 
cgit v1.2.3