Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Protection from null objects

Browse Source 
svn: r15507
This commit is contained in:
Doug Blank 2010-05-30 12:14:26 +00:00
parent 204c4e1d24
commit a6c702638f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Utils.py
View File

@ -513,9 +513,13 @@ class ProbablyAlive(object):
family_list = person.get_parent_family_handle_list() family_list = person.get_parent_family_handle_list()
for family_handle in family_list: for family_handle in family_list:
family = self.db.get_family_from_handle(family_handle) family = self.db.get_family_from_handle(family_handle)
if family is None:
continue
for child_ref in family.get_child_ref_list(): for child_ref in family.get_child_ref_list():
child_handle = child_ref.ref child_handle = child_ref.ref
child = self.db.get_person_from_handle(child_handle) child = self.db.get_person_from_handle(child_handle)
if child is None:
continue
# Go through once looking for direct evidence: # Go through once looking for direct evidence:
for ev_ref in child.get_primary_event_ref_list(): for ev_ref in child.get_primary_event_ref_list():
ev = self.db.get_event_from_handle(ev_ref.ref) ev = self.db.get_event_from_handle(ev_ref.ref)
@ -1328,6 +1332,7 @@ def find_witnessed_people(db,p):
def navigation_label(db, nav_type, handle): def navigation_label(db, nav_type, handle):
label = None label = None
obj = None
if nav_type == 'Person': if nav_type == 'Person':
obj = db.get_person_from_handle(handle) obj = db.get_person_from_handle(handle)
if obj: if obj:
@ -1373,7 +1378,7 @@ def navigation_label(db, nav_type, handle):
if len(label) > 40: if len(label) > 40:
label = label[:40] + "..." label = label[:40] + "..."
if label: if label and obj:
label = '[%s] %s' % (obj.get_gramps_id(), label) label = '[%s] %s' % (obj.get_gramps_id(), label)
return (label, obj) return (label, obj)