X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/70ecb3ceefbbc84267bbb8cdbeec3e2f7ad861c3..ebd109c946d71b3ccc616ea3966e56ae019638d7:/app/controllers/old_way_controller.rb

diff --git a/app/controllers/old_way_controller.rb b/app/controllers/old_way_controller.rb
index da4e26d67..96c88d492 100644
--- a/app/controllers/old_way_controller.rb
+++ b/app/controllers/old_way_controller.rb
@@ -1,42 +1,35 @@
 class OldWayController < ApplicationController
   require 'xml/libxml'
 
-  session :off
-  before_filter :check_read_availability
+  before_filter :check_api_readable
   after_filter :compress_output
+  around_filter :api_call_handle_error, :api_call_timeout
 
   def history
-    begin
-      way = Way.find(params[:id])
+    way = Way.find(params[:id])
     
-      doc = OSM::API.new.get_xml_doc
-
-      way.old_ways.each do |old_way|
-        doc.root << old_way.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
+    doc = OSM::API.new.get_xml_doc
+    
+    way.old_ways.each do |old_way|
+      doc.root << old_way.to_xml_node
     end
+    
+    render :text => doc.to_s, :content_type => "text/xml"
   end
   
   def version
-    begin
-      old_way = OldWay.find(:first, :conditions => {:id => params[:id], :version => params[:version]} )
-      
-      response.headers['Last-Modified'] = old_way.timestamp.rfc822
-      
-      doc = OSM::API.new.get_xml_doc
-      doc.root << old_way.to_xml_node
-      
-      render :text => doc.to_s, :content_type => "text/xml"
-    rescue ActiveRecord::RecordNotFound
+    old_way = OldWay.find(:first, :conditions => {:id => params[:id], :version => params[:version]} )
+    if old_way.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_way.timestamp.rfc822
+    
+    doc = OSM::API.new.get_xml_doc
+    doc.root << old_way.to_xml_node
+    
+    render :text => doc.to_s, :content_type => "text/xml"
   end
 end