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

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

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index c1a43c8984f610dd714fea5b8e8324607af4d2ae..6815470b8f19771599266e906b6e0da1fd88fcf5 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -2,23 +2,18 @@ class NodeController < ApplicationController
   require 'xml/libxml'
 
   before_filter :authorize
   require 'xml/libxml'
 
   before_filter :authorize

+  after_filter :compress_output

 
   def create
 
   def create

-    response.headers["Content-Type"] = 'application/xml'
+    response.headers["Content-Type"] = 'text/xml'

     if request.put?
     if request.put?

-      node = nil
-      begin
-        node = Node.from_xml(request.raw_post, true)
-      rescue
-        render :text => "XML didn't parse", :status => 400 # if we got here the doc didnt parse
-        return
-      end
+      node = Node.from_xml(request.raw_post, true)

 
       if node
         node.user_id = @user.id
         node.visible = 1
         if node.save_with_history
 
       if node
         node.user_id = @user.id
         node.visible = 1
         if node.save_with_history

-          render :text => node.id
+          render :text => node.id.to_s

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


@@ -34,7 +29,7 @@ class NodeController < ApplicationController
   end
 
   def rest
   end
 
   def rest

-    response.headers["Content-Type"] = 'application/xml'
+    response.headers["Content-Type"] = 'text/xml'

     unless Node.exists?(params[:id])
       render :nothing => true, :status => 404
       return
     unless Node.exists?(params[:id])
       render :nothing => true, :status => 404
       return


@@ -60,9 +55,14 @@ class NodeController < ApplicationController
 
     when :delete
       if node.visible
 
     when :delete
       if node.visible

-        node.visible = 0
-        node.save_with_history
-        render :nothing => true
+        if Segment.find(:first, :conditions => [ "visible = 1 and (node_a = ? or node_b = ?)", node.id, node.id])
+          render :nothing => true, :status => HTTP_PRECONDITION_FAILED
+        else
+          node.user_id = @user.id
+          node.visible = 0
+          node.save_with_history
+          render :nothing => true
+        end

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


@@ -70,50 +70,39 @@ class NodeController < ApplicationController
     when :put
       new_node = Node.from_xml(request.raw_post)
 
     when :put
       new_node = Node.from_xml(request.raw_post)
 

-      node.timestamp = Time.now
-      node.user_id = @user.id
+      if new_node
+        node.timestamp = Time.now
+        node.user_id = @user.id

 
 

-      node.latitude = new_node.latitude 
-      node.longitude = new_node.longitude
-      node.tags = new_node.tags
+        node.latitude = new_node.latitude 
+        node.longitude = new_node.longitude
+        node.tags = new_node.tags

 
 

-      if node.id == new_node.id and node.save_with_history
-        render :nothing => true, :status => 200
+        if node.id == new_node.id and node.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
       return
     end
 
   end
 
       end
       return
     end
 
   end
 

-  def history
-    response.headers["Content-Type"] = 'application/xml'
-    node = Node.find(params[:id])
-
-    unless node
-      render :nothing => true, :staus => 404
-      return
-    end
-
-    doc = XML::Document.new
-    doc.encoding = 'UTF-8' 
-    root = XML::Node.new 'osm'
-    root['version'] = '0.4'
-    root['generator'] = 'OpenStreetMap server'
-    doc.root = root
-
-    node.old_nodes.each do |old_node|
-      el1 = XML::Node.new 'node'
-      el1['id'] = old_node.id.to_s
-      el1['lat'] = old_node.latitude.to_s
-      el1['lon'] = old_node.longitude.to_s
-      Node.split_tags(el1, old_node.tags)
-      el1['visible'] = old_node.visible.to_s
-      el1['timestamp'] = old_node.timestamp.xmlschema
-      root << el1
+  def nodes
+    response.headers["Content-Type"] = 'text/xml'
+    ids = params['nodes'].split(',').collect {|n| n.to_i }
+    if ids.length > 0
+      nodelist = Node.find(ids)
+      doc = get_xml_doc
+      nodelist.each do |node|
+        doc.root << node.to_xml_node
+      end 
+      render :text => doc.to_s
+    else
+      render :nothing => true, :status => 400

     end
     end

-
-    render :text => doc.to_s

   end
 end
   end
 end