Return, rather than allow a second render to happen. Closes #1407

[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 16db86555363494a6024f0dfcfd983f1023b11b6..da4e26d67be706e07aebd6297b38838ce73f7813 100644 (file)
--- a/app/controllers/old_way_controller.rb
+++ b/app/controllers/old_way_controller.rb
@@ -1,6 +1,8 @@
 class OldWayController < ApplicationController
   require 'xml/libxml'
 
 class OldWayController < ApplicationController
   require 'xml/libxml'
 

+  session :off
+  before_filter :check_read_availability

   after_filter :compress_output
 
   def history
   after_filter :compress_output
 
   def history


@@ -11,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


@@ -20,4 +22,21 @@ 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]} )
+      
+      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
+  end

 end
 end