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

fix the finddupes tool for surnames

Browse Source 
svn: r16019
This commit is contained in:
Benny Malengier 2010-10-20 20:07:05 +00:00
parent 460497f489
commit a3556d839b
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/tool/FindDupes.py
View File

@ -197,7 +197,7 @@ class Merge(tool.Tool,ManagedWindow.ManagedWindow):
for p1_id in self.db.iter_person_handles(): for p1_id in self.db.iter_person_handles():
self.progress.step() self.progress.step()
p1 = self.db.get_person_from_handle(p1_id) p1 = self.db.get_person_from_handle(p1_id)
key = self.gen_key(p1.get_primary_name().get_surname()) key = self.gen_key(get_surnames(p1.get_primary_name()))
if p1.get_gender() == gen.lib.Person.MALE: if p1.get_gender() == gen.lib.Person.MALE:
if key in males: if key in males:
males[key].append(p1_id) males[key].append(p1_id)
@ -216,7 +216,7 @@ class Merge(tool.Tool,ManagedWindow.ManagedWindow):
self.progress.step() self.progress.step()
p1 = self.db.get_person_from_handle(p1key) p1 = self.db.get_person_from_handle(p1key)
key = self.gen_key(p1.get_primary_name().get_surname()) key = self.gen_key(get_surnames(p1.get_primary_name()))
if p1.get_gender() == gen.lib.Person.MALE: if p1.get_gender() == gen.lib.Person.MALE:
remaining = males[key] remaining = males[key]
else: else:
@ -454,9 +454,9 @@ class Merge(tool.Tool,ManagedWindow.ManagedWindow):
if not name1 or not name: if not name1 or not name:
return 0 return 0
srn1 = name.get_surname() srn1 = get_surnames(name)
sfx1 = name.get_suffix() sfx1 = name.get_suffix()
srn2 = name1.get_surname() srn2 = get_surnames(name1)
sfx2 = name1.get_suffix() sfx2 = name1.get_suffix()
if not self.name_compare(srn1,srn2): if not self.name_compare(srn1,srn2):
@ -633,6 +633,10 @@ def get_name_obj(person):
else: else:
return None return None
def get_surnames(name):
"""Construct a full surname of the surnames"""
' '.join([surn.get_surname() for surn in name.get_surname_list()])
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# #