cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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.

Browse source
This commit is contained in:
Shaun McDonald 2009-01-14 00:17:42 +00:00
parent 8e394b1625
commit d3dc973376
1 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/controllers/amf_controller.rb
View file

@ -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