From 1c0ee0cfc0ecf36b0f0e9a6902baba584a51c465 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Wed, 7 Apr 2004 18:00:49 +0000 Subject: [PATCH] * src/RelLib.py: add_source takes an transaction * src/ReadGedcom.py: drop add_surname svn: r3080 --- ChangeLog | 4 ++++ src/RelLib.py | 2 +- src/plugins/ReadGedcom.py | 5 ----- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index da6ff09d7..8aecaeaa1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-04-07 Don Allingham + * src/RelLib.py: add_source takes an transaction + * src/ReadGedcom.py: drop add_surname + 2004-04-06 Don Allingham * src/DbPrompter.py: remove VersionControl reference * src/Marriage.py: fix transaction handling diff --git a/src/RelLib.py b/src/RelLib.py index 8aaef74ec..2683f01fd 100644 --- a/src/RelLib.py +++ b/src/RelLib.py @@ -2923,7 +2923,7 @@ class GrampsDB: # self.genderStats.count_person (person, self) return gid - def add_source(self,source): + def add_source(self,source,trans=None): """adds a Source instance to the database, assigning it a gramps' ID number""" diff --git a/src/plugins/ReadGedcom.py b/src/plugins/ReadGedcom.py index 7a49f1453..5f1f35b94 100644 --- a/src/plugins/ReadGedcom.py +++ b/src/plugins/ReadGedcom.py @@ -723,7 +723,6 @@ class GedcomParser: name.set_first_name(names[0].strip()) if names[2]: name.set_surname(names[2].strip()) - self.db.add_surname(names[2].strip()) if names[4]: name.set_suffix(names[4].strip()) if name_cnt == 0: @@ -742,7 +741,6 @@ class GedcomParser: aka.set_first_name(names[0]) if names[2]: aka.set_surname(names[2]) - self.db.add_surname(names[2]) if names[4]: aka.set_suffix(names[4]) self.person.add_alternate_name(aka) @@ -1411,7 +1409,6 @@ class GedcomParser: aka.set_first_name(names[0]) if names[2]: aka.set_surname(names[2]) - self.db.add_surname(names[2]) if names[4]: aka.set_suffix(names[4]) self.person.add_alternate_name(aka) @@ -1423,7 +1420,6 @@ class GedcomParser: name.set_surname_prefix(matches[2]) elif matches[1] == "SURN": name.set_surname(matches[2]) - self.db.add_surname(matches[2]) elif matches[1] == "_MARNM": self.parse_marnm(self.person,matches[2].strip()) elif matches[1] == "TITL": @@ -1441,7 +1437,6 @@ class GedcomParser: else: name = RelLib.Name() name.set_surname(lname[-1]) - self.db.add_surname(lname[-1]) name.set_first_name(string.join(lname[0:l-1])) self.person.add_alternate_name(name) elif matches[1] == "SOUR":