Don't reset the session when the token refers to an invalid user

[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..3836d4ab7c5167f8675d7c11db003521bb69c2d8 100644 (file)
--- a/app/controllers/old_way_controller.rb
+++ b/app/controllers/old_way_controller.rb
@@ -1,23 +1,33 @@
 class OldWayController < ApplicationController
   require 'xml/libxml'
 
 class OldWayController < ApplicationController
   require 'xml/libxml'
 

+  skip_before_filter :verify_authenticity_token
+  before_filter :check_api_readable

   after_filter :compress_output
   after_filter :compress_output

+  around_filter :api_call_handle_error, :api_call_timeout

 
   def history
 
   def history

-    begin
-      way = Way.find(params[:id])
+    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
+    
+    render :text => doc.to_s, :content_type => "text/xml"
+  end
+  
+  def version
+    if old_way = OldWay.where(:way_id => params[:id], :version => params[:version]).first
+      response.last_modified = old_way.timestamp

 
 

-      way.old_ways.each do |old_way|
-        doc.root << old_way.to_xml_node
-     end
+      doc = OSM::API.new.get_xml_doc
+      doc.root << old_way.to_xml_node

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

-    rescue ActiveRecord::RecordNotFound
+    else

       render :nothing => true, :status => :not_found
       render :nothing => true, :status => :not_found

-    rescue
-      render :nothing => true, :status => :internal_server_error

     end
   end
 end
     end
   end
 end