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

* src/MergeData.py: Various merge fixes.

Browse Source 
svn: r1915
This commit is contained in:
Alex Roitman 2003-07-22 04:12:58 +00:00
parent 039642d3d7
commit 8c28b12035
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gramps2/ChangeLog
View File

@ -1,3 +1,6 @@
2003-07-21 Alex Roitman <shura@alex.neuro.umn.edu>
* src/MergeData.py: Various merge fixes.
2003-07-21 Tim Waugh <twaugh@redhat.com> 2003-07-21 Tim Waugh <twaugh@redhat.com>
* src/RelLib.py: Made Person.probablyAlive() smarter. * src/RelLib.py: Made Person.probablyAlive() smarter.

11
gramps2/src/MergeData.py
View File

@ -1,7 +1,7 @@
# #
# Gramps - a GTK+/GNOME based genealogy program # Gramps - a GTK+/GNOME based genealogy program
# #
# Copyright (C) 2000 Donald N. Allingham # Copyright (C) 2000-2003 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
@ -313,15 +313,18 @@ class MergePeople:
orig_family = self.p1.getMainParents() orig_family = self.p1.getMainParents()
if orig_family: if orig_family:
orig_family.removeChild(self.p1) orig_family.removeChild(self.p1)
self.p1.removeAltFamily(orig_family)
source_family = self.p2.getMainParents()
(source_family,mrel,frel) = self.p2.getMainParentsRel()
self.p1.setMainParents(source_family) self.p1.setMainParents(source_family)
if source_family: if source_family:
if self.p2 in source_family.getChildList(): if self.p2 in source_family.getChildList():
source_family.removeChild(self.p2) source_family.removeChild(self.p2)
self.p2.removeAltFamily(source_family)
if self.p1 not in source_family.getChildList(): if self.p1 not in source_family.getChildList():
source_family.addChild(self.p1) source_family.addChild(self.p1)
self.p1.addAltFamily(source_family,mrel,frel)
else: else:
source_family = self.p2.getMainParents() source_family = self.p2.getMainParents()
if source_family: if source_family:
@ -344,6 +347,8 @@ class MergePeople:
try: try:
self.db.removePerson(self.p2.getId()) self.db.removePerson(self.p2.getId())
self.db.personMap[self.p1.getId()] = self.p1
self.db.personTable[self.p1.getId()] = self.p1.getDisplayInfo()
self.db.buildPersonDisplay(self.p1.getId(),old_id) self.db.buildPersonDisplay(self.p1.getId(),old_id)
except: except:
print "%s is not in the person map!" % (GrampsCfg.nameof(self.p2)) print "%s is not in the person map!" % (GrampsCfg.nameof(self.p2))