From a87b26751513e5b23f23660ceb1cc0ffe65a1e4d Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Mon, 28 Feb 2011 13:47:53 +0000 Subject: [PATCH] 4694: Tools->Utilities->Verify the Data->crash svn: r16727 --- src/plugins/tool/Verify.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/plugins/tool/Verify.py b/src/plugins/tool/Verify.py index bf08a6d27..f59b82d53 100644 --- a/src/plugins/tool/Verify.py +++ b/src/plugins/tool/Verify.py @@ -118,21 +118,25 @@ def get_date_from_event_handle(db,event_handle): if not event_handle: return 0 event = find_event(db,event_handle) - date_obj = event.get_date_object() - if date_obj.get_day() == 0 or date_obj.get_month() == 0: + if event: + date_obj = event.get_date_object() + if date_obj.get_day() == 0 or date_obj.get_month() == 0: + return 0 + return date_obj.get_sort_value() + else: return 0 - return date_obj.get_sort_value() def get_date_from_event_type(db,person,event_type): if not person: return 0 for event_ref in person.get_event_ref_list(): event = find_event(db,event_ref.ref) - if event.get_type() == event_type: - date_obj = event.get_date_object() - if date_obj.get_day() == 0 or date_obj.get_month() == 0: - return 0 - return date_obj.get_sort_value() + if event: + if event.get_type() == event_type: + date_obj = event.get_date_object() + if date_obj.get_day() == 0 or date_obj.get_month() == 0: + return 0 + return date_obj.get_sort_value() return 0 def get_bapt_date(db,person): @@ -142,7 +146,7 @@ def get_bury_date(db,person): # check role on burial event for event_ref in person.get_event_ref_list(): event = find_event(db, event_ref.ref) - if event.get_type() == gen.lib.EventType.BURIAL and \ + if event and event.get_type() == gen.lib.EventType.BURIAL and \ event_ref.get_role() == gen.lib.EventRoleType.PRIMARY: return get_date_from_event_type(db,person,gen.lib.EventType.BURIAL)