The render method needs to be last, otherwise the error header won't get set. Needs...

[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 f10e0d2f0193e0550932e0d15396369fa2939f52..2f110321607e6d66225055a22d1a4ad05c1801b2 100644 (file)
--- a/app/controllers/old_way_controller.rb
+++ b/app/controllers/old_way_controller.rb
@@ -2,6 +2,7 @@ class OldWayController < ApplicationController
   require 'xml/libxml'
 
   session :off
   require 'xml/libxml'
 
   session :off

+  before_filter :check_api_readable

   after_filter :compress_output
 
   def history
   after_filter :compress_output
 
   def history


@@ -12,7 +13,7 @@ class OldWayController < ApplicationController
 
       way.old_ways.each do |old_way|
         doc.root << old_way.to_xml_node
 
       way.old_ways.each do |old_way|
         doc.root << old_way.to_xml_node

-     end
+      end

 
       render :text => doc.to_s, :content_type => "text/xml"
     rescue ActiveRecord::RecordNotFound
 
       render :text => doc.to_s, :content_type => "text/xml"
     rescue ActiveRecord::RecordNotFound


@@ -21,4 +22,24 @@ class OldWayController < ApplicationController
       render :nothing => true, :status => :internal_server_error
     end
   end
       render :nothing => true, :status => :internal_server_error
     end
   end

+  
+  def version
+    begin
+      old_way = OldWay.find(:first, :conditions => {:id => params[:id], :version => params[:version]} )
+      if old_way.nil?
+        # (RecordNotFound is not raised with find :first...)
+        render :nothing => true, :status => :not_found
+        return
+      end
+      
+      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
+      render :nothing => true, :status => :internal_server_error
+    end
+  end

 end
 end