diff options
| author | Francis Irving <francis@mysociety.org> | 2010-09-10 03:22:24 +0100 |
|---|---|---|
| committer | Francis Irving <francis@mysociety.org> | 2010-09-10 03:22:24 +0100 |
| commit | f43f5b0c89be58d3f03cbee0626928c1234d64bc (patch) | |
| tree | 7c0e90cc7101ec5e68bc30fd3db12d8706df7a41 | |
| parent | 3e8b4ce88786574a82500c8db3c9272b5b070966 (diff) | |
| parent | 7209feaef2ba0e29af36dd5fb2d55c2e5118ea65 (diff) | |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/whatdotheyknow
| -rw-r--r-- | app/controllers/admin_public_body_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/general_controller.rb | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/app/controllers/admin_public_body_controller.rb b/app/controllers/admin_public_body_controller.rb index bce04ff98..1b79642d2 100644 --- a/app/controllers/admin_public_body_controller.rb +++ b/app/controllers/admin_public_body_controller.rb @@ -36,9 +36,9 @@ class AdminPublicBodyController < AdminController self._lookup_query_internal if params[:new_tag] and params[:new_tag] != "" - if params[:table_name] == 'exact': + if params[:table_name] == 'exact' bodies = @public_bodies_by_tag - elsif params[:table_name] == 'substring': + elsif params[:table_name] == 'substring' bodies = @public_bodies else raise "Unknown table_name " + params[:table_name] diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index 00fcb6bf5..0bea01a6f 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -7,7 +7,13 @@ # # $Id: general_controller.rb,v 1.57 2009-10-03 10:23:43 francis Exp $ -require 'lib/xmlsimple' +begin + require 'xmlsimple' +rescue LoadError + # Debian maintainers put their xmlsimple in a different location :( + require 'lib/xmlsimple' +end + require 'open-uri' class GeneralController < ApplicationController |