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

Fix child relationship bugs with multiple languages, add support for new editing in marriage window.

Browse Source 
svn: r271
This commit is contained in:
Don Allingham
2001-07-31 21:42:25 +00:00
parent a324227ddd
commit 4e37696aa5
13 changed files with 1930 additions and 1836 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/Merge.py
View File

@@ -401,30 +401,6 @@ class Merge:
for event in src_family.getEventList():
tgt_family.addEvent(event)
# add mariage information
marriage = src_family.getMarriage()
if marriage:
other_marriage = tgt_family.getMarriage()
if other_marriage != None:
if other_marriage.getPlace() == "":
other_marriage.setPlace(marriage.getPlace())
if other_marriage.getDate() == "":
other_marriage.setDate(marriage.getDate())
else:
tgt_family.setMarriage(marriage)
# add divorce information
divorce = src_family.getDivorce()
if divorce != None:
other_divorce = tgt_family.getDivorce()
if other_divorce != None:
if other_divorce.getPlace() == "":
other_divorce.setPlace(divorce.getPlace())
if other_divorce.getDate() == "":
other_divorce.setDate(divorce.getDate())
else:
tgt_family.setDivorce(divorce)
# change parents of the family to point to the new
# family

11
src/plugins/ReadGedcom.py
View File

@@ -495,20 +495,9 @@ class GedcomParser:
self.ignore_sub_junk(2)
elif matches[1] == "SOUR":
self.ignore_sub_junk(2)
elif matches[1] == "MARR":
event = Event()
event.setName("Marriage")
self.family.setMarriage(event)
self.parse_family_event(event,2)
elif matches[1] == "DIV":
event = Event()
event.setName("Divorce")
self.family.setDivorce(event)
self.parse_family_event(event,2)
elif matches[1] == "OBJE":
if matches[2] and matches[2][0] == '@':
self.barf(2)
# self.ignore_sub_junk(2)
else:
self.parse_family_object(2)
elif matches[1] == "NOTE":