Refactor AMF respone streaming

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

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index 8eb6989200a0493dbebaa278d925a717970920f1..19eb771638a53963b73531903326fd8c45faf936 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -4,6 +4,7 @@ class NodeController < ApplicationController
   require 'xml/libxml'
 
   before_filter :authorize, :only => [:create, :update, :delete]
   require 'xml/libxml'
 
   before_filter :authorize, :only => [:create, :update, :delete]

+  before_filter :require_allow_write_api, :only => [:create, :update, :delete]

   before_filter :require_public_data, :only => [:create, :update, :delete]
   before_filter :check_api_writable, :only => [:create, :update, :delete]
   before_filter :check_api_readable, :except => [:create, :update, :delete]
   before_filter :require_public_data, :only => [:create, :update, :delete]
   before_filter :check_api_writable, :only => [:create, :update, :delete]
   before_filter :check_api_readable, :except => [:create, :update, :delete]


@@ -25,7 +26,7 @@ class NodeController < ApplicationController
   def read
     node = Node.find(params[:id])
     if node.visible?
   def read
     node = Node.find(params[:id])
     if node.visible?

-      response.headers['Last-Modified'] = node.timestamp.rfc822
+      response.last_modified = node.timestamp

       render :text => node.to_xml.to_s, :content_type => "text/xml"
     else
       render :text => "", :status => :gone
       render :text => node.to_xml.to_s, :content_type => "text/xml"
     else
       render :text => "", :status => :gone


@@ -38,7 +39,7 @@ class NodeController < ApplicationController
     new_node = Node.from_xml(request.raw_post)
        
     unless new_node and new_node.id == node.id
     new_node = Node.from_xml(request.raw_post)
        
     unless new_node and new_node.id == node.id

-      raise OSM::BadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})")
+      raise OSM::APIBadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})")

     end
     node.update_from(new_node, @user)
     render :text => node.version.to_s, :content_type => "text/plain"
     end
     node.update_from(new_node, @user)
     render :text => node.version.to_s, :content_type => "text/plain"


@@ -52,7 +53,7 @@ class NodeController < ApplicationController
     new_node = Node.from_xml(request.raw_post)
     
     unless new_node and new_node.id == node.id
     new_node = Node.from_xml(request.raw_post)
     
     unless new_node and new_node.id == node.id

-      raise OSM::BadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})")
+      raise OSM::APIBadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})")

     end
     node.delete_with_history!(new_node, @user)
     render :text => node.version.to_s, :content_type => "text/plain"
     end
     node.delete_with_history!(new_node, @user)
     render :text => node.version.to_s, :content_type => "text/plain"


@@ -63,7 +64,7 @@ class NodeController < ApplicationController
     ids = params['nodes'].split(',').collect { |n| n.to_i }
 
     if ids.length == 0
     ids = params['nodes'].split(',').collect { |n| n.to_i }
 
     if ids.length == 0

-      raise OSM::BadUserInput.new("No nodes were given to search for")
+      raise OSM::APIBadUserInput.new("No nodes were given to search for")

     end
     doc = OSM::API.new.get_xml_doc
 
     end
     doc = OSM::API.new.get_xml_doc