Rework AMF controller's streaming output for rails 3

[rails.git] / app / controllers / old_relation_controller.rb

diff --git a/app/controllers/old_relation_controller.rb b/app/controllers/old_relation_controller.rb
index b98c9da4952b3a54840127e0ea454a0e0f70fe42..0e1950ceee6b2c83d54bcee2677e5b3c02abc42d 100644 (file)
--- a/app/controllers/old_relation_controller.rb
+++ b/app/controllers/old_relation_controller.rb
@@ -1,10 +1,9 @@
 class OldRelationController < ApplicationController
   require 'xml/libxml'
 
 class OldRelationController < ApplicationController
   require 'xml/libxml'
 

-  session :off

   before_filter :check_api_readable
   after_filter :compress_output
   before_filter :check_api_readable
   after_filter :compress_output

-  around_filter :api_call_handle_error
+  around_filter :api_call_handle_error, :api_call_timeout

 
   def history
     relation = Relation.find(params[:id])
 
   def history
     relation = Relation.find(params[:id])


@@ -18,18 +17,15 @@ class OldRelationController < ApplicationController
   end
   
   def version
   end
   
   def version

-    old_relation = OldRelation.find(:first, :conditions => {:id => params[:id], :version => params[:version]} )
-    if old_relation.nil?
-      # (RecordNotFound is not raised with find :first...)
+    if old_relation = OldRelation.where(:id => params[:id], :version => params[:version]).first
+      response.last_modified = old_relation.timestamp
+
+      doc = OSM::API.new.get_xml_doc
+      doc.root << old_relation.to_xml_node
+
+      render :text => doc.to_s, :content_type => "text/xml"
+    else

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

-      return

     end
     end

-    
-    response.headers['Last-Modified'] = old_relation.timestamp.rfc822
-    
-    doc = OSM::API.new.get_xml_doc
-    doc.root << old_relation.to_xml_node
-    
-    render :text => doc.to_s, :content_type => "text/xml"

   end
 end
   end
 end