Convert session timeout to seconds when it is set

[rails.git] / app / controllers / search_controller.rb

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 7cd6f4ca7413704b3cff9f00b9d622f8b2e72691..4b8b2f402509655cb8efd5ed046fa54bc50ba324 100644 (file)
--- 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,25 +21,25 @@ 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"
-      render :text => "", :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 :text => "", :status => :service_unavailable
+      response.headers["Error"] = "Searching for a key without value is currently unavailable"
+      head :service_unavailable
       return false
     end
 
@@ -95,6 +94,6 @@ class SearchController < ApplicationController
       doc.root << rel.to_xml_node(nil, changeset_cache, user_display_name_cache)
     end
 
-    render :text => doc.to_s, :content_type => "text/xml"
+    render :xml => doc.to_s
   end
 end