Use SecureRandom instead of the deprecated ActiveSupport::SecureRandom

[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 c20dacf4800620f851577e6d146fe2d8fb5d4bde..4a1253034ac90f49464b6d99f922e2c6e9cce921 100644 (file)
--- a/app/controllers/old_node_controller.rb
+++ b/app/controllers/old_node_controller.rb
@@ -18,18 +18,15 @@ class OldNodeController < ApplicationController
   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...)
+    if old_node = OldNode.where(:node_id => params[:id], :version => params[:version]).first
+      response.last_modified = old_node.timestamp
+
+      doc = OSM::API.new.get_xml_doc
+      doc.root << old_node.to_xml_node
+
+      render :text => doc.to_s, :content_type => "text/xml"
+    else
       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