Improve consistency of trace upload forms and error handling.

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

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index f2a3ce3291cd48e2f7203d5457eb742fbb150a4e..0a3897fe9986da7318dafd557c84949a91b8020e 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -1,107 +1,105 @@
 class NodeController < ApplicationController
   require 'xml/libxml'
 
 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
 
   def create
   after_filter :compress_output
 
   def create

-    response.headers["Content-Type"] = 'text/xml'

     if request.put?
       node = Node.from_xml(request.raw_post, true)
 
       if node
         node.user_id = @user.id
     if request.put?
       node = Node.from_xml(request.raw_post, true)
 
       if node
         node.user_id = @user.id

-        node.visible = 1
-        if node.save_with_history
-          render :text => node.id.to_s
-        else
-          render :nothing => true, :status => 500
-        end
-        return
+        node.visible = true
+        node.save_with_history!

 
 

+        render :text => node.id.to_s, :content_type => "text/plain"

       else
       else

-        render :nothing => true, :status => 400 # if we got here the doc didnt parse
-        return
+        render :nothing => true, :status => :bad_request

       end
       end

+    else
+      render :nothing => true, :status => :method_not_allowed

     end
     end

-
-    render :nothing => true, :status => 500 # something went very wrong

   end
 
   end
 

-  def rest
-    response.headers["Content-Type"] = 'text/xml'
-    unless Node.exists?(params[:id])
-      render :nothing => true, :status => 404
-      return
+  def read
+    begin
+      node = Node.find(params[:id])
+
+      if node.visible
+        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

+  end

 
 

-    node = Node.find(params[:id])
+  def update
+    begin
+      node = Node.find(params[:id])

 
 

-    case request.method
+      if node.visible
+        new_node = Node.from_xml(request.raw_post)

 
 

-    when :get
-      unless node
-        render :nothing => true, :status => 500
-        return
-      end
+        if new_node and new_node.id == node.id
+          node.user_id = @user.id
+          node.latitude = new_node.latitude 
+          node.longitude = new_node.longitude
+          node.tags = new_node.tags
+          node.save_with_history!

 
 

-      unless node.visible
-        render :nothing => true, :status => 410
-        return
+          render :nothing => true
+        else
+          render :nothing => true, :status => :bad_request
+        end
+      else
+        render :nothing => true, :status => :gone

       end
       end

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

 
 

-      render :text => node.to_xml.to_s
-      return
+  def delete
+    begin
+      node = Node.find(params[:id])

 
 

-    when :delete

       if node.visible
         if Segment.find(:first, :conditions => [ "visible = 1 and (node_a = ? or node_b = ?)", node.id, node.id])
       if node.visible
         if Segment.find(:first, :conditions => [ "visible = 1 and (node_a = ? or node_b = ?)", node.id, node.id])

-          render :nothing => true, :status => HTTP_PRECONDITION_FAILED
+          render :nothing => true, :status => :precondition_failed

         else
         else

+          node.user_id = @user.id

           node.visible = 0
           node.visible = 0

-          node.save_with_history
-          render :nothing => true
-        end
-      else
-        render :nothing => true, :status => 410
-      end
-
-    when :put
-      new_node = Node.from_xml(request.raw_post)
-
-      if new_node
-        node.timestamp = Time.now
-        node.user_id = @user.id
-
-        node.latitude = new_node.latitude 
-        node.longitude = new_node.longitude
-        node.tags = new_node.tags
+          node.save_with_history!

 
 

-        if node.id == new_node.id and node.save_with_history

           render :nothing => true
           render :nothing => true

-        else
-          render :nothing => true, :status => 500

         end
       else
         end
       else

-        render :nothing => true, :status => 400 # if we got here the doc didnt parse
+        render :nothing => true, :status => :gone

       end
       end

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

     end
     end

-

   end
 
   def nodes
   end
 
   def nodes

-    response.headers["Content-Type"] = 'text/xml'
-    ids = params['nodes'].split(',').collect {|n| n.to_i }
+    ids = params['nodes'].split(',').collect { |n| n.to_i }
+

     if ids.length > 0
     if ids.length > 0

-      nodelist = Node.find(ids)
-      doc = get_xml_doc
-      nodelist.each do |node|
+      doc = OSM::API.new.get_xml_doc
+
+      Node.find(ids).each do |node|

         doc.root << node.to_xml_node
       end 
         doc.root << node.to_xml_node
       end 

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

     else
     else

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

     end
   end
 end
     end
   end
 end