Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* src/plugins/ReadGedcom.py (parse_individual): add /Surname/ Firstname.

Browse Source 
svn: r2657
This commit is contained in:
Alex Roitman 2004-01-19 17:43:35 +00:00
parent 380e178acc
commit 1accdffc56
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -4,6 +4,7 @@
* src/plugins/book.glade: Reduce minimum window height to 600 pixels. * src/plugins/book.glade: Reduce minimum window height to 600 pixels.
* src/plugins/WriteCD.py (on_ok_clicked): Correct indentation. * src/plugins/WriteCD.py (on_ok_clicked): Correct indentation.
* src/GrampsCfg.py (loadConfig, save_data): Correctly parse gconf key. * src/GrampsCfg.py (loadConfig, save_data): Correctly parse gconf key.
* src/plugins/ReadGedcom.py (parse_individual): add /Surname/ Firstname.
2004-01-17 Don Allingham <dallingham@users.sourceforge.net> 2004-01-17 Don Allingham <dallingham@users.sourceforge.net>
* src/plugins/AncestorChart2.py: more multipage improvements * src/plugins/AncestorChart2.py: more multipage improvements

7
src/plugins/ReadGedcom.py
View File

@ -1,7 +1,7 @@
# #
# Gramps - a GTK+/GNOME based genealogy program # 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 # 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 # 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*(.*)$") lineRE = re.compile(r"\s*(\d+)\s+(\S+)\s*(.*)$")
headRE = re.compile(r"\s*(\d+)\s+HEAD") headRE = re.compile(r"\s*(\d+)\s+HEAD")
nameRegexp= re.compile(r"/?([^/]*)(/([^/]*)(/([^/]*))?)?") nameRegexp= re.compile(r"/?([^/]*)(/([^/]*)(/([^/]*))?)?")
snameRegexp= re.compile(r"/([^/]*)/") snameRegexp= re.compile(r"/([^/]*)/([^/]*)")
calRegexp = re.compile(r"\s*(ABT|BEF|AFT)?\s*@#D([^@]+)@\s*(.*)$") 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*(.*)$") 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]) m = snameRegexp.match(matches[2])
if m: if m:
n = m.groups()[0] n = m.groups()[0]
names = ('','',n,'','') n2 = m.groups()[1]
names = (n2,'',n,'','')
else: else:
try: try:
names = nameRegexp.match(matches[2]).groups() names = nameRegexp.match(matches[2]).groups()