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

3351: Living people are considered as dead (and some dead considered alive)

Browse Source 
svn: r13718
This commit is contained in:
Doug Blank 2009-12-05 20:11:00 +00:00
parent 0c10d47a90
commit e686d72a59
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Utils.py
View File

@ -468,16 +468,22 @@ def probably_alive(person, db, current_date=None, limit=0):
(defaults to today) (defaults to today)
:param limit: number of years to check beyond death_date :param limit: number of years to check beyond death_date
""" """
today = gen.lib.Date()
today.set_yr_mon_day(*time.localtime(time.time())[0:3])
if current_date is None: if current_date is None:
current_date = gen.lib.Date() current_date = today
# yr, mon, day: # Are we checking to see if they are alive right now?
current_date.set_yr_mon_day(*time.localtime(time.time())[0:3]) now = current_date.match(today, "=")
death_date = None death_date = None
# If the recorded death year is before current year then # If the recorded death year is before current year then
# things are simple. # things are simple.
death_ref = person.get_death_ref() death_ref = person.get_death_ref()
if death_ref and death_ref.get_role() == gen.lib.EventRoleType.PRIMARY: if death_ref and death_ref.get_role() == gen.lib.EventRoleType.PRIMARY:
# If they have a prmary death ref
if now:
# If you are asking today, then they are dead
return False
death = db.get_event_from_handle(death_ref.ref) death = db.get_event_from_handle(death_ref.ref)
if death.get_date_object().get_start_date() != gen.lib.Date.EMPTY: if death.get_date_object().get_start_date() != gen.lib.Date.EMPTY:
death_date = death.get_date_object() death_date = death.get_date_object()
@ -491,6 +497,10 @@ def probably_alive(person, db, current_date=None, limit=0):
if ev and ev.type in [gen.lib.EventType.CAUSE_DEATH, if ev and ev.type in [gen.lib.EventType.CAUSE_DEATH,
gen.lib.EventType.BURIAL, gen.lib.EventType.BURIAL,
gen.lib.EventType.CREMATION]: gen.lib.EventType.CREMATION]:
# If they have a prmary death-related event
if now:
# If you are asking today, then they are dead
return False
if not death_date: if not death_date:
death_date = ev.get_date_object() death_date = ev.get_date_object()
if ev.get_date_object().get_start_date() != gen.lib.Date.EMPTY: if ev.get_date_object().get_start_date() != gen.lib.Date.EMPTY: