amf get*_history tests and related fixes

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

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index 0e77c11f7c0adfcefe117e91414c93ec1623943c..d04166aea8bd34e9882a23f296ae78ec2a6b20d2 100644 (file)
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -61,6 +61,7 @@ class AmfController < ApplicationController
          index=AMF.getstring(req)                              #  | get index in response sequence
          bytes=AMF.getlong(req)                                #  | get total size in bytes
          args=AMF.getvalue(req)                                #  | get response (probably an array)
+      logger.info "Executing AMF #{message}:#{index}"
 
          case message
                when 'getpresets';                      results[index]=AMF.putdata(index,getpresets())
@@ -75,6 +76,7 @@ class AmfController < ApplicationController
                when 'getpoi';                          results[index]=AMF.putdata(index,getpoi(*args))
          end
        end
+    logger.info("encoding AMF results")
     sendresponse(results)
   end
 
@@ -218,49 +220,62 @@ class AmfController < ApplicationController
 
   # Get an old version of a way, and all constituent nodes.
   #
-  # For undelete (version=0), always uses the most recent version of each node, 
-  # even if it's moved.  For revert (version=1+), uses the node in existence 
+  # For undelete (version<0), always uses the most recent version of each node, 
+  # even if it's moved.  For revert (version >= 0), uses the node in existence 
   # at the time, generating a new id if it's still visible and has been moved/
   # retagged.
 
   def getway_old(id, version) #:doc:
        if version < 0
          old_way = OldWay.find(:first, :conditions => ['visible = ? AND id = ?', true, id], :order => 'version DESC')
-         points = old_way.get_nodes_undelete
+         points = old_way.get_nodes_undelete unless old_way.nil?
        else
          old_way = OldWay.find(:first, :conditions => ['id = ? AND version = ?', id, version])
-         points = old_way.get_nodes_revert
+         points = old_way.get_nodes_revert unless old_way.nil?
        end
 
-       old_way.tags['history'] = "Retrieved from v#{old_way.version}"
-
-       [0, id, points, old_way.tags, old_way.version]
+    if old_way.nil?
+      return [0, id, [], {}, -1]
+    else
+         old_way.tags['history'] = "Retrieved from v#{old_way.version}"
+         return [0, id, points, old_way.tags, old_way.version]
+    end
   end
   
   # Find history of a way. Returns 'way', id, and 
   # an array of previous versions.
 
   def getway_history(wayid) #:doc:
-       history = Way.find(wayid).old_ways.reverse.collect do |old_way|
-         user = old_way.user.data_public? ? old_way.user.display_name : 'anonymous'
-         uid  = old_way.user.data_public? ? old_way.user.id : 0
-         [old_way.version, old_way.timestamp.strftime("%d %b %Y, %H:%M"), old_way.visible ? 1 : 0, user, uid]
-       end
+    begin
+         history = Way.find(wayid).old_ways.reverse.collect do |old_way|
+        user_object = old_way.changeset.user
+           user = user_object.data_public? ? user_object.display_name : 'anonymous'
+           uid  = user_object.data_public? ? user_object.id : 0
+           [old_way.version, old_way.timestamp.strftime("%d %b %Y, %H:%M"), old_way.visible ? 1 : 0, user, uid]
+         end
 
-       ['way',wayid,history]
+         return ['way',wayid,history]
+    rescue ActiveRecord::RecordNotFound
+      return ['way', wayid, []]
+    end
   end
 
   # Find history of a node. Returns 'node', id, and 
   # an array of previous versions.
 
   def getnode_history(nodeid) #:doc:
-       history = Node.find(nodeid).old_nodes.reverse.collect do |old_node|
-         user = old_node.user.data_public? ? old_node.user.display_name : 'anonymous'
-         uid  = old_node.user.data_public? ? old_node.user.id : 0
-         [old_node.timestamp.to_i, old_node.timestamp.strftime("%d %b %Y, %H:%M"), old_node.visible ? 1 : 0, user, uid]
-       end
+    begin
+         history = Node.find(nodeid).old_nodes.reverse.collect do |old_node|
+        user_object = old_node.changeset.user
+           user = user_object.data_public? ? user_object.display_name : 'anonymous'
+           uid  = user_object.data_public? ? user_object.id : 0
+           [old_node.timestamp.to_i, old_node.timestamp.strftime("%d %b %Y, %H:%M"), old_node.visible ? 1 : 0, user, uid]
+         end
 
-       ['node',nodeid,history]
+         return ['node',nodeid,history]
+    rescue ActiveRecord::RecordNotFound
+      return ['node', nodeid, []]
+    end
   end
 
   # Get a relation with all tags and members.