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

* src/RelLib.py: add_source takes an transaction

Browse Source 
* src/ReadGedcom.py: drop add_surname


svn: r3080
This commit is contained in:
Don Allingham 2004-04-07 18:00:49 +00:00
parent b25c3a0d00
commit 3adaa10212
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gramps2/ChangeLog
View File

@ -1,3 +1,7 @@
2004-04-07 Don Allingham <dallingham@users.sourceforge.net>
* src/RelLib.py: add_source takes an transaction
* src/ReadGedcom.py: drop add_surname
2004-04-06 Don Allingham <dallingham@users.sourceforge.net> 2004-04-06 Don Allingham <dallingham@users.sourceforge.net>
* src/DbPrompter.py: remove VersionControl reference * src/DbPrompter.py: remove VersionControl reference
* src/Marriage.py: fix transaction handling * src/Marriage.py: fix transaction handling

2
gramps2/src/RelLib.py
View File

@ -2923,7 +2923,7 @@ class GrampsDB:
# self.genderStats.count_person (person, self) # self.genderStats.count_person (person, self)
return gid 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' """adds a Source instance to the database, assigning it a gramps'
ID number""" ID number"""

5
gramps2/src/plugins/ReadGedcom.py
View File

@ -723,7 +723,6 @@ class GedcomParser:
name.set_first_name(names[0].strip()) name.set_first_name(names[0].strip())
if names[2]: if names[2]:
name.set_surname(names[2].strip()) name.set_surname(names[2].strip())
self.db.add_surname(names[2].strip())
if names[4]: if names[4]:
name.set_suffix(names[4].strip()) name.set_suffix(names[4].strip())
if name_cnt == 0: if name_cnt == 0:
@ -742,7 +741,6 @@ class GedcomParser:
aka.set_first_name(names[0]) aka.set_first_name(names[0])
if names[2]: if names[2]:
aka.set_surname(names[2]) aka.set_surname(names[2])
self.db.add_surname(names[2])
if names[4]: if names[4]:
aka.set_suffix(names[4]) aka.set_suffix(names[4])
self.person.add_alternate_name(aka) self.person.add_alternate_name(aka)
@ -1411,7 +1409,6 @@ class GedcomParser:
aka.set_first_name(names[0]) aka.set_first_name(names[0])
if names[2]: if names[2]:
aka.set_surname(names[2]) aka.set_surname(names[2])
self.db.add_surname(names[2])
if names[4]: if names[4]:
aka.set_suffix(names[4]) aka.set_suffix(names[4])
self.person.add_alternate_name(aka) self.person.add_alternate_name(aka)
@ -1423,7 +1420,6 @@ class GedcomParser:
name.set_surname_prefix(matches[2]) name.set_surname_prefix(matches[2])
elif matches[1] == "SURN": elif matches[1] == "SURN":
name.set_surname(matches[2]) name.set_surname(matches[2])
self.db.add_surname(matches[2])
elif matches[1] == "_MARNM": elif matches[1] == "_MARNM":
self.parse_marnm(self.person,matches[2].strip()) self.parse_marnm(self.person,matches[2].strip())
elif matches[1] == "TITL": elif matches[1] == "TITL":
@ -1441,7 +1437,6 @@ class GedcomParser:
else: else:
name = RelLib.Name() name = RelLib.Name()
name.set_surname(lname[-1]) name.set_surname(lname[-1])
self.db.add_surname(lname[-1])
name.set_first_name(string.join(lname[0:l-1])) name.set_first_name(string.join(lname[0:l-1]))
self.person.add_alternate_name(name) self.person.add_alternate_name(name)
elif matches[1] == "SOUR": elif matches[1] == "SOUR":