Merge remote-tracking branch 'openstreetmap/pull/1045'

[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 9307ee1ce4a8c61b5d6d29bd08f09dda14893f47..78eca324cb4cb819e0450f089b179de947b074f3 100644 (file)
--- a/app/controllers/old_relation_controller.rb
+++ b/app/controllers/old_relation_controller.rb
@@ -1,39 +1,11 @@
-class OldRelationController < ApplicationController
-  require 'xml/libxml'
+class OldRelationController < OldController
+  private
 
-  session :off
-  before_filter :check_read_availability
-  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]} )
-
-      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
-      render :nothing => true, :status => :not_found
-    rescue
-      render :nothing => true, :status => :internetal_service_error
-    end
+  def lookup_old_element_versions
+    @elements = OldRelation.where(:relation_id => params[:id]).order(:version)
   end
 end