Issue 6188. Number of unique surnames are now correct in both StatsGramplet and SurnameCloudgramplet.

svn: r20683
This commit is contained in:
Peter Landgren 2012-11-20 18:17:22 +00:00
parent c4e86a732c
commit 94f108807f
2 changed files with 11 additions and 5 deletions

View File

@ -106,14 +106,19 @@ class StatsGramplet(Gramplet):
for name in [person.get_primary_name()] + person.get_alternate_names(): for name in [person.get_primary_name()] + person.get_alternate_names():
if name.get_first_name().strip() == "": if name.get_first_name().strip() == "":
incomp_names += 1 incomp_names += 1
if not name.get_surname().strip() in namelist:
namelist.append(name.get_surname().strip())
else: else:
if name.get_surname_list(): if name.get_surname_list():
for surname in name.get_surname_list(): for surname in name.get_surname_list():
if surname.get_surname().strip() == "": if surname.get_surname().strip() == "":
incomp_names += 1 incomp_names += 1
else:
if not surname.get_surname().strip() in namelist:
namelist.append(surname.get_surname().strip())
else: else:
incomp_names += 1 incomp_names += 1
if (not person.get_main_parents_family_handle() and if (not person.get_main_parents_family_handle() and
not len(person.get_family_handle_list())): not len(person.get_family_handle_list())):
disconnected += 1 disconnected += 1

View File

@ -106,12 +106,13 @@ class SurnameCloudGramplet(Gramplet):
surname_sort = [] surname_sort = []
total = cnt = 0 total = cnt = 0
for surname in surnames: for surname in surnames:
surname_sort.append( (surnames[surname], surname) ) if not surname.strip() == "":
total += surnames[surname] surname_sort.append( (surnames[surname], surname) )
cnt += 1 total += surnames[surname]
cnt += 1
if not cnt % _YIELD_INTERVAL: if not cnt % _YIELD_INTERVAL:
yield True yield True
total_surnames = cnt total_surnames = cnt
surname_sort.sort(reverse=True) surname_sort.sort(reverse=True)
cloud_names = [] cloud_names = []