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 5734fefd7017c4fd8bb0cd7d79fd30dd560d32e9..c20dacf4800620f851577e6d146fe2d8fb5d4bde 100644 (file)
--- a/app/controllers/old_node_controller.rb
+++ b/app/controllers/old_node_controller.rb
@@ -1,21 +1,35 @@
 class OldNodeController < ApplicationController
   require 'xml/libxml'
 
-  def history
-    begin
-      node = Node.find(params[:id])
-
-      doc = OSM::API.new.get_xml_doc
+  before_filter :check_api_readable
+  after_filter :compress_output
+  around_filter :api_call_handle_error, :api_call_timeout
 
-      node.old_nodes.each do |old_node|
-        doc.root << old_node.to_xml_node
-      end
-
-      render :text => doc.to_s, :content_type => "text/xml"
-    rescue ActiveRecord::RecordNotFound
+  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"
+  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
-    rescue
-      render :nothing => true, :status => :internal_server_error
+      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