From 6c4cd0ca8218f387c2eb4609fb4653fa6b544d8a Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Thu, 10 Jul 2003 11:26:48 +0000 Subject: [PATCH] 2003-07-10 Tim Waugh * src/RelLib.py: Fix for probablyAlive(). If there is no date, but there is other information about the death, the person is not alive. svn: r1855 --- gramps2/ChangeLog | 4 ++++ gramps2/src/RelLib.py | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 85c9dace3..1a37ee457 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,7 @@ +2003-07-10 Tim Waugh + * src/RelLib.py: Fix for probablyAlive(). If there is no date, but + there is other information about the death, the person is not alive. + 2003-07-09 Donald Peterson * doc/gramps-manual/C/gramps-manual.xml: More corrections. diff --git a/gramps2/src/RelLib.py b/gramps2/src/RelLib.py index 4aa2c1c58..c4a4cce7c 100644 --- a/gramps2/src/RelLib.py +++ b/gramps2/src/RelLib.py @@ -1384,7 +1384,7 @@ class Person(Persistent): return self.lds_seal def probablyAlive(self): - if self.death.getDate() != "": + if not self.death.is_empty (): return 0 if self.birth.getDate() != "": return not_too_old(self.birth.getDateObj().get_start_date()) @@ -1443,9 +1443,10 @@ class Event(DataObj): date = self.getDateObj() place = self.getPlace() description = self.description + cause = self.cause name = self.name if (not name or name == "Birth" or name == "Death") and \ - date.isEmpty() and not place and not description: + date.isEmpty() and not place and not description and not cause: return 1 else: return 0