From d3dc9733760e0ca127abee57cfe1d017429e423e Mon Sep 17 00:00:00 2001 From: Shaun McDonald Date: Wed, 14 Jan 2009 00:17:42 +0000 Subject: [PATCH] Move the ActiveRecord::RecordNotFound to the block, so that it catches the not found in line 327, when a nonexistant way id is searched for. --- app/controllers/amf_controller.rb | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb index ecc291e69..4103ceda0 100644 --- a/app/controllers/amf_controller.rb +++ b/app/controllers/amf_controller.rb @@ -344,18 +344,16 @@ class AmfController < ApplicationController RAILS_DEFAULT_LOGGER.info("** revision dates: #{revdates.inspect}") RAILS_DEFAULT_LOGGER.info("** range: #{revdates[-1]-revdates[0]}") - 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 - - return ['way',wayid,history] - rescue ActiveRecord::RecordNotFound - return ['way', wayid, []] + 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 + + return ['way',wayid,history] + rescue ActiveRecord::RecordNotFound + return ['way', wayid, []] end # Find history of a node. Returns 'node', id, and -- 2.43.2