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 97d551776b92809f8ac91e22fde49bce31acd690..6815470b8f19771599266e906b6e0da1fd88fcf5 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -2,19 +2,20 @@ 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"] = 'text/xml'

     if request.put?
       node = Node.from_xml(request.raw_post, true)
 
       if node
         node.user_id = @user.id
     if request.put?
       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.save_with_history

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

         else
         else

-          render :text => 'truesrgtsrtfgsar', :status => 500
-#          render :nothing => true, :status => 500
+          render :nothing => true, :status => 500

         end
         return
 
         end
         return
 


@@ -24,13 +25,13 @@ class NodeController < ApplicationController
       end
     end
 
       end
     end
 

-          render :text => 'FFFFFFFFFF ', :status => 500
-#    render :nothing => true, :status => 500 # something went very wrong
+    render :nothing => true, :status => 500 # something went very wrong

   end
 
   def rest
   end
 
   def rest

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

     unless Node.exists?(params[:id])
     unless Node.exists?(params[:id])

-      render :nothing => true, :status => 400
+      render :nothing => true, :status => 404

       return
     end
 
       return
     end
 


@@ -39,37 +40,69 @@ class NodeController < ApplicationController
     case request.method
 
     when :get
     case request.method
 
     when :get

+      unless node
+        render :nothing => true, :status => 500
+        return
+      end
+
+      unless node.visible
+        render :nothing => true, :status => 410
+        return
+      end
+

       render :text => node.to_xml.to_s
       return
 
     when :delete
       render :text => node.to_xml.to_s
       return
 
     when :delete

-

       if node.visible
       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
 
     when :put
       else
         render :nothing => true, :status => 410
       end
 
     when :put

-

       new_node = Node.from_xml(request.raw_post)
 
       new_node = Node.from_xml(request.raw_post)
 

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

 
 

-      if node.id == new_node.id and new_node.save_with_history
-        render :text => node.id
+        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
+        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 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

 end
 end