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

Fixed error on probably_alive with people with a future death guess

Browse Source 
svn: r14405
This commit is contained in:
Doug Blank 2010-02-17 02:45:48 +00:00
parent c2239ec0e7
commit b29f2504db
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Utils.py
View File

@ -818,18 +818,17 @@ def probably_alive(person, db,
# SPECIAL CASE: Today: # SPECIAL CASE: Today:
if current_date.match(gen.lib.date.Today(), "=="): if current_date.match(gen.lib.date.Today(), "=="):
if person.get_death_ref(): if person.get_death_ref():
# if death in the future: (impossible, unless guess)
# if return_range:
# return (True, birth, death, ("future death, ") + explain, relative)
# else:
# return True
if return_range: if return_range:
return (False, birth, death, explain, relative) return (False, birth, death, explain, relative)
else: else:
return False return False
if limit: if limit:
death += limit # add these years to death death += limit # add these years to death
# if death in the future:
if (gen.lib.date.Today() - death)[0] < 0:
if return_range:
return (True, birth, death, ("future death, ") + explain, relative)
else:
return True
# if the current - birth is too big, not alive: # if the current - birth is too big, not alive:
# FIXME: use match here: # FIXME: use match here:
if (current_date - birth)[0] > pb.MAX_AGE_PROB_ALIVE: if (current_date - birth)[0] > pb.MAX_AGE_PROB_ALIVE: