Sort out storage and use of user preferred languages.

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

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index c03f3c4fbf26767135213e4e65c0d2b5de9f11fc..eeaba6199a9ad346970e0688e7bcd70907534045 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -5,61 +5,47 @@ 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

-    begin
-      if request.put?
-        node = Node.from_xml(request.raw_post, true)
+    assert_method :put

 
 

-        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
-        render :nothing => true, :status => :method_not_allowed
-      end
-    rescue OSM::APIError => ex
-      render ex.render_opts
+    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
   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
   
   # Update a node from given XML
   def update
     end
   end
   
   # 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::APIError => ex
-      render ex.render_opts
-    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
 


@@ -67,20 +53,14 @@ class NodeController < ApplicationController
   # in a wiki-like way. We therefore treat it like an update, so the delete
   # method returns the new version number.
   def delete
   # 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)
-      
-      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 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