diff --git a/ChangeLog b/ChangeLog index 502e74706..e98cabc87 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/_ReadXML.py (stop_research): Remove old usage. * src/GrampsCfg.py (get_researcher): Remove old usage. * src/gen/db/dbdir.py (__close_metadata): Store tuple; (_load_metadata): Load from tuple; diff --git a/src/GrampsCfg.py b/src/GrampsCfg.py index 0727b1bd7..df3a59046 100644 --- a/src/GrampsCfg.py +++ b/src/GrampsCfg.py @@ -88,7 +88,7 @@ def get_researcher(): owner.set_name(n) owner.set_address(a) owner.set_city(c) - owner.set_street(s) + owner.set_state(s) owner.set_country(ct) owner.set_postal_code(p) owner.set_phone(ph) diff --git a/src/GrampsDbUtils/_ReadXML.py b/src/GrampsDbUtils/_ReadXML.py index 22edc1136..a0b6f94b8 100644 --- a/src/GrampsDbUtils/_ReadXML.py +++ b/src/GrampsDbUtils/_ReadXML.py @@ -1981,8 +1981,14 @@ class GrampsParser(UpdateCallback): self.note = None def stop_research(self, tag): - self.owner.set(self.resname, self.resaddr, self.rescity, self.resstate, - self.rescon, self.respos, self.resphone, self.resemail) + self.owner.set_name(self.resname) + self.owner.set_address(self.resaddr) + self.owner.set_city(self.rescity) + self.owner.set_state(self.resstate) + self.owner.set_country(self.rescon) + self.owner.set_postal_code(self.respos) + self.owner.set_phone(self.resphone) + self.owner.set_email(self.resemail) def stop_resname(self, tag): self.resname = tag