1 files changed, 23 insertions, 5 deletions
diff --git a/app/controllers/public_body_controller.rb b/app/controllers/public_body_controller.rb
index ce70e1ab0..e4f8753af 100644
--- a/app/controllers/public_body_controller.rb
+++ b/app/controllers/public_body_controller.rb
@@ -90,12 +90,16 @@ class PublicBodyController < ApplicationController
         @query = "%#{params[:public_body_query].nil? ? "" : params[:public_body_query]}%"
         @tag = params[:tag]
         @locale = self.locale_from_params()
-        locale_condition = "(upper(public_body_translations.name) LIKE upper(?) OR upper(public_body_translations.notes) LIKE upper (?)) AND public_body_translations.locale = ?"
+
+        locale_condition = "(upper(public_body_translations.name) LIKE upper(?) 
+                            OR upper(public_body_translations.notes) LIKE upper (?)) 
+                            AND public_body_translations.locale = ?
+                            AND public_bodies.id <> #{PublicBody.internal_admin_body.id}"
         if @tag.nil? or @tag == "all"
             @tag = "all"
             conditions = [locale_condition, @query, @query, @locale]
         elsif @tag == 'other'
-            category_list = PublicBodyCategories::CATEGORIES.map{|c| "'"+c+"'"}.join(",")
+            category_list = PublicBodyCategories::get().tags().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', @query, @query, @locale]
@@ -112,15 +116,17 @@ class PublicBodyController < ApplicationController
                 and has_tag_string_tags.model = \'PublicBody\'
                 and has_tag_string_tags.name = ?) > 0', @query, @query, @locale, @tag]
         end
-        if @tag.size == 1
+        if @tag == "all"
+            @description = ""
+        elsif @tag.size == 1
             @description = _("beginning with") + " '" + @tag + "'"
         else
-            @description = PublicBodyCategories::CATEGORIES_BY_TAG[@tag]
+            @description = PublicBodyCategories::get().by_tag()[@tag]
             if @description.nil?
                 @description = @tag
             end
         end
-        PublicBody.with_locale(@locale) do 
+        PublicBody.with_locale(@locale) do
             @public_bodies = PublicBody.paginate(
               :order => "public_body_translations.name", :page => params[:page], :per_page => 1000, # fit all councils on one page
               :conditions => conditions,
@@ -173,5 +179,17 @@ class PublicBodyController < ApplicationController
                   :filename => 'all-authorities.csv', 
                   :disposition =>'attachment', :encoding => 'utf8')
     end
+
+    # Type ahead search
+    def search_typeahead
+        # Since acts_as_xapian doesn't support the Partial match flag, we work around it
+        # by making the last work a wildcard, which is quite the same
+        query = params[:q] + '*'
+
+        query = query.split(' ').join(' OR ')       # XXX: HACK for OR instead of default AND!
+        @xapian_requests = perform_search([PublicBody], query, 'relevant', 'request_collapse', 5)
+
+        render :partial => "public_body/search_ahead"
+    end
 end