Add a global timeout that is applied to most API requests.

[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 451ddf4ea0ba9256c74213956703799e444999d9..1e3546a0d0f09b3bdf6e25b6de67ae6a0952cb83 100644 (file)
--- a/app/controllers/old_way_controller.rb
+++ b/app/controllers/old_way_controller.rb
@@ -1,21 +1,36 @@
 class OldWayController < ApplicationController
+  require 'xml/libxml'
+
+  session :off
+  before_filter :check_api_readable
+  after_filter :compress_output
+  around_filter :api_call_handle_error, :api_call_timeout
+
   def history
-    response.headers["Content-Type"] = 'text/xml'
     way = Way.find(params[:id])
-
-    unless way
-      render :nothing => true, :staus => 404
-      return
-    end
     
-    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
-
-    render :text => doc.to_s
+    
+    render :text => doc.to_s, :content_type => "text/xml"
+  end
+  
+  def version
+    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"
   end
-
-
 end