Add some more missing translations. Use .to_sentence instead of .join(', ') so that...

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

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index 29bf672e2d5606e0d2535cbe480972544f6fb94d..eeaba6199a9ad346970e0688e7bcd70907534045 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -5,109 +5,66 @@ class NodeController < ApplicationController
 
   session :off
   before_filter :authorize, :only => [:create, :update, :delete]
 
   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]
+  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]

   after_filter :compress_output
   after_filter :compress_output

+  around_filter :api_call_handle_error, :api_call_timeout

 
   # Create a node from XML.
   def create
 
   # Create a node from XML.
   def create

-    if request.put?
-      node = Node.from_xml(request.raw_post, true)
-      # FIXME remove debug
-      logger.debug request.raw_post
-      logger.debug node
+    assert_method :put

 
 

-      if node
-        node.version = 0
-        #node.changeset_id = node.changeset
-        node.visible = true
-        node.save_with_history!
+    node = Node.from_xml(request.raw_post, true)

 
 

-        render :text => node.id.to_s, :content_type => "text/plain"
-      else
-        render :nothing => true, :status => :bad_request
-      end
+    if node
+      node.create_with_history @user
+      render :text => node.id.to_s, :content_type => "text/plain"

     else
     else

-      render :nothing => true, :status => :method_not_allowed
+      raise OSM::APIBadXMLError.new(:node, request.raw_post)

     end
   end
 
   # Dump the details on a node given in params[:id]
   def read
     end
   end
 
   # 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
+    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
   end
   
     end
   end
   

-  # Dump a specific version of the node based on the given params[:id] and params[:version]
-  def version
-    begin
-      node = Node.find(:first, :conditions => { :id => params[:id], :version => params[:version] } )
-      if node.visible
-        response.headers['Last-Modified'] = node.timestamp.rfc822
-        render :text => node.to_xml.to_s, :content_type => "text/xml"
-      else
-        render :nothing => true, :status => :gone
-      end
-    rescue ActiveRecord::RecordNotFound
-      render :nothing => true, :status => :not_found
-    end
-  end
-

   # Update a node from given XML
   def update
   # Update a node from given XML
   def update

-    begin
-      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
-      end
-    rescue OSM::APIVersionMismatchError => ex
-      render :text => "Version mismatch: Provided " + ex.provided.to_s +
-        ", server had: " + ex.latest.to_s, :status => :bad_request
-    rescue ActiveRecord::RecordNotFound
-      render :nothing => true, :status => :not_found
+    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

     end
   end
 
     end
   end
 

-  # Delete a node. Doesn't actually delete it, but retains its history in a wiki-like way.
-  # FIXME remove all the fricking SQL
+  # 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
   def delete

-    begin
-      node = Node.find(params[:id])
-      new_node = Node.from_xml(request.raw_post)
-      # FIXME we no longer care about the user, (or maybe we want to check
-      # that the user of the changeset is the same user as is making this
-      # little change?) we really care about the 
-      # changeset which must be open, and that the version that we have been
-      # given is the one that is currently stored in the database
-      
-      if new_node and new_node.id == node.id
-        node.delete_with_history(new_node, @user)
-        render :nothing => true, :status => :success
-      else
-        render :nothing => true, :status => :bad_request
-      end
-    rescue ActiveRecord::RecordNotFound
-      render :nothing => true, :status => :not_found
-    rescue OSM::APIError => ex
-      render ex.render_opts
+    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

     end
   end
 
     end
   end
 

-  # WTF does this do?
+  # 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 }
 
   def nodes
     ids = params['nodes'].split(',').collect { |n| n.to_i }