Update Potlatch 2 to r24483 build

[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 2c0cca9bbbddc86ad573c5893575da0bd702d234..c20dacf4800620f851577e6d146fe2d8fb5d4bde 100644 (file)
--- a/app/controllers/old_node_controller.rb
+++ b/app/controllers/old_node_controller.rb
@@ -1,22 +1,35 @@
 class OldNodeController < ApplicationController
+  require 'xml/libxml'
+
+  before_filter :check_api_readable
+  after_filter :compress_output
+  around_filter :api_call_handle_error, :api_call_timeout
 
   def history
-    response.headers["Content-Type"] = 'application/xml'
     node = Node.find(params[:id])
-
-    unless node
-      render :nothing => true, :staus => 404
-      return
-    end
-
+    
     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
+    
+    render :text => doc.to_s, :content_type => "text/xml"
   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"
+  end
 end