Fixed error handling in the name search and tidied things up a bit.

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

diff --git a/app/controllers/old_way_controller.rb b/app/controllers/old_way_controller.rb
index 8eca507ef91b96c12aee0198debec05d24861f8c..6b0c9dd2ecd059adfa40c727499a5268bcbc6915 100644 (file)
--- a/app/controllers/old_way_controller.rb
+++ b/app/controllers/old_way_controller.rb
@@ -1,21 +1,21 @@
 class OldWayController < ApplicationController
 class OldWayController < ApplicationController

-  def history
-    response.headers["Content-Type"] = 'application/xml'
-    way = Way.find(params[:id])
+  require 'xml/libxml'

 
 

-    unless way
-      render :nothing => true, :staus => 404
-      return
-    end
+  def history
+    begin
+      way = Way.find(params[:id])

     
     

-    doc = get_xml_doc
+      doc = OSM::API.new.get_xml_doc

 
 

-    way.old_ways.each do |old_way|
-      doc.root << old_way.to_xml_node
-    end
+      way.old_ways.each do |old_way|
+        doc.root << old_way.to_xml_node
+     end

 
 

-    render :text => doc.to_s
+      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

   end
   end

-
-

 end
 end