From 1accdffc56ae906be2022cb098e753843ea2845b Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Mon, 19 Jan 2004 17:43:35 +0000 Subject: [PATCH] * src/plugins/ReadGedcom.py (parse_individual): add /Surname/ Firstname. svn: r2657 --- ChangeLog | 1 + src/plugins/ReadGedcom.py | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 39fb28531..bdf5d46fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ * src/plugins/book.glade: Reduce minimum window height to 600 pixels. * src/plugins/WriteCD.py (on_ok_clicked): Correct indentation. * src/GrampsCfg.py (loadConfig, save_data): Correctly parse gconf key. + * src/plugins/ReadGedcom.py (parse_individual): add /Surname/ Firstname. 2004-01-17 Don Allingham * src/plugins/AncestorChart2.py: more multipage improvements diff --git a/src/plugins/ReadGedcom.py b/src/plugins/ReadGedcom.py index a6772084a..4bc2ed2d2 100644 --- a/src/plugins/ReadGedcom.py +++ b/src/plugins/ReadGedcom.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000-2003 Donald N. Allingham +# Copyright (C) 2000-2004 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -113,7 +113,7 @@ intRE = re.compile(r"\s*(\d+)\s*$") lineRE = re.compile(r"\s*(\d+)\s+(\S+)\s*(.*)$") headRE = re.compile(r"\s*(\d+)\s+HEAD") nameRegexp= re.compile(r"/?([^/]*)(/([^/]*)(/([^/]*))?)?") -snameRegexp= re.compile(r"/([^/]*)/") +snameRegexp= re.compile(r"/([^/]*)/([^/]*)") calRegexp = re.compile(r"\s*(ABT|BEF|AFT)?\s*@#D([^@]+)@\s*(.*)$") fromtoRegexp = re.compile(r"\s*(FROM|BET)\s+@#D([^@]+)@\s*(.*)\s+(AND|TO)\s+@#D([^@]+)@\s*(.*)$") @@ -707,7 +707,8 @@ class GedcomParser: m = snameRegexp.match(matches[2]) if m: n = m.groups()[0] - names = ('','',n,'','') + n2 = m.groups()[1] + names = (n2,'',n,'','') else: try: names = nameRegexp.match(matches[2]).groups()