Merge 8377:8381 from trunk.

[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 d8a833b1da7de86e3045212a9b19d1a5d04228c9..e27898336361832ed193c9d1b3c8de04ddb14a41 100644 (file)
--- a/app/controllers/old_node_controller.rb
+++ b/app/controllers/old_node_controller.rb
@@ -1,22 +1,25 @@
 class OldNodeController < ApplicationController
+  require 'xml/libxml'
+
+  session :off
+  before_filter :check_read_availability
+  after_filter :compress_output
 
   def history
-    response.headers["Content-Type"] = 'text/xml'
-    node = Node.find(params[:id])
+    begin
+      node = Node.find(params[:id])
 
-    unless node
-      render :nothing => true, :staus => 404
-      return
-    end
+      doc = OSM::API.new.get_xml_doc
 
-    doc = OSM::API.new.get_xml_doc
+      node.old_nodes.each do |old_node|
+        doc.root << old_node.to_xml_node
+      end
 
-    node.old_nodes.each do |old_node|
-      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
-
-    render :text => doc.to_s
   end
-
-
 end