diff options
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/application_controller.rb | 72 | ||||
| -rw-r--r-- | app/controllers/general_controller.rb | 8 | ||||
| -rw-r--r-- | app/controllers/public_body_controller.rb | 29 | ||||
| -rw-r--r-- | app/controllers/request_controller.rb | 7 |
4 files changed, 77 insertions, 39 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index e16f9f5bb..31a6ef3db 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -349,10 +349,18 @@ class ApplicationController < ActionController::Base session[:last_body_id] = public_body.id end - def alter_query_from_params(query) + def param_exists(item) + return params[item] && !params[item].empty? + end + + def alter_query_from_params # various forms are used to customise queries and hide # xapian's complexity. This parses the form fields and turns # them into a xapian query string + if params[:latest_status].nil? + params[:latest_status] = params[:view] || "all" + end + query = params[:query] query = "" if query.nil? sortby = "newest" if params[:request_variety] && !(query =~ /variety:/) @@ -369,35 +377,53 @@ class ApplicationController < ActionController::Base end query += " (#{varieties.join(' OR ')})" end - case params[:request_status] - when "recent", "all" - if !(query =~ /variety:/) - query += " (variety:sent)" + if params[:latest_status] && !(query =~ /latest_status:/) + statuses = [] + if params[:latest_status].class == String + params[:latest_status] = [params[:latest_status]] end - when "successful" - query += ' (latest_status:successful OR latest_status:partially_successful)' - sortby = "described" - when "unsuccessful" - query += ' (latest_status:rejected OR latest_status:not_held)' - sortby = "described" - when "awaiting" - if query.empty? - query += 'variety:sent ' + if params[:latest_status].include?("recent") || params[:latest_status].include?("all") + if !(query =~ /variety:/) + query += " (variety:sent)" + end end - query += ' NOT (latest_status:successful OR latest_status:partially_successful OR latest_status:rejected OR latest_status:not_held OR latest_status:gone_postal)' - sortby = "described" - when "internal_review" - query += ' (latest_status:internal_review)' - sortby = "described" - end + if params[:latest_status].include? "successful" + statuses << ['latest_status:successful', 'latest_status:partially_successful'] + sortby = "described" + end + if params[:latest_status].include? "unsuccessful" + statuses << ['latest_status:rejected', 'latest_status:not_held'] + sortby = "described" + end + if params[:latest_status].include? "awaiting" + statuses << ['latest_status:waiting_response', 'latest_status:waiting_clarification', 'waiting_classification:true'] + sortby = "described" + end + if params[:latest_status].include? "internal_review" + statuses << ['status:internal_review'] + sortby = "described" + end + if params[:latest_status].include? "other" + statuses << ['latest_status:gone_postal', 'latest_status:error_message', 'latest_status:requires_admin', 'latest_status:user_withdrawn'] + sortby = "described" + end + if params[:latest_status].include? "gone_postal" + statuses << ['latest_status:gone_postal'] + sortby = "described" + end + query += " (#{statuses.join(' OR ')})" - if !params[:request_date_after].nil? && params[:request_date_before].nil? + end + if query.empty? + query = "variety:sent" + end + if param_exists(:request_date_after) && !param_exists(:request_date_before) params[:request_date_before] = Date.now.strftime("%d/%m/%Y") query += " #{params[:request_date_after]}..#{params[:request_date_before]}" - elsif params[:request_date_after].nil? && !params[:request_date_before].nil? + elsif !param_exists(:request_date_after) && param_exists(:request_date_before) params[:request_date_after] = "01/01/2008" end - if params[:request_date_after] + if param_exists(:request_date_after) query = "#{params[:request_date_after]}..#{params[:request_date_before]} " + query end return query, sortby diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index 4fa603aab..e9325c3c5 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -82,9 +82,12 @@ class GeneralController < ApplicationController # Just does a redirect from ?query= search to /query def search_redirect - @query = params[:query] + @query = alter_query_from_params @sortby = params[:sortby] @bodies = params[:bodies] + [:latest_status, :request_variety, :request_date_after, :request_date_before, :query].each do |x| + session[x] = params[x] + end if @query.nil? || @query.empty? @query = nil @page = 1 @@ -103,6 +106,9 @@ class GeneralController < ApplicationController def search # XXX Why is this so complicated with arrays and stuff? Look at the route # in config/routes.rb for comments. + [:latest_status, :request_variety, :request_date_after, :request_date_before, :query].each do |x| + params[x] = session[x] + end combined = params[:combined] @sortby = nil @bodies = false # searching from front page, largely for a public authority diff --git a/app/controllers/public_body_controller.rb b/app/controllers/public_body_controller.rb index 05acf4868..cb27e78f0 100644 --- a/app/controllers/public_body_controller.rb +++ b/app/controllers/public_body_controller.rb @@ -16,7 +16,6 @@ class PublicBodyController < ApplicationController redirect_to :url_name => MySociety::Format.simplify_url_part(params[:url_name], 'body'), :status => :moved_permanently return end - @locale = self.locale_from_params() PublicBody.with_locale(@locale) do @public_body = PublicBody.find_by_url_name_with_historic(params[:url_name]) @@ -39,11 +38,15 @@ class PublicBodyController < ApplicationController if !referrer.nil? && referrer.match(%r{^#{top_url}search/.*/bodies$}) @searched_to_send_request = true end - + query, sortby = alter_query_from_params + if !query.empty? + query = "(#{query})" + end + query += "requested_from:#{@public_body.url_name}" # Use search query for this so can collapse and paginate easily # XXX really should just use SQL query here rather than Xapian. begin - @xapian_requests = perform_search([InfoRequestEvent], 'requested_from:' + @public_body.url_name, 'newest', 'request_collapse') + @xapian_requests = perform_search([InfoRequestEvent], query, sortby, 'request_collapse') if (@page > 1) @page_desc = " (page " + @page.to_s + ")" else @@ -83,29 +86,35 @@ class PublicBodyController < ApplicationController def list long_cache # XXX move some of these tag SQL queries into has_tag_string.rb + if params[:commit] != _('Show all') + @query = "%#{params[:public_body_query].nil? ? "" : params[:public_body_query]}%" + else + redirect_to list_public_bodies_url(:tag => "all") + return + end @tag = params[:tag] @locale = self.locale_from_params() - locale_condition = 'public_body_translations.locale = ?' - if @tag.nil? + locale_condition = "upper(public_body_translations.name) LIKE upper(?) AND public_body_translations.locale = ?" + if @tag.nil? or @tag == "all" @tag = "all" - conditions = [locale_condition, @locale] + conditions = [locale_condition, @query, @locale] elsif @tag == 'other' category_list = PublicBodyCategories::CATEGORIES.map{|c| "'"+c+"'"}.join(",") conditions = [locale_condition + ' AND (select count(*) from has_tag_string_tags where has_tag_string_tags.model_id = public_bodies.id and has_tag_string_tags.model = \'PublicBody\' - and has_tag_string_tags.name in (' + category_list + ')) = 0', @locale] + and has_tag_string_tags.name in (' + category_list + ')) = 0', @query, @locale] elsif @tag.size == 1 @tag.upcase! - conditions = [locale_condition + ' AND public_body_translations.first_letter = ?', @locale, @tag] + conditions = [locale_condition + ' AND public_body_translations.first_letter = ?', @query, @locale, @tag] elsif @tag.include?(":") name, value = HasTagString::HasTagStringTag.split_tag_into_name_value(@tag) conditions = [locale_condition + ' AND (select count(*) from has_tag_string_tags where has_tag_string_tags.model_id = public_bodies.id and has_tag_string_tags.model = \'PublicBody\' - and has_tag_string_tags.name = ? and has_tag_string_tags.value = ?) > 0', @locale, name, value] + and has_tag_string_tags.name = ? and has_tag_string_tags.value = ?) > 0', @query, @locale, name, value] else conditions = [locale_condition + ' AND (select count(*) from has_tag_string_tags where has_tag_string_tags.model_id = public_bodies.id and has_tag_string_tags.model = \'PublicBody\' - and has_tag_string_tags.name = ?) > 0', @locale, @tag] + and has_tag_string_tags.name = ?) > 0', @query, @locale, @tag] end if @tag.size == 1 @description = _("beginning with") + " '" + @tag + "'" diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index 731348fbf..bb91cc854 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -129,12 +129,9 @@ class RequestController < ApplicationController def list medium_cache @view = params[:view] - if !@view.nil? - params[:request_status] = @view - end params[:request_status] = "recent" if params[:query].nil? && params[:request_status].nil? - query, sortby = alter_query_from_params(params[:query]) - @title = "Some title" + query, sortby = alter_query_from_params + @title = "View and search requests" @page = get_search_page_from_params if !@page # used in cache case, as perform_search sets @page as side effect behavior_cache :tag => [@view, @page] do |