Merge branch 'jfire2' into routing

[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 19b4e5d3490db60cd2a825242e1f38930648cd8a..0cb3b2747e2e76e781a1e217d1b474c13d2a2c14 100644 (file)
--- a/app/controllers/old_relation_controller.rb
+++ b/app/controllers/old_relation_controller.rb
@@ -1,32 +1,12 @@
-class OldRelationController < ApplicationController
-  require 'xml/libxml'
+class OldRelationController < OldController
 
-  skip_before_filter :verify_authenticity_token
-  before_filter :check_api_readable
-  after_filter :compress_output
-  around_filter :api_call_handle_error, :api_call_timeout
-
-  def history
-    relation = Relation.find(params[:id])
-    doc = OSM::API.new.get_xml_doc
-    
-    relation.old_relations.each do |old_relation|
-      doc.root << old_relation.to_xml_node
-    end
-    
-    render :text => doc.to_s, :content_type => "text/xml"
-  end
+  private
   
-  def version
-    if old_relation = OldRelation.where(:relation_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
+  def lookup_old_element
+    @old_element = OldRelation.find([params[:id], params[:version]])
+  end
 
-      render :text => doc.to_s, :content_type => "text/xml"
-    else
-      render :nothing => true, :status => :not_found
-    end
+  def lookup_old_element_versions
+    @elements = OldRelation.where(:relation_id => params[:id]).order(:version)
   end
 end