2003-07-10 Tim Waugh <twaugh@redhat.com>

* 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
This commit is contained in:
Tim Waugh 2003-07-10 11:26:48 +00:00
parent ef2fe6d7f1
commit df17ff23bb
2 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,7 @@
2003-07-10 Tim Waugh <twaugh@redhat.com>
* 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 <dpeterson@sigmaxi.org> 2003-07-09 Donald Peterson <dpeterson@sigmaxi.org>
* doc/gramps-manual/C/gramps-manual.xml: More corrections. * doc/gramps-manual/C/gramps-manual.xml: More corrections.

View File

@ -1384,7 +1384,7 @@ class Person(Persistent):
return self.lds_seal return self.lds_seal
def probablyAlive(self): def probablyAlive(self):
if self.death.getDate() != "": if not self.death.is_empty ():
return 0 return 0
if self.birth.getDate() != "": if self.birth.getDate() != "":
return not_too_old(self.birth.getDateObj().get_start_date()) return not_too_old(self.birth.getDateObj().get_start_date())
@ -1443,9 +1443,10 @@ class Event(DataObj):
date = self.getDateObj() date = self.getDateObj()
place = self.getPlace() place = self.getPlace()
description = self.description description = self.description
cause = self.cause
name = self.name name = self.name
if (not name or name == "Birth" or name == "Death") and \ 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 return 1
else: else:
return 0 return 0