Make passwords with a colon in them work.

[rails.git] / app / controllers / old_segment_controller.rb

diff --git a/app/controllers/old_segment_controller.rb b/app/controllers/old_segment_controller.rb
index 1f64987ed6402f9647ad01bf7f14984cf775741b..5d11ec906b24e8dc3c4558433ca3f04c574aae73 100644 (file)
--- a/app/controllers/old_segment_controller.rb
+++ b/app/controllers/old_segment_controller.rb
@@ -1,20 +1,21 @@
 class OldSegmentController < ApplicationController
+  require 'xml/libxml'
 
   def history
-    response.headers["Content-Type"] = 'text/xml'
-    segment = Segment.find(params[:id])
+    begin
+      segment = Segment.find(params[:id])
 
-    unless segment
-      render :nothing => true, :staus => 404
-      return
-    end
+      doc = OSM::API.new.get_xml_doc
 
-    doc = OSM::API.new.get_xml_doc
+      segment.old_segments.each do |old_segment|
+        doc.root << old_segment.to_xml_node
+      end
 
-    segment.old_segments.each do |old_segment|
-      doc.root << old_segment.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