use render proc to write out results, see if that makes things faster

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

diff --git a/app/controllers/segment_controller.rb b/app/controllers/segment_controller.rb
index 76cb5cebb44e6fbea5e97c64135b92282b25b108..bc41b85a39a116a02dadebb660a344242603f0ba 100644 (file)
--- a/app/controllers/segment_controller.rb
+++ b/app/controllers/segment_controller.rb
@@ -5,7 +5,7 @@ class SegmentController < ApplicationController
   after_filter :compress_output
 
   def create
   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 request.put?
       segment = Segment.from_xml(request.raw_post, true)
 


@@ -14,9 +14,15 @@ class SegmentController < ApplicationController
 
         segment.from_node = Node.find(segment.node_a.to_i)
         segment.to_node = Node.find(segment.node_b.to_i)
 
         segment.from_node = Node.find(segment.node_a.to_i)
         segment.to_node = Node.find(segment.node_b.to_i)

+          
+        if segment.from_node == segment.to_node
+          render :nothing => true, :status => HTTP_EXPECTATION_FAILED
+          return
+        end

         
         unless segment.preconditions_ok? # are the nodes visible?
         
         unless segment.preconditions_ok? # are the nodes visible?

-          render :nothing => true, :status => 412
+          render :nothing => true, :status => HTTP_PRECONDITION_FAILED
+          return

         end
 
         if segment.save_with_history
         end
 
         if segment.save_with_history


@@ -25,7 +31,6 @@ class SegmentController < ApplicationController
           render :nothing => true, :status => 500
         end
         return
           render :nothing => true, :status => 500
         end
         return

-

       else
         render :nothing => true, :status => 400 # if we got here the doc didnt parse
         return
       else
         render :nothing => true, :status => 400 # if we got here the doc didnt parse
         return


@@ -36,7 +41,7 @@ class SegmentController < ApplicationController
   end
 
   def rest
   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
     unless Segment.exists?(params[:id])
       render :nothing => true, :status => 404
       return


@@ -52,9 +57,14 @@ class SegmentController < ApplicationController
 
     when :delete
       if segment.visible
 
     when :delete
       if segment.visible

-        segment.visible = 0
-        segment.save_with_history
-        render :nothing => true
+        if WaySegment.find(:first, :joins => "INNER JOIN current_ways ON current_ways.id = current_way_segments.id", :conditions => [ "current_ways.visible = 1 AND current_way_segments.segment_id = ?", segment.id ])
+          render :nothing => true, :status => HTTP_PRECONDITION_FAILED
+        else
+          segment.user_id = @user.id
+          segment.visible = 0
+          segment.save_with_history
+          render :nothing => true
+        end

       else
         render :nothing => true, :status => 410
       end
       else
         render :nothing => true, :status => 410
       end


@@ -62,30 +72,57 @@ class SegmentController < ApplicationController
     when :put
       new_segment = Segment.from_xml(request.raw_post)
 
     when :put
       new_segment = Segment.from_xml(request.raw_post)
 

-      segment.timestamp = Time.now
-      segment.user_id = @user.id
+      if new_segment
+        if new_segment.node_a == new_segment.node_b
+          render :nothing => true, :status => HTTP_EXPECTATION_FAILED
+          return
+        end
+        
+        unless new_segment.preconditions_ok? # are the nodes visible?
+          render :nothing => true, :status => HTTP_PRECONDITION_FAILED
+          return
+        end

 
 

-      segment.node_a = new_segment.node_a
-      segment.node_b = new_segment.node_b
-      segment.tags = new_segment.tags
-      segment.visible = new_segment.visible
+        segment.timestamp = Time.now
+        segment.user_id = @user.id
+        segment.node_a = new_segment.node_a
+        segment.node_b = new_segment.node_b
+        segment.tags = new_segment.tags
+        segment.visible = new_segment.visible

 
 

-      if segment.id == new_segment.id and segment.save_with_history
-        render :nothing => true, :status => 200
+        if segment.id == new_segment.id and segment.save_with_history
+          render :nothing => true
+        else
+          render :nothing => true, :status => 500
+        end

       else
       else

-        render :nothing => true, :status => 500
+        render :nothing => true, :status => 400 # if we got here the doc didnt parse

       end
       end

-      return

     end
 
   end
 
   def segments
     end
 
   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)
     ids = params['segments'].split(',').collect {|s| s.to_i }
     if ids.length > 0
       segmentlist = Segment.find(ids)

-      doc = OSM::API.get_xml_doc
+      doc = OSM::API.new.get_xml_doc
+      segmentlist.each do |segment|
+        doc.root << segment.to_xml_node
+      end 
+      render :text => doc.to_s
+    else
+      render :nothing => true, :status => 400
+    end
+  end
+
+  def segments_for_node
+    response.headers["Content-Type"] = 'text/xml'
+    segmentids = Segment.find(:all, :conditions => ['node_a = ? OR node_b = ?', params[:id], params[:id]]).collect { |s| s.id }.uniq
+    if segmentids.length > 0
+      segmentlist = Segment.find(segmentids)
+      doc = OSM::API.new.get_xml_doc

       segmentlist.each do |segment|
         doc.root << segment.to_xml_node
       end 
       segmentlist.each do |segment|
         doc.root << segment.to_xml_node
       end