Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* src/GrampsDbUtils/_WriteGedcom.py (__submitter): Remove old usage.

Browse Source 
svn: r9111
This commit is contained in:
Alex Roitman 2007-10-08 21:39:51 +00:00
parent c8278af85c
commit 814e3d6695
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -5,6 +5,7 @@
* src/gen/lib/note.py: make independent of MarkupText.py * src/gen/lib/note.py: make independent of MarkupText.py
2007-10-08 Alex Roitman <shura@gramps-project.org> 2007-10-08 Alex Roitman <shura@gramps-project.org>
* src/GrampsDbUtils/_WriteGedcom.py (__submitter): Remove old usage.
* src/GrampsDbUtils/_ReadXML.py (stop_research): Remove old usage. * src/GrampsDbUtils/_ReadXML.py (stop_research): Remove old usage.
* src/GrampsCfg.py (get_researcher): Remove old usage. * src/GrampsCfg.py (get_researcher): Remove old usage.
* src/gen/db/dbdir.py (__close_metadata): Store tuple; * src/gen/db/dbdir.py (__close_metadata): Store tuple;

18
src/GrampsDbUtils/_WriteGedcom.py
View File

@ -426,7 +426,15 @@ class GedcomWriter(BasicUtils.UpdateCallback):
+1 <<CHANGE_DATE>> {0:1} # not used +1 <<CHANGE_DATE>> {0:1} # not used
""" """
owner = self.dbase.get_researcher() 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 : if not name :
name = u'Not Provided' name = u'Not Provided'
if not addr : if not addr :
@ -435,14 +443,14 @@ class GedcomWriter(BasicUtils.UpdateCallback):
self.__writeln(0, "@SUBM@", "SUBM") self.__writeln(0, "@SUBM@", "SUBM")
self.__writeln(1, "NAME", name) self.__writeln(1, "NAME", name)
self.__writeln(1, "ADDR", addr) self.__writeln(1, "ADDR", addr)
if city and stae and post: if city and state and post:
self.__writeln(2, "CONT", "%s, %s %s" % (city, stae, post)) self.__writeln(2, "CONT", "%s, %s %s" % (city, state, post))
else: else:
self.__writeln(2, "CONT", u"Not Provided") self.__writeln(2, "CONT", u"Not Provided")
if city: if city:
self.__writeln(2, "CITY", city) self.__writeln(2, "CITY", city)
if stae: if state:
self.__writeln(2, "STAE", stae) self.__writeln(2, "STAE", state)
if post: if post:
self.__writeln(2, "POST", post) self.__writeln(2, "POST", post)
if ctry: if ctry: