From 814e3d6695c1a65a6aa4f9b2cb763177d7864898 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Mon, 8 Oct 2007 21:39:51 +0000 Subject: [PATCH] * src/GrampsDbUtils/_WriteGedcom.py (__submitter): Remove old usage. svn: r9111 --- ChangeLog | 1 + src/GrampsDbUtils/_WriteGedcom.py | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e98cabc87..482f465c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ * src/gen/lib/note.py: make independent of MarkupText.py 2007-10-08 Alex Roitman + * src/GrampsDbUtils/_WriteGedcom.py (__submitter): Remove old usage. * src/GrampsDbUtils/_ReadXML.py (stop_research): Remove old usage. * src/GrampsCfg.py (get_researcher): Remove old usage. * src/gen/db/dbdir.py (__close_metadata): Store tuple; diff --git a/src/GrampsDbUtils/_WriteGedcom.py b/src/GrampsDbUtils/_WriteGedcom.py index 728ea6fa6..dbcd84c31 100644 --- a/src/GrampsDbUtils/_WriteGedcom.py +++ b/src/GrampsDbUtils/_WriteGedcom.py @@ -426,7 +426,15 @@ class GedcomWriter(BasicUtils.UpdateCallback): +1 <> {0:1} # not used """ owner = self.dbase.get_researcher() - (name, addr, city, stae, ctry, post, phon, mail) = owner.get() + name = owner.get_name() + addr = owner.get_address() + city = owner.get_city() + state = owner.get_state() + ctry = owner.get_country() + post = owner.get_postal_code() + phon = owner.get_phon() + mail = owner.get_email() + if not name : name = u'Not Provided' if not addr : @@ -435,14 +443,14 @@ class GedcomWriter(BasicUtils.UpdateCallback): self.__writeln(0, "@SUBM@", "SUBM") self.__writeln(1, "NAME", name) self.__writeln(1, "ADDR", addr) - if city and stae and post: - self.__writeln(2, "CONT", "%s, %s %s" % (city, stae, post)) + if city and state and post: + self.__writeln(2, "CONT", "%s, %s %s" % (city, state, post)) else: self.__writeln(2, "CONT", u"Not Provided") if city: self.__writeln(2, "CITY", city) - if stae: - self.__writeln(2, "STAE", stae) + if state: + self.__writeln(2, "STAE", state) if post: self.__writeln(2, "POST", post) if ctry: