X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/85f197b6df81cef19fe6a2a1cfc0429ea50051c7..6690a9a09bca0afc3aac41e0d51789e965d9b9e7:/app/controllers/node_controller.rb?ds=sidebyside

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index 97d551776..c03f3c4fb 100644
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -1,75 +1,103 @@
+# The NodeController is the RESTful interface to Node objects
+
 class NodeController < ApplicationController
   require 'xml/libxml'
 
-  before_filter :authorize
+  session :off
+  before_filter :authorize, :only => [:create, :update, :delete]
+  before_filter :check_write_availability, :only => [:create, :update, :delete]
+  before_filter :check_read_availability, :except => [:create, :update, :delete]
+  after_filter :compress_output
 
+  # Create a node from XML.
   def create
-    if request.put?
-      node = Node.from_xml(request.raw_post, true)
-
-      if node
-        node.user_id = @user.id
-        if node.save_with_history
+    begin
+      if request.put?
+        node = Node.from_xml(request.raw_post, true)
 
-          render :text => node.id
+        if node
+          node.create_with_history @user
+          render :text => node.id.to_s, :content_type => "text/plain"
         else
-          render :text => 'truesrgtsrtfgsar', :status => 500
-#          render :nothing => true, :status => 500
+          render :nothing => true, :status => :bad_request
         end
-        return
-
       else
-        render :nothing => true, :status => 400 # if we got here the doc didnt parse
-        return
+        render :nothing => true, :status => :method_not_allowed
       end
+    rescue OSM::APIError => ex
+      render ex.render_opts
     end
-
-          render :text => 'FFFFFFFFFF ', :status => 500
-#    render :nothing => true, :status => 500 # something went very wrong
   end
 
-  def rest
-    unless Node.exists?(params[:id])
-      render :nothing => true, :status => 400
-      return
+  # Dump the details on a node given in params[:id]
+  def read
+    begin
+      node = Node.find(params[:id])
+      if node.visible?
+        response.headers['Last-Modified'] = node.timestamp.rfc822
+        render :text => node.to_xml.to_s, :content_type => "text/xml"
+       else
+        render :text => "", :status => :gone
+      end
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
     end
+  end
+  
+  # Update a node from given XML
+  def update
+    begin
+      node = Node.find(params[:id])
+      new_node = Node.from_xml(request.raw_post)
 
-    node = Node.find(params[:id])
-
-    case request.method
-
-    when :get
-      render :text => node.to_xml.to_s
-      return
-
-    when :delete
-
-      if node.visible
-        node.visible = 0
-
-        node.save_with_history
-
-        render :nothing => true
+      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 => 410
+        render :nothing => true, :status => :bad_request
       end
+    rescue OSM::APIError => ex
+      render ex.render_opts
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    end
+  end
 
-    when :put
-
+  # Delete a node. Doesn't actually delete it, but retains its history 
+  # in a wiki-like way. We therefore treat it like an update, so the delete
+  # method returns the new version number.
+  def delete
+    begin
+      node = Node.find(params[:id])
       new_node = Node.from_xml(request.raw_post)
-
-      new_node.timestamp = Time.now
-      new_node.user_id = @user.id
-
-      if node.id == new_node.id and new_node.save_with_history
-        render :text => node.id
+      
+      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 => 500
+        render :nothing => true, :status => :bad_request
       end
-      return
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    rescue OSM::APIError => ex
+      render ex.render_opts
     end
-
   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 ids.length > 0
+      doc = OSM::API.new.get_xml_doc
+
+      Node.find(ids).each do |node|
+        doc.root << node.to_xml_node
+      end 
 
+      render :text => doc.to_s, :content_type => "text/xml"
+    else
+      render :nothing => true, :status => :bad_request
+    end
+  end
 end