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

0002122: Detailed Ancestor Report reports people as buried who have no birth events (contributed by Gerald Britton <gerald.britton@gmail.com>)

Browse Source 
svn: r10788
This commit is contained in:
Brian Matherly 2008-06-06 00:01:37 +00:00
parent 410a97df27
commit c1707dd270
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ReportBase/_ReportUtils.py
View File

@ -2112,7 +2112,8 @@ def find_spouse(person, family):
def find_marriage(database, family):
for event_ref in family.get_event_ref_list():
event = database.get_event_from_handle(event_ref.ref)
if event and int(event.get_type()) == gen.lib.EventType.MARRIAGE:
if event and event.get_type() == gen.lib.EventType.MARRIAGE \
and event_ref.get_role() == gen.lib.EventRoleType.PRIMARY:
return event
return None
@ -2333,10 +2334,10 @@ def buried_str(database, person, person_name=None, empty_date="", empty_place=""
burial = None
for event_ref in person.get_event_ref_list():
event = database.get_event_from_handle(event_ref.ref)
if event and int(event.get_type()) == gen.lib.EventType.BURIAL:
if event and event.get_type() == gen.lib.EventType.BURIAL \
and event_ref.get_role() == gen.lib.EventRoleType.PRIMARY:
burial = event
break
if burial:
bdate = DateHandler.get_date(burial)
bplace_handle = burial.get_place_handle()
@ -2467,7 +2468,8 @@ def get_birth_or_fallback(database, person):
# now search the event list for fallbacks
for event_ref in person.get_primary_event_ref_list():
event = database.get_event_from_handle(event_ref.ref)
if event.get_type() in [gen.lib.EventType.CHRISTEN, gen.lib.EventType.BAPTISM]:
if event.get_type() in [gen.lib.EventType.CHRISTEN, gen.lib.EventType.BAPTISM] \
and event_ref.get_role() == gen.lib.EventRoleType.PRIMARY:
return event
return None
@ -2478,7 +2480,8 @@ def get_death_or_fallback(database, person):
# now search the event list for fallbacks
for event_ref in person.get_primary_event_ref_list():
event = database.get_event_from_handle(event_ref.ref)
if event.get_type() in [gen.lib.EventType.BURIAL, gen.lib.EventType.CREMATION]:
if event.get_type() in [gen.lib.EventType.BURIAL, gen.lib.EventType.CREMATION] \
and event_ref.get_role() == gen.lib.EventRoleType.PRIMARY:
return event
return None
@ -2691,3 +2694,4 @@ def get_person_filters(person, include_single=True):
return the_filters