Merge remote-tracking branch 'upstream/pull/1707'

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

diff --git a/app/controllers/old_node_controller.rb b/app/controllers/old_node_controller.rb
index 5734fefd7017c4fd8bb0cd7d79fd30dd560d32e9..a32e299fe6a2481833b901fd3995ceec475809d5 100644 (file)
--- a/app/controllers/old_node_controller.rb
+++ b/app/controllers/old_node_controller.rb
@@ -1,21 +1,11 @@
-class OldNodeController < ApplicationController
-  require 'xml/libxml'
+class OldNodeController < OldController
+  private
 
-  def history
-    begin
-      node = Node.find(params[:id])
-
-      doc = OSM::API.new.get_xml_doc
-
-      node.old_nodes.each do |old_node|
-        doc.root << old_node.to_xml_node
-      end
+  def lookup_old_element
+    @old_element = OldNode.find([params[:id], params[:version]])
+  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_versions
+    @elements = OldNode.where(:node_id => params[:id]).order(:version)
   end
 end