2007-05-11 Benny Malengier <bm@cage.ugent.be>

* src/GrampsDb/_ReadXML.py: clean meld issues, add privacy read lds_ord even if not set yet



svn: r8462
This commit is contained in:
Benny Malengier 2007-05-11 22:20:28 +00:00
parent eee134a396
commit 05efaa384c
2 changed files with 4 additions and 2 deletions

View File

@ -1,3 +1,6 @@
2007-05-11 Benny Malengier <bm@cage.ugent.be>
* src/GrampsDb/_ReadXML.py: clean meld issues, add privacy read lds_ord even if not set yet
2007-05-10 Don Allingham <don@gramps-project.org> 2007-05-10 Don Allingham <don@gramps-project.org>
* src/GrampsDb/_ReadXML.py: fix privacy settings * src/GrampsDb/_ReadXML.py: fix privacy settings
* src/GrampsDb/_WriteXML.py: fix privacy settings * src/GrampsDb/_WriteXML.py: fix privacy settings

View File

@ -641,6 +641,7 @@ class GrampsParser(UpdateCallback):
def start_lds_ord(self,attrs): def start_lds_ord(self,attrs):
self.ord = RelLib.LdsOrd() self.ord = RelLib.LdsOrd()
self.ord.set_type_from_xml(attrs['type']) self.ord.set_type_from_xml(attrs['type'])
self.ord.private = bool(attrs.get("priv"))
if self.person: if self.person:
self.person.lds_ord_list.append(self.ord) self.person.lds_ord_list.append(self.ord)
elif self.family: elif self.family:
@ -897,7 +898,6 @@ class GrampsParser(UpdateCallback):
self.person = self.find_person_by_gramps_id(new_id) self.person = self.find_person_by_gramps_id(new_id)
self.person.private = bool(attrs.get("priv")) self.person.private = bool(attrs.get("priv"))
self.person.private = bool(attrs.get("priv"))
# Old and new markers: complete=1 and marker=word both have to work # Old and new markers: complete=1 and marker=word both have to work
if attrs.get('complete'): # this is only true for complete=1 if attrs.get('complete'): # this is only true for complete=1
@ -1002,7 +1002,6 @@ class GrampsParser(UpdateCallback):
# Here we need to support old format of <family type="Married"> # Here we need to support old format of <family type="Married">
if attrs.has_key('type'): if attrs.has_key('type'):
self.family.type.set_from_xml_str(attrs["type"]) self.family.type.set_from_xml_str(attrs["type"])
self.family.private = bool(attrs.get("priv"))
# Old and new markers: complete=1 and marker=word both have to work # Old and new markers: complete=1 and marker=word both have to work
if attrs.get('complete'): # this is only true for complete=1 if attrs.get('complete'): # this is only true for complete=1