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

Fixed log.

Browse Source 
svn: r11554
This commit is contained in:
Doug Blank 2008-12-31 16:48:27 +00:00
parent 9e74720152
commit 529dba047a
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/Records.py
View File

@ -66,6 +66,7 @@ def _good_date(date):
else: else:
return False return False
def _find_death_date(db, person): def _find_death_date(db, person):
death_ref = person.get_death_ref() death_ref = person.get_death_ref()
if death_ref: if death_ref:
@ -239,33 +240,23 @@ def _find_records(db, filter, callname):
# Not married or marriage date unknown # Not married or marriage date unknown
continue continue
#if not _good_date(divorce_date):
# # Divorced, but divorce date unknown
# continue
#if not _good_date(father_death_date):
# # Father dead, but death date unknown
# continue
#if not _good_date(mother_death_date):
# # Mother dead, but death date unknown
# continue
if divorce_date is None and father_death_date is None and mother_death_date is None: if divorce_date is None and father_death_date is None and mother_death_date is None:
# Still married and alive # Still married and alive
if probably_alive(father, db) and probably_alive(mother, db): if probably_alive(father, db) and probably_alive(mother, db):
_record(family_youngestmarried, family_oldestmarried, _record(family_youngestmarried, family_oldestmarried,
today_date - marriage_date, today_date - marriage_date,
name, 'Family', family_handle) name, 'Family', family_handle)
else: elif (_good_date(divorce_date) or
_good_date(father_death_date) or
_good_date(mother_death_date)):
end = None end = None
if father_death_date and mother_death_date: if _good_date(father_death_date) and _good_date(mother_death_date):
end = min(father_death_date, mother_death_date) end = min(father_death_date, mother_death_date)
elif father_death_date: elif _good_date(father_death_date):
end = father_death_date end = father_death_date
elif mother_death_date: elif _good_date(mother_death_date):
end = mother_death_date end = mother_death_date
if divorce_date: if _good_date(divorce_date):
if end: if end:
end = min(end, divorce_date) end = min(end, divorce_date)
else: else:
@ -273,7 +264,7 @@ def _find_records(db, filter, callname):
duration = end - marriage_date duration = end - marriage_date
_record(family_shortest, family_longest, _record(family_shortest, family_longest,
end - marriage_date, name, 'Family', family_handle) duration, name, 'Family', family_handle)
return [(text, varname, locals()[varname]) for (text, varname, default) in RECORDS] return [(text, varname, locals()[varname]) for (text, varname, default) in RECORDS]