X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5449cf4adcc1fad4b9f43426e6d3e4a8f65e6fbb..e37a9ec0b52ead11543660ca45fee33c7f7bb1d7:/app/controllers/old_node_controller.rb?ds=sidebyside

diff --git a/app/controllers/old_node_controller.rb b/app/controllers/old_node_controller.rb
index 0976a0c9a..c20dacf48 100644
--- a/app/controllers/old_node_controller.rb
+++ b/app/controllers/old_node_controller.rb
@@ -1,42 +1,35 @@
 class OldNodeController < ApplicationController
   require 'xml/libxml'
 
-  session :off
   before_filter :check_api_readable
   after_filter :compress_output
+  around_filter :api_call_handle_error, :api_call_timeout
 
   def history
-    begin
-      node = Node.find(params[:id])
-
-      doc = OSM::API.new.get_xml_doc
-
-      node.old_nodes.each do |old_node|
-        doc.root << old_node.to_xml_node
-      end
-
-      render :text => doc.to_s, :content_type => "text/xml"
-    rescue ActiveRecord::RecordNotFound
-      render :nothing => true, :status => :not_found
-    rescue
-      render :nothing => true, :status => :internal_server_error
+    node = Node.find(params[:id])
+    
+    doc = OSM::API.new.get_xml_doc
+    
+    node.old_nodes.each do |old_node|
+      doc.root << old_node.to_xml_node
     end
+    
+    render :text => doc.to_s, :content_type => "text/xml"
   end
   
   def version
-    begin
-      old_node = OldNode.find(:first, :conditions => {:id => params[:id], :version => params[:version]} )
-      
-      response.headers['Last-Modified'] = old_node.timestamp.rfc822
-
-      doc = OSM::API.new.get_xml_doc
-      doc.root << old_node.to_xml_node
-
-      render :text => doc.to_s, :content_type => "text/xml"
-    rescue ActiveRecord::RecordNotFound
+    old_node = OldNode.find(:first, :conditions => {:id => params[:id], :version => params[:version]} )
+    if old_node.nil?
+      # (RecordNotFound is not raised with find :first...)
       render :nothing => true, :status => :not_found
-    rescue
-      render :nothing => true, :status => :internal_server_error
+      return
     end
+    
+    response.headers['Last-Modified'] = old_node.timestamp.rfc822
+    
+    doc = OSM::API.new.get_xml_doc
+    doc.root << old_node.to_xml_node
+
+    render :text => doc.to_s, :content_type => "text/xml"
   end
 end