From ffc5f987e98ecd838f23fe747a4aa399ab294b74 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Wed, 11 May 2005 02:00:45 +0000 Subject: [PATCH] * src/WriteXML.py (write_witness): Proper witness reference. * src/ReadXML.py (start_witness): Initialize empty comment. svn: r4543 --- gramps2/ChangeLog | 3 +++ gramps2/src/ReadXML.py | 1 + gramps2/src/WriteXML.py | 6 ++---- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index d1d9938e1..c3196acca 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -19,6 +19,9 @@ * src/data/tips.xml: Update tips. + * src/WriteXML.py (write_witness): Proper witness reference. + * src/ReadXML.py (start_witness): Initialize empty comment. + 2005-05-10 Julio Sanchez * src/po/es.po: Updated translation * src/plugins/rel_es.py: Revert to more conservative relationships diff --git a/gramps2/src/ReadXML.py b/gramps2/src/ReadXML.py index 49948b820..93c3c8ed2 100644 --- a/gramps2/src/ReadXML.py +++ b/gramps2/src/ReadXML.py @@ -650,6 +650,7 @@ class GrampsParser: def start_witness(self,attrs): self.in_witness = 1 + self.witness_comment = "" if attrs.has_key('hlink'): self.witness = RelLib.Witness(RelLib.Event.ID,attrs['hlink']) elif attrs.has_key('ref'): diff --git a/gramps2/src/WriteXML.py b/gramps2/src/WriteXML.py index b4f1756ac..3d9796ea8 100644 --- a/gramps2/src/WriteXML.py +++ b/gramps2/src/WriteXML.py @@ -477,15 +477,13 @@ class XmlWriter: sp = " "*index com = self.fix(w.get_comment()) if w.get_type() == RelLib.Event.ID: - self.g.write('%s\n' % sp) - self.g.write(' %s%s\n' % (sp,w.get_value())) + self.g.write('%s\n' % (sp,w.get_value())) if com: self.g.write(' %s%s\n' % (sp,com)) self.g.write('%s\n' % sp) else: nm = self.fix(w.get_value()) - self.g.write('%s\n' % sp) - self.g.write(' %s%s\n' % (sp,nm)) + self.g.write('%s\n' % (sp,nm)) if com: self.g.write(' %s%s\n' % (sp,com)) self.g.write('%s\n' % sp)