From bedb9c6417921f7475423c98c22a933a0138be3c Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Thu, 11 Mar 2004 04:28:17 +0000 Subject: [PATCH] * src/plugins/WriteFtree.py: Call probably_alive with db. * src/plugins/WriteGedcom.py: Call probably_alive with db. svn: r3004 --- gramps2/ChangeLog | 2 ++ gramps2/src/plugins/WriteFtree.py | 2 +- gramps2/src/plugins/WriteGedcom.py | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 5be8f76a1..d173ba561 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -8,6 +8,8 @@ * src/plugins/WebPage.py: Convert to ids. Call probably_alive with db as an argument. Move by_date inside the class (needs db). * src/RelLib.py: Correct probably_alive to ids. + * src/plugins/WriteFtree.py: Call probably_alive with db. + * src/plugins/WriteGedcom.py: Call probably_alive with db. 2004-03-10 Leonid Mamtchenkov * src/plugins/WebPage.py: Link main photo to the original. diff --git a/gramps2/src/plugins/WriteFtree.py b/gramps2/src/plugins/WriteFtree.py index 2d5d91c00..bdf53062c 100644 --- a/gramps2/src/plugins/WriteFtree.py +++ b/gramps2/src/plugins/WriteFtree.py @@ -212,7 +212,7 @@ class FtreeWriter: death = p.get_death().get_date_object() if restrict: - alive = p.probably_alive() + alive = p.probably_alive(db) else: alive = 0 diff --git a/gramps2/src/plugins/WriteGedcom.py b/gramps2/src/plugins/WriteGedcom.py index 3dc1001af..0dbd7835e 100644 --- a/gramps2/src/plugins/WriteGedcom.py +++ b/gramps2/src/plugins/WriteGedcom.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000-2003 Donald N. Allingham +# Copyright (C) 2000-2004 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -705,12 +705,12 @@ class GedcomWriter: person = family.get_father_id() if person != None and self.plist.has_key(person.get_id()): self.writeln("1 HUSB @%s@" % self.pid(person.get_id())) - father_alive = person.probably_alive() + father_alive = person.probably_alive(db) person = family.get_mother_id() if person != None and self.plist.has_key(person.get_id()): self.writeln("1 WIFE @%s@" % self.pid(person.get_id())) - mother_alive = person.probably_alive() + mother_alive = person.probably_alive(db) if not self.restrict or ( not father_alive and not mother_alive ): self.write_ord("SLGS",family.get_lds_sealing(),1,const.lds_ssealing) @@ -788,7 +788,7 @@ class GedcomWriter: def write_person(self,person): self.writeln("0 @%s@ INDI" % self.pid(person.get_id())) - restricted = self.restrict and person.probably_alive () + restricted = self.restrict and person.probably_alive (db) self.prefn(person) primaryname = person.get_primary_name () if restricted and self.living: