change mime type and reformat search controller

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

diff --git a/app/controllers/segment_controller.rb b/app/controllers/segment_controller.rb
index 58e98bef224288ec0cb5df3fff45235112f0b23a..28c7580df370db0a691c21e41e0efa85fe024685 100644 (file)
--- a/app/controllers/segment_controller.rb
+++ b/app/controllers/segment_controller.rb
@@ -5,12 +5,11 @@ class SegmentController < ApplicationController
   after_filter :compress_output
 
   def create
-    response.headers["Content-Type"] = 'application/xml'
+    response.headers["Content-Type"] = 'text/xml'
     if request.put?
       segment = Segment.from_xml(request.raw_post, true)
 
       if segment
-        
         segment.user_id = @user.id
 
         segment.from_node = Node.find(segment.node_a.to_i)
@@ -21,7 +20,7 @@ class SegmentController < ApplicationController
         end
 
         if segment.save_with_history
-          render :text => segment.id
+          render :text => segment.id.to_s
         else
           render :nothing => true, :status => 500
         end
@@ -37,7 +36,7 @@ class SegmentController < ApplicationController
   end
 
   def rest
-    response.headers["Content-Type"] = 'application/xml'
+    response.headers["Content-Type"] = 'text/xml'
     unless Segment.exists?(params[:id])
       render :nothing => true, :status => 404
       return
@@ -82,11 +81,11 @@ class SegmentController < ApplicationController
   end
 
   def segments
-    response.headers["Content-Type"] = 'application/xml'
+    response.headers["Content-Type"] = 'text/xml'
     ids = params['segments'].split(',').collect {|s| s.to_i }
     if ids.length > 0
       segmentlist = Segment.find(ids)
-      doc = get_xml_doc
+      doc = OSM::API.get_xml_doc
       segmentlist.each do |segment|
         doc.root << segment.to_xml_node
       end