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

Fixes in logic... in progress

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

32
src/plugins/Records.py
View File

@ -148,12 +148,12 @@ def _find_records(db, filter, callname):
elif event.get_type() == EventType.DIVORCE: elif event.get_type() == EventType.DIVORCE:
divorce_date = event.get_date_object() divorce_date = event.get_date_object()
if marriage_date is not None and _good_date(marriage_date): if _good_date(marriage_date):
_record(person_youngestmarried, person_oldestmarried, _record(person_youngestmarried, person_oldestmarried,
marriage_date - birth_date, marriage_date - birth_date,
name, 'Person', person_handle) name, 'Person', person_handle)
if divorce_date is not None and _good_date(divorce_date): if _good_date(divorce_date):
_record(person_youngestdivorced, person_oldestdivorced, _record(person_youngestdivorced, person_oldestdivorced,
divorce_date - birth_date, divorce_date - birth_date,
name, 'Person', person_handle) name, 'Person', person_handle)
@ -223,39 +223,35 @@ def _find_records(db, filter, callname):
len(family.get_child_ref_list()), len(family.get_child_ref_list()),
name, 'Family', family_handle) name, 'Family', family_handle)
marriage = None
divorce = None
marriage_date = None marriage_date = None
divorce_date = None divorce_date = None
for event_ref in family.get_event_ref_list(): for event_ref in family.get_event_ref_list():
event = db.get_event_from_handle(event_ref.ref) event = db.get_event_from_handle(event_ref.ref)
if event.get_type() == EventType.MARRIAGE: if event.get_type() == EventType.MARRIAGE:
marriage = event
marriage_date = event.get_date_object() marriage_date = event.get_date_object()
elif event.get_type() == EventType.DIVORCE: elif event.get_type() == EventType.DIVORCE:
divorce = event
divorce_date = event.get_date_object() divorce_date = event.get_date_object()
father_death_date = _find_death_date(db, father) father_death_date = _find_death_date(db, father)
mother_death_date = _find_death_date(db, mother) mother_death_date = _find_death_date(db, mother)
if not marriage or not _good_date(marriage_date): if not _good_date(marriage_date):
# Not married or marriage date unknown # Not married or marriage date unknown
continue continue
if divorce and not _good_date(divorce_date): #if not _good_date(divorce_date):
# Divorced, but divorce date unknown # # Divorced, but divorce date unknown
continue # continue
if (not father_death_date or not _good_date(father_death_date)): #if not _good_date(father_death_date):
# Father dead, but death date unknown # # Father dead, but death date unknown
continue # continue
if (not mother_death_date or not _good_date(mother_death_date)): #if not _good_date(mother_death_date):
# Mother dead, but death date unknown # # Mother dead, but death date unknown
continue # continue
if not divorce and not father_death_date and not mother_death_date: 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,
@ -269,7 +265,7 @@ def _find_records(db, filter, callname):
end = father_death_date end = father_death_date
elif mother_death_date: elif mother_death_date:
end = mother_death_date end = mother_death_date
if divorce: if divorce_date:
if end: if end:
end = min(end, divorce_date) end = min(end, divorce_date)
else: else: