From 7adf9e0dc90bef348c9b02139236e05d34f5c23e Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Thu, 31 May 2007 12:09:11 +0000 Subject: [PATCH] 2007-05-31 Don Allingham * configure.in: update to 2.2.9 * src/plugins/WriteFtree.py (get_name): fix typo svn: r8521 --- gramps2/ChangeLog | 4 ++++ gramps2/configure.in | 6 +++--- gramps2/src/GrampsDb/_ReadGedcom.py | 13 ++++++++----- gramps2/src/plugins/WriteFtree.py | 2 +- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 0dea0e901..8a3d322e1 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,7 @@ +2007-05-31 Don Allingham + * configure.in: update to 2.2.9 + * src/plugins/WriteFtree.py (get_name): fix typo + 2007-05-27 Don Allingham * configure.in: update for 2.2.8 diff --git a/gramps2/configure.in b/gramps2/configure.in index 11ac8255f..45e018e73 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.2.8, [gramps-bugs@lists.sourceforge.net]) +AC_INIT(gramps, 2.2.9, [gramps-bugs@lists.sourceforge.net]) AC_CONFIG_SRCDIR(configure.in) AM_INIT_AUTOMAKE(1.6.3) AC_CONFIG_MACRO_DIR([m4]) GNOME_DOC_INIT -dnl RELEASE=0.SVN$(svnversion -n .) -RELEASE=1 +RELEASE=0.SVN$(svnversion -n .) +dnl RELEASE=1 VERSIONSTRING=$VERSION if test x"$RELEASE" != "x" diff --git a/gramps2/src/GrampsDb/_ReadGedcom.py b/gramps2/src/GrampsDb/_ReadGedcom.py index 82524c5bd..cd8a1f026 100644 --- a/gramps2/src/GrampsDb/_ReadGedcom.py +++ b/gramps2/src/GrampsDb/_ReadGedcom.py @@ -1969,11 +1969,14 @@ class GedcomParser(UpdateCallback): if place_handle: place = self.db.get_place_from_handle(place_handle) main_loc = place.get_main_location() - if main_loc and main_loc.get_street() != location.get_street(): - old_title = place.get_title() - place = self.find_or_create_place(index) - place.set_title(old_title) - place_handle = place.handle + try: + if main_loc and main_loc.get_street() != location.get_street(): + old_title = place.get_title() + place = self.find_or_create_place(index) + place.set_title(old_title) + place_handle = place.handle + except: + print matches else: place = self.find_or_create_place(index) place.set_title(matches[2]) diff --git a/gramps2/src/plugins/WriteFtree.py b/gramps2/src/plugins/WriteFtree.py index cfef2855a..60a33f171 100644 --- a/gramps2/src/plugins/WriteFtree.py +++ b/gramps2/src/plugins/WriteFtree.py @@ -299,7 +299,7 @@ def get_name(name,count): return "%s %s%s" % (name.first_name, name.surname, val) else: if name.prefix: - return "%s %s %s%s, %s" % (name.first_name, name.prefix, name.surname, val, name.Suffix) + return "%s %s %s%s, %s" % (name.first_name, name.prefix, name.surname, val, name.suffix) else: return "%s %s%s, %s" % (name.first_name, name.surname, val, name.suffix)