Add :warning and :error flash messages which can be styled separately to

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

diff --git a/app/controllers/old_relation_controller.rb b/app/controllers/old_relation_controller.rb
index f8ebbd070be3609901aeed5c7cc0cf60dc441763..eb274c4de32bf2e7c0e0b8dd8e7ba9ab13e9295e 100644 (file)
--- a/app/controllers/old_relation_controller.rb
+++ b/app/controllers/old_relation_controller.rb
@@ -1,41 +1,34 @@
 class OldRelationController < 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
-      relation = Relation.find(params[:id])
-      doc = OSM::API.new.get_xml_doc
-
-      relation.old_relations.each do |old_relation|
-        doc.root << old_relation.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
+    relation = Relation.find(params[:id])
+    doc = OSM::API.new.get_xml_doc
+    
+    relation.old_relations.each do |old_relation|
+      doc.root << old_relation.to_xml_node
     end
+    
+    render :text => doc.to_s, :content_type => "text/xml"
   end
   
   def version
-    begin
-      old_relation = OldRelation.find(:first, :conditions => {:id => params[:id], :version => params[:version]} )
-      
-      response.headers['Last-Modified'] = old_relation.timestamp.rfc822
-
-      doc = OSM::API.new.get_xml_doc
-      doc.root << old_relation.to_xml_node
-
-      render :text => doc.to_s, :content_type => "text/xml"
-    rescue ActiveRecord::RecordNotFound
+    old_relation = OldRelation.find(:first, :conditions => {:id => params[:id], :version => params[:version]} )
+    if old_relation.nil?
+      # (RecordNotFound is not raised with find :first...)
       render :nothing => true, :status => :not_found
-    rescue
-      render :nothing => true, :status => :internetal_service_error
+      return
     end
+    
+    response.headers['Last-Modified'] = old_relation.timestamp.rfc822
+    
+    doc = OSM::API.new.get_xml_doc
+    doc.root << old_relation.to_xml_node
+    
+    render :text => doc.to_s, :content_type => "text/xml"
   end
 end