X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/071c3581e94552e5da08a2eed14e9a69e4f87e4f..7f24a2f1d621a4a3e784fd289604a17086b88d6d:/app/controllers/search_controller.rb?ds=inline

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 408b4a662..0d40b6691 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -2,43 +2,44 @@ 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)
+    do_search(true, true, true)
   end
 
   def search_ways
-    do_search(true,false,false)
+    do_search(true, false, false)
   end
+
   def search_nodes
-    do_search(false,true,false)
+    do_search(false, true, false)
   end
+
   def search_relations
-    do_search(false,false,true)
+    do_search(false, false, true)
   end
 
-  def do_search(do_ways,do_nodes,do_relations)
-    type = params['type']
-    value = params['value']
-    unless type or value
-      name = params['name']
+  def do_search(do_ways, do_nodes, do_relations)
+    type = params["type"]
+    value = params["value"]
+    unless type || value
+      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"
-      render :nothing => true, :status => :service_unavailable
+      response.headers["Error"] = "Searching of nodes is currently unavailable"
+      head :service_unavailable
       return false
     end
 
     unless value
-      response.headers['Error'] = "Searching for a key without value is currently unavailable"
-      render :nothing => true, :status => :service_unavailable
+      response.headers["Error"] = "Searching for a key without value is currently unavailable"
+      head :service_unavailable
       return false
     end
 
@@ -48,6 +49,8 @@ class SearchController < ApplicationController
       nodes = nodes.where(:current_node_tags => { :k => type }) if type
       nodes = nodes.where(:current_node_tags => { :v => value }) if value
       nodes = nodes.limit(100)
+    else
+      nodes = []
     end
 
     # Matching for way tags table
@@ -56,6 +59,8 @@ class SearchController < ApplicationController
       ways = ways.where(:current_way_tags => { :k => type }) if type
       ways = ways.where(:current_way_tags => { :v => value }) if value
       ways = ways.limit(100)
+    else
+      ways = []
     end
 
     # Matching for relation tags table
@@ -64,10 +69,12 @@ class SearchController < ApplicationController
       relations = relations.where(:current_relation_tags => { :k => type }) if type
       relations = relations.where(:current_relation_tags => { :v => value }) if value
       relations = relations.limit(2000)
+    else
+      relations = []
     end
 
     # Fetch any node needed for our ways (only have matching nodes so far)
-    nodes += Node.find(ways.collect { |w| w.nds }.uniq)
+    nodes += Node.find(ways.collect(&:nds).uniq)
 
     # Print
     visible_nodes = {}
@@ -84,9 +91,9 @@ class SearchController < ApplicationController
     end
 
     relations.each do |rel|
-      doc.root << rel.to_xml_node(nil, changeset_cache, user_display_name_cache)
+      doc.root << rel.to_xml_node(changeset_cache, user_display_name_cache)
     end
 
-    render :text => doc.to_s, :content_type => "text/xml"
+    render :xml => doc.to_s
   end
 end