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 a253e3e2051f4984e034622060c77af56cc117e7..ac1c6cd40805056ae377fefd9517ec960e55c603 100644 (file)
--- a/app/controllers/old_way_controller.rb
+++ b/app/controllers/old_way_controller.rb
@@ -1,21 +1,32 @@
 class OldWayController < ApplicationController
 class OldWayController < ApplicationController

+  require 'xml/libxml'
+
+  before_filter :check_api_readable
+  after_filter :compress_output
+  around_filter :api_call_handle_error, :api_call_timeout
+

   def history
   def history

-    response.headers["Content-Type"] = 'text/xml'

     way = Way.find(params[:id])
     way = Way.find(params[:id])

-
-    unless way
-      render :nothing => true, :staus => 404
-      return
-    end

     
     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
     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
   end

+  
+  def version
+    if old_way = OldWay.where(:id => params[:id], :version => params[:version]).first
+      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"
+    else
+      render :nothing => true, :status => :not_found
+    end
+  end

 end
 end