Merge branch 'master' of git://git.openstreetmap.org/rails into openID

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

diff --git a/app/controllers/old_node_controller.rb b/app/controllers/old_node_controller.rb
index 56397625c967490fdd1b365e664bb94588ede6a7..c20dacf4800620f851577e6d146fe2d8fb5d4bde 100644 (file)
--- a/app/controllers/old_node_controller.rb
+++ b/app/controllers/old_node_controller.rb
@@ -1,42 +1,35 @@
 class OldNodeController < ApplicationController
   require 'xml/libxml'
 
 class OldNodeController < ApplicationController
   require 'xml/libxml'
 

-  session :off
-  before_filter :check_read_availability
+  before_filter :check_api_readable

   after_filter :compress_output
   after_filter :compress_output

+  around_filter :api_call_handle_error, :api_call_timeout

 
   def history
 
   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
     end

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

   end
   
   def version
   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
       render :nothing => true, :status => :not_found

-    rescue
-      render :nothing => true, :status => :internal_server_error
+      return

     end
     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
   end
 end