Merge 14059:14394 from trunk.

[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 a253e3e2051f4984e034622060c77af56cc117e7..da4e26d67be706e07aebd6297b38838ce73f7813 100644 (file)
--- a/app/controllers/old_way_controller.rb
+++ b/app/controllers/old_way_controller.rb
@@ -1,21 +1,42 @@
 class OldWayController < ApplicationController
-  def history
-    response.headers["Content-Type"] = 'text/xml'
-    way = Way.find(params[:id])
+  require 'xml/libxml'
 
-    unless way
-      render :nothing => true, :staus => 404
-      return
-    end
+  session :off
+  before_filter :check_read_availability
+  after_filter :compress_output
+
+  def history
+    begin
+      way = Way.find(params[:id])
     
-    doc = OSM::API.new.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|
+      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
+  
+  def version
+    begin
+      old_way = OldWay.find(:first, :conditions => {:id => params[:id], :version => params[:version]} )
+      
+      response.headers['Last-Modified'] = old_way.timestamp.rfc822
+      
+      doc = OSM::API.new.get_xml_doc
       doc.root << old_way.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