Use last_modified method instead of setting the header manually

[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 0337cb2cffcec604e26f7090eff565234680c998..514e5befe9198a15d1709ab020ffb9325144613e 100644 (file)
--- a/app/controllers/old_node_controller.rb
+++ b/app/controllers/old_node_controller.rb
@@ -1,24 +1,32 @@
 class OldNodeController < ApplicationController
   require 'xml/libxml'
 
-  session :off
+  before_filter :check_api_readable
   after_filter :compress_output
+  around_filter :api_call_handle_error, :api_call_timeout
 
   def history
-    begin
-      node = Node.find(params[:id])
+    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
+    if old_node = OldNode.where(:id => params[:id], :version => params[:version]).first
+      response.last_modified = old_node.timestamp
 
       doc = OSM::API.new.get_xml_doc
-
-      node.old_nodes.each do |old_node|
-        doc.root << old_node.to_xml_node
-      end
+      doc.root << old_node.to_xml_node
 
       render :text => doc.to_s, :content_type => "text/xml"
-    rescue ActiveRecord::RecordNotFound
+    else
       render :nothing => true, :status => :not_found
-    rescue
-      render :nothing => true, :status => :internal_server_error
     end
   end
 end