X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3d0ca940d26bdc23aa791178b01b816185c5a086..4408416b62a67bab980f9fdec3e4be04a7680039:/app/controllers/old_node_controller.rb diff --git a/app/controllers/old_node_controller.rb b/app/controllers/old_node_controller.rb index e57623dae..615213ac1 100644 --- a/app/controllers/old_node_controller.rb +++ b/app/controllers/old_node_controller.rb @@ -1,10 +1,10 @@ class OldNodeController < 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 + around_filter :api_call_handle_error, :api_call_timeout def history node = Node.find(params[:id]) @@ -19,18 +19,15 @@ class OldNodeController < ApplicationController end def version - old_node = OldNode.find(:first, :conditions => {:id => params[:id], :version => params[:version]} ) - if old_node.nil? - # (RecordNotFound is not raised with find :first...) + if old_node = OldNode.where(:node_id => params[:id], :version => params[:version]).first + response.last_modified = old_node.timestamp + + doc = OSM::API.new.get_xml_doc + doc.root << old_node.to_xml_node + + render :text => doc.to_s, :content_type => "text/xml" + else render :nothing => true, :status => :not_found - 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