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

[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 5de39fdb60a1f5ddb45a125b36c4b83e1749518c..a32e299fe6a2481833b901fd3995ceec475809d5 100644 (file)
--- a/app/controllers/old_node_controller.rb
+++ b/app/controllers/old_node_controller.rb
@@ -1,36 +1,11 @@
-class OldNodeController < ApplicationController
-  require 'xml/libxml'
+class OldNodeController < OldController
+  private
 
-  session :off
-  before_filter :check_api_readable
-  after_filter :compress_output
-  around_filter :api_call_handle_error, :api_call_timeout
-
-  def history
-    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
-    
-    render :text => doc.to_s, :content_type => "text/xml"
+  def lookup_old_element
+    @old_element = OldNode.find([params[:id], params[:version]])
   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...)
-      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"
+  def lookup_old_element_versions
+    @elements = OldNode.where(:node_id => params[:id]).order(:version)
   end
 end