From 05efaa384c1f05e4cc4c3950e57869bd7f21dc6c Mon Sep 17 00:00:00 2001 From: Benny Malengier Date: Fri, 11 May 2007 22:20:28 +0000 Subject: [PATCH] 2007-05-11 Benny Malengier * src/GrampsDb/_ReadXML.py: clean meld issues, add privacy read lds_ord even if not set yet svn: r8462 --- gramps2/ChangeLog | 3 +++ gramps2/src/GrampsDb/_ReadXML.py | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 380ecf6ce..d17edf47d 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,6 @@ +2007-05-11 Benny Malengier + * src/GrampsDb/_ReadXML.py: clean meld issues, add privacy read lds_ord even if not set yet + 2007-05-10 Don Allingham * src/GrampsDb/_ReadXML.py: fix privacy settings * src/GrampsDb/_WriteXML.py: fix privacy settings diff --git a/gramps2/src/GrampsDb/_ReadXML.py b/gramps2/src/GrampsDb/_ReadXML.py index 2217c6a7c..ae289e335 100644 --- a/gramps2/src/GrampsDb/_ReadXML.py +++ b/gramps2/src/GrampsDb/_ReadXML.py @@ -641,6 +641,7 @@ class GrampsParser(UpdateCallback): def start_lds_ord(self,attrs): self.ord = RelLib.LdsOrd() self.ord.set_type_from_xml(attrs['type']) + self.ord.private = bool(attrs.get("priv")) if self.person: self.person.lds_ord_list.append(self.ord) elif self.family: @@ -897,7 +898,6 @@ class GrampsParser(UpdateCallback): self.person = self.find_person_by_gramps_id(new_id) 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 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 if attrs.has_key('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 if attrs.get('complete'): # this is only true for complete=1