Update ActiveRecord queries to use arel

[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 3d913c0f7660ce49b86a251bf3a19ccc4918d229..ac1c6cd40805056ae377fefd9517ec960e55c603 100644 (file)
--- a/app/controllers/old_way_controller.rb
+++ b/app/controllers/old_way_controller.rb
@@ -1,25 +1,32 @@
 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
-    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(:id => params[:id], :version => params[:version]).first
+      response.headers['Last-Modified'] = old_way.timestamp.rfc822
 
-      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"
-    rescue ActiveRecord::RecordNotFound
+    else
       render :nothing => true, :status => :not_found
-    rescue
-      render :nothing => true, :status => :internal_server_error
     end
   end
 end