X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6c66507427961a22a8f282b5b2f4ab7fda1dad6f..a2cf9b5b9f568c614ad8bbf8a477326b01cefb57:/app/controllers/old_relation_controller.rb?ds=sidebyside diff --git a/app/controllers/old_relation_controller.rb b/app/controllers/old_relation_controller.rb index 65de83278..78eca324c 100644 --- a/app/controllers/old_relation_controller.rb +++ b/app/controllers/old_relation_controller.rb @@ -1,44 +1,11 @@ -class OldRelationController < ApplicationController - require 'xml/libxml' +class OldRelationController < OldController + private - session :off - before_filter :check_api_readable - after_filter :compress_output - - 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 - end + def lookup_old_element + @old_element = OldRelation.find([params[:id], params[:version]]) end - - def version - begin - 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 - 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" - rescue - render :nothing => true, :status => :internal_server_error - end + def lookup_old_element_versions + @elements = OldRelation.where(:relation_id => params[:id]).order(:version) end end