Merge branch 'master' into moderation

[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 6131c9c3fac36f0a019f27ff197c5c41cc10abc8..1daab997ae2c4f72899e9d9276df89880d1af423 100644 (file)
--- a/app/controllers/old_way_controller.rb
+++ b/app/controllers/old_way_controller.rb
@@ -1,36 +1,11 @@
-class OldWayController < ApplicationController
-  require 'xml/libxml'
+class OldWayController < OldController
+  private
 
-  session :off
-  before_filter :check_api_readable
-  after_filter :compress_output
-  around_filter :api_call_handle_error
-
-  def history
-    way = Way.find(params[:id])
-    
-    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"
+  def lookup_old_element
+    @old_element = OldWay.find([params[:id], params[:version]])
   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"
+
+  def lookup_old_element_versions
+    @elements = OldWay.where(:way_id => params[:id]).order(:version)
   end
 end