X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/df8cd4a7b2c364864aad0e4d9f56c1a4f4f0e990..85d17f257c338f668a1d17d9fc62a2f48ec84230:/app/controllers/old_relation_controller.rb?ds=inline diff --git a/app/controllers/old_relation_controller.rb b/app/controllers/old_relation_controller.rb index f8751d27c..19b4e5d34 100644 --- a/app/controllers/old_relation_controller.rb +++ b/app/controllers/old_relation_controller.rb @@ -1,41 +1,32 @@ class OldRelationController < ApplicationController require 'xml/libxml' - session :off + skip_before_filter :verify_authenticity_token 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 + if old_relation = OldRelation.where(:relation_id => params[:id], :version => params[:version]).first + response.last_modified = old_relation.timestamp 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 + else render :nothing => true, :status => :not_found - rescue - render :nothing => true, :status => :internal_server_error end end end