Ensure :not_found status is returned, catching RecordNotFound doesn't work as isnt...

[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 8c43941ec61b0404634da02a834fe59d0281328a..2590fd24aefbac64035b0e31e7c04dfa76de1612 100644 (file)
--- a/app/controllers/old_node_controller.rb
+++ b/app/controllers/old_node_controller.rb
@@ -2,7 +2,7 @@ class OldNodeController < ApplicationController
   require 'xml/libxml'
 
   session :off
-  before_filter :check_read_availability
+  before_filter :check_api_readable
   after_filter :compress_output
 
   def history
@@ -26,13 +26,18 @@ class OldNodeController < ApplicationController
   def version
     begin
       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"
-    rescue ActiveRecord::RecordNotFound
-      render :nothing => true, :status => :not_found
     rescue
       render :nothing => true, :status => :internal_server_error
     end