aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrancis <francis>2009-03-03 22:36:01 +0000
committerfrancis <francis>2009-03-03 22:36:01 +0000
commit528f967463cfbb8a9e5c4eff53e1388c92f48e6a (patch)
tree0c48fd8e9b9a3f1753ef31e4904b510f366665fe
parentb96e6dc4e0364349c7da741250183718fef57095 (diff)
Patch from Tony Bowden to make front page work without Xapian set up.
-rw-r--r--app/controllers/general_controller.rb14
1 files changed, 9 insertions, 5 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb
index 922d26590..df121531a 100644
--- a/app/controllers/general_controller.rb
+++ b/app/controllers/general_controller.rb
@@ -5,7 +5,7 @@
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: general_controller.rb,v 1.46 2009-01-08 16:57:16 francis Exp $
+# $Id: general_controller.rb,v 1.47 2009-03-03 22:36:01 francis Exp $
class GeneralController < ApplicationController
@@ -21,10 +21,14 @@ class GeneralController < ApplicationController
#@random_requests = InfoRequest.find(:all, :order => "random()", :limit => 8, :conditions => ["described_state = ? and prominence = ?", 'successful', 'normal'] )
# Get some successful requests
- query = 'variety:response (status:successful OR status:partially_successful)'
- sortby = "described"
- @xapian_object = perform_search([InfoRequestEvent], query, sortby, 'request_title_collapse', 8)
- @successful_requests = @xapian_object.results.map { |r| r[:model].info_request }
+ begin
+ query = 'variety:response (status:successful OR status:partially_successful)'
+ sortby = "described"
+ @xapian_object = perform_search([InfoRequestEvent], query, sortby, 'request_title_collapse', 8)
+ @successful_requests = @xapian_object.results.map { |r| r[:model].info_request }
+ rescue
+ @successful_requests = []
+ end
end
# Just does a redirect from ?query= search to /query