Oops - make it actually do substring searches still, just using like rather than ilike.

5 files changed, 13 insertions, 13 deletions

diff --git a/app/controllers/admin_public_body_controller.rb b/app/controllers/admin_public_body_controller.rb
index 0c3b5cb8b..58432d8a9 100644
--- a/app/controllers/admin_public_body_controller.rb
+++ b/app/controllers/admin_public_body_controller.rb
@@ -4,7 +4,7 @@
 # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
 # Email: francis@mysociety.org; WWW: http://www.mysociety.org/
 #
-# $Id: admin_public_body_controller.rb,v 1.16 2008-07-28 17:59:40 francis Exp $
+# $Id: admin_public_body_controller.rb,v 1.17 2008-07-28 18:04:38 francis Exp $
 
 class AdminPublicBodyController < ApplicationController
     layout "admin"
@@ -18,9 +18,9 @@ class AdminPublicBodyController < ApplicationController
     def list
         @query = params[:query]
         @public_bodies = PublicBody.paginate :order => "name", :page => params[:page], :per_page => 100,
-            :conditions =>  @query.nil? ? nil : ["lower(name) = lower('%'||?||'%') or 
-                             lower(short_name) = lower('%'||?||'%') or 
-                             lower(request_email) = lower('%'||?||'%')", @query, @query, @query]
+            :conditions =>  @query.nil? ? nil : ["lower(name) like lower('%'||?||'%') or 
+                             lower(short_name) like lower('%'||?||'%') or 
+                             lower(request_email) like lower('%'||?||'%')", @query, @query, @query]
         @public_bodies_by_tag = PublicBody.find_by_tag(@query) 
     end
 
diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb
index dd6f9cf46..a4f21adae 100644
--- a/app/controllers/admin_request_controller.rb
+++ b/app/controllers/admin_request_controller.rb
@@ -4,7 +4,7 @@
 # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
 # Email: francis@mysociety.org; WWW: http://www.mysociety.org/
 #
-# $Id: admin_request_controller.rb,v 1.15 2008-07-28 17:59:40 francis Exp $
+# $Id: admin_request_controller.rb,v 1.16 2008-07-28 18:04:38 francis Exp $
 
 class AdminRequestController < ApplicationController
     layout "admin"
@@ -18,7 +18,7 @@ class AdminRequestController < ApplicationController
     def list
         @query = params[:query]
         @info_requests = InfoRequest.paginate :order => "created_at desc", :page => params[:page], :per_page => 100,
-            :conditions =>  @query.nil? ? nil : ["lower(title) = lower('%'||?||'%')", @query]
+            :conditions =>  @query.nil? ? nil : ["lower(title) like lower('%'||?||'%')", @query]
     end
 
     def show
diff --git a/app/controllers/admin_track_controller.rb b/app/controllers/admin_track_controller.rb
index b21ff49df..97655cd9a 100644
--- a/app/controllers/admin_track_controller.rb
+++ b/app/controllers/admin_track_controller.rb
@@ -4,7 +4,7 @@
 # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
 # Email: francis@mysociety.org; WWW: http://www.mysociety.org/
 #
-# $Id: admin_track_controller.rb,v 1.3 2008-07-28 17:59:40 francis Exp $
+# $Id: admin_track_controller.rb,v 1.4 2008-07-28 18:04:38 francis Exp $
 
 class AdminTrackController < ApplicationController
     layout "admin"
@@ -13,7 +13,7 @@ class AdminTrackController < ApplicationController
     def list
         @query = params[:query]
         @admin_tracks = TrackThing.paginate :order => "created_at desc", :page => params[:page], :per_page => 100,
-            :conditions =>  @query.nil? ? nil : ["lower(track_query) = lower('%'||?||'%')", @query ]
+            :conditions =>  @query.nil? ? nil : ["lower(track_query) like lower('%'||?||'%')", @query ]
     end
 
     private
diff --git a/app/controllers/admin_user_controller.rb b/app/controllers/admin_user_controller.rb
index facf518f4..50be7e65d 100644
--- a/app/controllers/admin_user_controller.rb
+++ b/app/controllers/admin_user_controller.rb
@@ -4,7 +4,7 @@
 # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
 # Email: francis@mysociety.org; WWW: http://www.mysociety.org/
 #
-# $Id: admin_user_controller.rb,v 1.4 2008-07-28 17:59:40 francis Exp $
+# $Id: admin_user_controller.rb,v 1.5 2008-07-28 18:04:38 francis Exp $
 
 class AdminUserController < ApplicationController
     layout "admin"
@@ -18,8 +18,8 @@ class AdminUserController < ApplicationController
     def list
         @query = params[:query]
         @admin_users = User.paginate :order => "name", :page => params[:page], :per_page => 100,
-            :conditions =>  @query.nil? ? nil : ["lower(name) = lower('%'||?||'%') or 
-                             lower(email) = lower('%'||?||'%')", @query, @query]
+            :conditions =>  @query.nil? ? nil : ["lower(name) like lower('%'||?||'%') or 
+                             lower(email) like lower('%'||?||'%')", @query, @query]
     end
 
     def show
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb
index 141193c2d..c01683c03 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.29 2008-07-28 17:59:40 francis Exp $
+# $Id: general_controller.rb,v 1.30 2008-07-28 18:04:38 francis Exp $
 
 class GeneralController < ApplicationController
 
@@ -99,7 +99,7 @@ class GeneralController < ApplicationController
 
         criteria = '%' + query + '%'
         @public_bodies = PublicBody.find(:all, 
-                    :conditions => ["lower(name) = lower(?) or short_name = lower(?)", criteria, criteria],
+                    :conditions => ["lower(name) like lower(?) or short_name like lower(?)", criteria, criteria],
                     :order => 'name', :limit=>10)  
         return @public_bodies
     end