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

* src/Merge/_MergeSource.py: convert get_note to get_note_list

Browse Source 
* src/Merge/_MergePlace.py: convert get_note to get_note_list
	* src/Merge/_MergePerson.py: convert get_note to get_note_list

2007-07-18  Don Allingham  <don@gramps-project.org>


svn: r8742
This commit is contained in:
Don Allingham
2007-07-19 04:33:10 +00:00
parent f3d39e5f33
commit a9d7dd1b42
4 changed files with 9 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Merge/_MergePerson.py
View File

@@ -345,13 +345,7 @@ class MergePeople:
self.p2 = person2
def copy_note(self,one,two):
text1 = one.get_note(markup=True)
text2 = two.get_note(markup=True)
if text1 and text1 != text2:
one.set_note("%s\n\n%s" % (text1,text2))
else:
one.set_note(two.get_note(markup=True))
one.set_note_list(one.get_note_list() + two.get_note_list())
def copy_sources(self,one,two):
slist = one.get_source_references()[:]
@@ -838,12 +832,7 @@ class MergePeople:
tgt_family.add_attribute(xdata)
# merge family notes
if src_family.get_note(markup=True) != "":
old_note = tgt_family.get_note(markup=True)
if old_note:
old_note = old_note + "\n\n"
tgt_family.set_note(old_note + src_family.get_note(markup=True))
tgt_family.set_note_list(tgt_family.get_note_list() + src_family.get_note_list())
# merge family top-level sources