From 929307150c32cbed3c34a63527929fd584b96085 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Thu, 13 May 2004 18:12:37 +0000 Subject: [PATCH] * src/RelLib.py (probably_alive): Typos. svn: r3162 --- ChangeLog | 3 +++ src/RelLib.py | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1515af53c..ce0c7cdde 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2004-05-13 Alex Roitman + * src/RelLib.py (probably_alive): Typos. + 2004-05-12 Alex Roitman * src/plugins/ChangeTypes.py: Remove Utils.modified() call. * src/plugins/Check.py: Remove Utils.modified() call. diff --git a/src/RelLib.py b/src/RelLib.py index 2a8e89e9d..c9ffe09b4 100644 --- a/src/RelLib.py +++ b/src/RelLib.py @@ -1569,7 +1569,7 @@ class Person(SourceNote): if child_birth.get_date () != "": d = SingleDate (child_birth.get_date_object (). get_start_date ()) - d.setYear (d.getYear () - years) + d.set_year (d.get_year () - years) if not not_too_old (d): return 1 @@ -1599,10 +1599,10 @@ class Person(SourceNote): parent = db.find_person_from_id(parent_id) if parent.birth_id: parent_birth = db.find_event_from_id(parent.birth_id) - if parent_birth.get_date () != "": - d = SingleDate (parent.birth.get_date_object (). + if parent_birth.get_date (): + d = SingleDate (parent_birth.get_date_object (). get_start_date ()) - d.setYear (d.getYear () + max_generation + + d.set_year (d.get_year () + max_generation + age_difference) if not not_too_old (d): return 1 @@ -1610,9 +1610,9 @@ class Person(SourceNote): if parent.death_id: parent_death = db.find_event_from_id(parent.death_id) if parent_death.get_date () != "": - d = SingleDate (parent.death.get_date_object (). + d = SingleDate (parent_death.get_date_object (). get_start_date ()) - d.setYear (d.getYear () + age_difference) + d.set_year (d.get_year () + age_difference) if not not_too_old (d): return 1 @@ -1632,18 +1632,18 @@ class Person(SourceNote): if spouse.birth_id: spouse_birth = db.find_event_from_id(spouse.birth_id) if spouse_birth.get_date () != "": - d = SingleDate (spouse.birth.get_date_object(). + d = SingleDate (spouse_birth.get_date_object(). get_start_date ()) - d.setYear (d.getYear () + max_age_difference) + d.set_year (d.get_year () + max_age_difference) if not not_too_old (d): return 0 if spouse.death_id: spouse_death = db.find_event_from_id(spouse.death_id) if spouse_death.get_date () != "": - d = SingleDate (spouse.birth.get_date_object(). + d = SingleDate (spouse_birth.get_date_object(). get_start_date ()) - d.setYear (d.getYear () - min_generation) + d.set_year (d.get_year () - min_generation) if not not_too_old (d): return 0