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

First DB pass

Browse Source 
svn: r2884
This commit is contained in:
Don Allingham
2004-02-21 06:11:59 +00:00
parent c6ba4dfdcc
commit e878549bfd
63 changed files with 1701 additions and 2719 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/MergeData.py
View File

@@ -333,8 +333,8 @@ class MergePeople:
self.merge_families()
for photo in self.p2.get_photo_list():
self.p1.add_photo(photo)
for photo in self.p2.get_media_list():
self.p1.add_media_object(photo)
if self.p1.get_nick_name() == "":
self.p1.set_nick_name(self.p2.get_nick_name())
@@ -858,8 +858,8 @@ class MergePlaces:
self.p1.add_url(url)
# Copy photos from P2 to P1
for photo in self.p2.get_photo_list():
self.p1.add_photo(photo)
for photo in self.p2.get_media_list():
self.p1.add_media_object(photo)
# Copy sources from P2 to P1
for source in self.p2.get_source_references():