cosmetic tweaks to 'login' and 'create account' screens

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

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index fa6759c3b5debb59e601a7bd519d401ac352dfd9..9763be5d46597e8fa5b868769010a53d6dc4708f 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -11,21 +11,21 @@ class NodeController < ApplicationController
 
   # 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)
-
-      if node
-        node.version = 0
-        node.user_id = @user.id
-        node.visible = true
-        node.save_with_history!
+    begin
+      if request.put?
+        node = Node.from_xml(request.raw_post, true)

 
 

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

       else
       else

-        render :nothing => true, :status => :bad_request
+        render :nothing => true, :status => :method_not_allowed

       end
       end

-    else
-      render :nothing => true, :status => :method_not_allowed
+    rescue OSM::APIError => ex
+      render ex.render_opts

     end
   end
 
     end
   end
 


@@ -33,7 +33,7 @@ class NodeController < ApplicationController
   def read
     begin
       node = Node.find(params[:id])
   def read
     begin
       node = Node.find(params[:id])

-      if node.visible
+      if node.visible?

         response.headers['Last-Modified'] = node.timestamp.rfc822
         render :text => node.to_xml.to_s, :content_type => "text/xml"
        else
         response.headers['Last-Modified'] = node.timestamp.rfc822
         render :text => node.to_xml.to_s, :content_type => "text/xml"
        else


@@ -43,16 +43,12 @@ class NodeController < ApplicationController
       render :nothing => true, :status => :not_found
     end
   end
       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)
   # 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.version != node.version
-        render :text => "Version mismatch: Provided " + new_node.version.to_s + ", server had: " + node.version.to_s, :status => :bad_request
-        return
-      end  

 
       if new_node and new_node.id == node.id
         node.update_from(new_node, @user)
 
       if new_node and new_node.id == node.id
         node.update_from(new_node, @user)


@@ -60,23 +56,31 @@ class NodeController < ApplicationController
       else
         render :nothing => true, :status => :bad_request
       end
       else
         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
 
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
     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
     begin
       node = Node.find(params[:id])
   def delete
     begin
       node = Node.find(params[:id])

-      node.delete_with_history(@user)
+      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

     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found

-    rescue OSM::APIAlreadyDeletedError
-      render :text => "", :status => :gone
-    rescue OSM::APIPreconditionFailedError
-      render :text => "", :status => :precondition_failed
+    rescue OSM::APIError => ex
+      render ex.render_opts

     end
   end
 
     end
   end