strip out any control characters before writing to the db

[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 99e0b5675497a09224044bedfd6433c4b4200f26..5734fefd7017c4fd8bb0cd7d79fd30dd560d32e9 100644 (file)
--- a/app/controllers/old_node_controller.rb
+++ b/app/controllers/old_node_controller.rb
@@ -1,22 +1,21 @@
 class OldNodeController < ApplicationController
+  require 'xml/libxml'
 
   def history
-    response.headers["Content-Type"] = 'application/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 = 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