From b3a30195660bb0dcdaa32e7fc44e0dfa59194c39 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Mon, 8 May 2006 03:41:57 +0000 Subject: [PATCH] * configure.in: set for 2.1.1 * src/GrampsDb/_ReadXML.py: call name support * src/GrampsDb/_WriteXML.py: call name support svn: r6576 --- gramps2/ChangeLog | 3 +++ gramps2/configure.in | 6 +++--- gramps2/src/GrampsDb/_ReadXML.py | 4 ++++ gramps2/src/GrampsDb/_WriteXML.py | 1 + 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index db4acbede..edf7f05bd 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,4 +1,7 @@ 2006-05-07 Don Allingham + * configure.in: set for 2.1.1 + * src/GrampsDb/_ReadXML.py: call name support + * src/GrampsDb/_WriteXML.py: call name support * src/DisplayState.py: include name and relationship on statusbar * src/DataViews/_MediaView.py: tool tips * src/DataViews/_RepositoryView.py: tool tips diff --git a/gramps2/configure.in b/gramps2/configure.in index 1b39eeeed..51894e623 100644 --- a/gramps2/configure.in +++ b/gramps2/configure.in @@ -4,15 +4,15 @@ dnl Process this file with autoconf to produce a configure script. dnl May need to run automake && aclocal first AC_PREREQ(2.57) -AC_INIT(gramps, 2.1.0, [gramps-bugs@lists.sourceforge.net]) +AC_INIT(gramps, 2.1.1, [gramps-bugs@lists.sourceforge.net]) AC_CONFIG_SRCDIR(configure.in) AM_INIT_AUTOMAKE(1.6.3) AC_CONFIG_MACRO_DIR([m4]) GNOME_DOC_INIT -RELEASE=0.SVN$(svnversion -n .) -dnl RELEASE=1 +dnl RELEASE=0.SVN$(svnversion -n .) +RELEASE=1 VERSIONSTRING=$VERSION if test x"$RELEASE" != "x" diff --git a/gramps2/src/GrampsDb/_ReadXML.py b/gramps2/src/GrampsDb/_ReadXML.py index a892fe78c..5428764d7 100644 --- a/gramps2/src/GrampsDb/_ReadXML.py +++ b/gramps2/src/GrampsDb/_ReadXML.py @@ -397,6 +397,7 @@ class GrampsParser: "rel" : (self.start_rel, None), "father" : (self.start_father, None), "first" : (None, self.stop_first), + "call" : (None, self.stop_call), "gender" : (None, self.stop_gender), "header" : (None, None), "last" : (self.start_last, self.stop_last), @@ -1502,6 +1503,9 @@ class GrampsParser: def stop_first(self,tag): self.name.set_first_name(tag) + def stop_call(self,tag): + self.name.set_call_name(tag) + def stop_families(self,*tag): self.family = None diff --git a/gramps2/src/GrampsDb/_WriteXML.py b/gramps2/src/GrampsDb/_WriteXML.py index 49f241828..a3c67dae3 100644 --- a/gramps2/src/GrampsDb/_WriteXML.py +++ b/gramps2/src/GrampsDb/_WriteXML.py @@ -769,6 +769,7 @@ class XmlWriter: self.g.write(' display="%d"' % name.get_display_as()) self.g.write('>\n') self.write_line("first",name.get_first_name(),index+1) + self.write_line("call",name.get_call_name(),index+1) self.write_last(name,index+1) self.write_line("suffix",name.get_suffix(),index+1) self.write_line("patronymic",name.get_patronymic(),index+1)