Split the rest action into sparate read, update and delete actions thus

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

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index f88340fb6a6c3a49f6131950e637569f77a31bc3..70bf23824a3e3167cf83d204e1d7a9ce9214c7d5 100644 (file)
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -3,7 +3,6 @@ class SearchController < ApplicationController
   # Can search by tag k, v, or both (type->k,value->v)
   # Can search by name (k=name,v=....)
 
-  before_filter :authorize
   after_filter :compress_output
 
   def search_all
@@ -22,8 +21,6 @@ class SearchController < ApplicationController
 
 
   def do_search(do_ways,do_segments,do_nodes)
-    response.headers["Content-Type"] = 'text/xml'
-
     type = params['type']
     value = params['value']
     unless type or value
@@ -109,7 +106,7 @@ class SearchController < ApplicationController
 
 
     # Print
-    doc = OSM::API.get_xml_doc
+    doc = OSM::API.new.get_xml_doc
     nodes.each do |node|
       doc.root << node.to_xml_node()
     end
@@ -122,6 +119,6 @@ class SearchController < ApplicationController
       doc.root << way.to_xml_node()
     end 
 
-    render :text => doc.to_s
+    render :text => doc.to_s, :content_type => "text/xml"
   end
 end