From 5d84e3b1e222455680b061cbf2a43aefbc4eb5aa Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sun, 8 Mar 2009 14:31:20 +0000 Subject: [PATCH] 2753: Using 'is' or 'was' logic in the Detailed Reports is flawed; replaced with probably_alive svn: r12248 --- src/plugins/textreport/DetAncestralReport.py | 5 +++-- src/plugins/textreport/DetDescendantReport.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/plugins/textreport/DetAncestralReport.py b/src/plugins/textreport/DetAncestralReport.py index ad775a2ee..f2e5e4dc9 100644 --- a/src/plugins/textreport/DetAncestralReport.py +++ b/src/plugins/textreport/DetAncestralReport.py @@ -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) diff --git a/src/plugins/textreport/DetDescendantReport.py b/src/plugins/textreport/DetDescendantReport.py index 62aa08c34..9f3c712f8 100644 --- a/src/plugins/textreport/DetDescendantReport.py +++ b/src/plugins/textreport/DetDescendantReport.py @@ -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)