Fix edit page

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

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index eeaba6199a9ad346970e0688e7bcd70907534045..1e34bc10d507c5cec1874137dd7c13fe5431a718 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -3,8 +3,9 @@
 class NodeController < ApplicationController
   require 'xml/libxml'
 
 class NodeController < ApplicationController
   require 'xml/libxml'
 

-  session :off
+  skip_before_filter :verify_authenticity_token

   before_filter :authorize, :only => [:create, :update, :delete]
   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]


@@ -17,19 +18,18 @@ class NodeController < ApplicationController
 
     node = Node.from_xml(request.raw_post, true)
 
 
     node = Node.from_xml(request.raw_post, true)
 

-    if node
-      node.create_with_history @user
-      render :text => node.id.to_s, :content_type => "text/plain"
-    else
-      raise OSM::APIBadXMLError.new(:node, request.raw_post)
-    end
+    # Assume that Node.from_xml has thrown an exception if there is an error parsing the xml
+    node.create_with_history @user
+    render :text => node.id.to_s, :content_type => "text/plain"

   end
 
   # Dump the details on a node given in params[:id]
   def read
     node = Node.find(params[:id])
   end
 
   # Dump the details on a node given in params[:id]
   def read
     node = Node.find(params[:id])

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

       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


@@ -40,13 +40,12 @@ class NodeController < ApplicationController
   def update
     node = Node.find(params[:id])
     new_node = Node.from_xml(request.raw_post)
   def update
     node = Node.find(params[:id])
     new_node = Node.from_xml(request.raw_post)

-    
-    if new_node and new_node.id == node.id
-      node.update_from(new_node, @user)
-      render :text => node.version.to_s, :content_type => "text/plain"
-    else
-      render :nothing => true, :status => :bad_request
+       
+    unless new_node and new_node.id == 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
     end

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

   end
 
   # Delete a node. Doesn't actually delete it, but retains its history 
   end
 
   # Delete a node. Doesn't actually delete it, but retains its history 


@@ -56,28 +55,30 @@ class NodeController < ApplicationController
     node = Node.find(params[:id])
     new_node = Node.from_xml(request.raw_post)
     
     node = Node.find(params[:id])
     new_node = Node.from_xml(request.raw_post)
     

-    if new_node and new_node.id == node.id
-      node.delete_with_history!(new_node, @user)
-      render :text => node.version.to_s, :content_type => "text/plain"
-    else
-      render :nothing => true, :status => :bad_request
+    unless new_node and new_node.id == 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
     end

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

   end
 
   # Dump the details on many nodes whose ids are given in the "nodes" parameter.
   def nodes
   end
 
   # Dump the details on many nodes whose ids are given in the "nodes" parameter.
   def nodes

-    ids = params['nodes'].split(',').collect { |n| n.to_i }
+    if not params['nodes']
+      raise OSM::APIBadUserInput.new("The parameter nodes is required, and must be of the form nodes=id[,id[,id...]]")
+    end

 
 

-    if ids.length > 0
-      doc = OSM::API.new.get_xml_doc
+    ids = params['nodes'].split(',').collect { |n| n.to_i }

 
 

-      Node.find(ids).each do |node|
-        doc.root << node.to_xml_node
-      end 
+    if ids.length == 0
+      raise OSM::APIBadUserInput.new("No nodes were given to search for")
+    end
+    doc = OSM::API.new.get_xml_doc

 
 

-      render :text => doc.to_s, :content_type => "text/xml"
-    else
-      render :nothing => true, :status => :bad_request
+    Node.find(ids).each do |node|
+      doc.root << node.to_xml_node

     end
     end

+
+    render :text => doc.to_s, :content_type => "text/xml"

   end
 end
   end
 end