2753: Using 'is' or 'was' logic in the Detailed Reports is flawed; replaced with probably_alive

svn: r12248
This commit is contained in:
Doug Blank 2009-03-08 14:31:20 +00:00
parent d10d443c9d
commit 5d84e3b1e2
2 changed files with 6 additions and 4 deletions

View File

@ -46,6 +46,7 @@ from ReportBase import Bibliography, Endnotes
import BaseDoc
import DateHandler
from BasicUtils import name_displayer as _nd
import Utils
#------------------------------------------------------------------------
#
@ -452,9 +453,9 @@ class DetAncestorReport(Report):
else:
father_name = ""
father_mark = ""
alive = Utils.probably_alive(person, self.database)
text = ReportUtils.child_str(person, father_name, mother_name,
bool(person.get_death_ref()),
not alive,
firstName,self.verbose)
if text:
self.doc.write_text(text)

View File

@ -47,6 +47,7 @@ from ReportBase import Bibliography, Endnotes
import BaseDoc
import DateHandler
from BasicUtils import name_displayer as _nd
import Utils
#------------------------------------------------------------------------
#
@ -360,9 +361,9 @@ class DetDescendantReport(Report):
else:
father_name = ""
father_mark = ""
alive = Utils.probably_alive(person, self.database)
text = ReportUtils.child_str(person, father_name, mother_name,
bool(person.get_death_ref()),
not alive,
firstName,self.verbose)
if text:
self.doc.write_text(text)