X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..5f4dcd34ff5943ff4de39bc8322013376a6de8b9:/app/controllers/search_controller.rb?ds=sidebyside diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index 7cd6f4ca7..8a632e6a2 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -2,8 +2,7 @@ class SearchController < ApplicationController # Support searching for nodes, ways, or all # Can search by tag k, v, or both (type->k,value->v) # Can search by name (k=name,v=....) - skip_before_filter :verify_authenticity_token - after_filter :compress_output + skip_before_action :verify_authenticity_token def search_all do_search(true, true, true) @@ -22,24 +21,24 @@ class SearchController < ApplicationController end def do_search(do_ways, do_nodes, do_relations) - type = params['type'] - value = params['value'] + type = params["type"] + value = params["value"] unless type || value - name = params['name'] + name = params["name"] if name - type = 'name' + type = "name" value = name end end if do_nodes - response.headers['Error'] = "Searching of nodes is currently unavailable" + response.headers["Error"] = "Searching of nodes is currently unavailable" render :text => "", :status => :service_unavailable return false end unless value - response.headers['Error'] = "Searching for a key without value is currently unavailable" + response.headers["Error"] = "Searching for a key without value is currently unavailable" render :text => "", :status => :service_unavailable return false end