From 5d4434fda0d0e8ea898e70097a88c5712de8c928 Mon Sep 17 00:00:00 2001 From: Brian Matherly Date: Tue, 19 Jun 2007 04:32:06 +0000 Subject: [PATCH] Fix death source references in DDR and DAR. svn: r8590 --- ChangeLog | 5 +++++ src/plugins/DetAncestralReport.py | 4 ++-- src/plugins/DetDescendantReport.py | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4fe09c86f..b16a163ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-06-18 Brian Matherly + * src/plugins/DetDescendantReport.py: + * src/plugins/DetAncestralReport.py: + Fix death source reference. + 2007-06-18 Brian Matherly * src/DbManager.py: make path recursive. Make default db dir consistent. diff --git a/src/plugins/DetAncestralReport.py b/src/plugins/DetAncestralReport.py index b08f2a2f7..e275bcad2 100644 --- a/src/plugins/DetAncestralReport.py +++ b/src/plugins/DetAncestralReport.py @@ -246,7 +246,7 @@ class DetAncestorReport(Report): text = ReportUtils.died_str(self.database,person,first, self.EMPTY_DATE,self.EMPTY_PLACE,age,units) if text: - death_ref = person.get_birth_ref() + death_ref = person.get_death_ref() if death_ref: death = self.database.get_event_from_handle(death_ref.ref) text = text.rstrip(". ") @@ -355,7 +355,7 @@ class DetAncestorReport(Report): 'event_name' : _(evtName), 'date' : date} elif place: - text += _('%(event_name)s: %(place)s%') % { + text += _('%(event_name)s: %(place)s') % { 'event_name' : _(evtName), 'place' : place } else: diff --git a/src/plugins/DetDescendantReport.py b/src/plugins/DetDescendantReport.py index 856f35176..20c2ac2a6 100644 --- a/src/plugins/DetDescendantReport.py +++ b/src/plugins/DetDescendantReport.py @@ -273,7 +273,7 @@ class DetDescendantReport(Report): text = ReportUtils.died_str(self.database,person,first, self.EMPTY_DATE,self.EMPTY_PLACE,age,units) if text: - death_ref = person.get_birth_ref() + death_ref = person.get_death_ref() if death_ref: death = self.database.get_event_from_handle(death_ref.ref) text = text.rstrip(". ") @@ -382,7 +382,7 @@ class DetDescendantReport(Report): 'event_name' : _(evtName), 'date' : date} elif place: - text += _('%(event_name)s: %(place)s%') % { + text += _('%(event_name)s: %(place)s') % { 'event_name' : _(evtName), 'place' : place } else: