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

Fix for correct unique surname statistics.

Browse Source 
svn: r20687
This commit is contained in:
Peter Landgren 2012-11-21 12:34:14 +00:00
parent b9a77a9b9f
commit 6bb0f12d28
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/gramplet/StatsGramplet.py
View File

@ -104,18 +104,19 @@ class StatsGramplet(Gramplet):
total_media += length total_media += length
for name in [person.get_primary_name()] + person.get_alternate_names(): for name in [person.get_primary_name()] + person.get_alternate_names():
# Count unique surnames
if not name.get_surname().strip() in namelist \
and not name.get_surname().strip() == "":
namelist.append(name.get_surname().strip())
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

9
src/plugins/gramplet/SurnameCloudGramplet.py
View File

@ -92,6 +92,7 @@ class SurnameCloudGramplet(Gramplet):
representative_handle = {} representative_handle = {}
cnt = 0 cnt = 0
namelist =[]
for person in self.dbstate.db.iter_people(): for person in self.dbstate.db.iter_people():
allnames = [person.get_primary_name()] + person.get_alternate_names() allnames = [person.get_primary_name()] + person.get_alternate_names()
allnames = set([name.get_group_name().strip() for name in allnames]) allnames = set([name.get_group_name().strip() for name in allnames])
@ -101,6 +102,11 @@ class SurnameCloudGramplet(Gramplet):
cnt += 1 cnt += 1
if not cnt % _YIELD_INTERVAL: if not cnt % _YIELD_INTERVAL:
yield True yield True
# Count unique surnames
for name in [person.get_primary_name()] + person.get_alternate_names():
if not name.get_surname().strip() in namelist \
and not name.get_surname().strip() == "":
namelist.append(name.get_surname().strip())
total_people = cnt total_people = cnt
surname_sort = [] surname_sort = []
@ -113,7 +119,6 @@ class SurnameCloudGramplet(Gramplet):
if not cnt % _YIELD_INTERVAL: if not cnt % _YIELD_INTERVAL:
yield True yield True
total_surnames = cnt
surname_sort.sort(reverse=True) surname_sort.sort(reverse=True)
cloud_names = [] cloud_names = []
cloud_values = [] cloud_values = []
@ -164,7 +169,7 @@ class SurnameCloudGramplet(Gramplet):
self.append_text(" ") self.append_text(" ")
showing += 1 showing += 1
self.append_text(("\n\n" + _("Total unique surnames") + ": %d\n") % self.append_text(("\n\n" + _("Total unique surnames") + ": %d\n") %
total_surnames) len(namelist))
self.append_text((_("Total surnames showing") + ": %d\n") % showing) self.append_text((_("Total surnames showing") + ": %d\n") % showing)
self.append_text((_("Total people") + ": %d") % total_people, "begin") self.append_text((_("Total people") + ": %d") % total_people, "begin")

6
src/plugins/textreport/Summary.py
View File

@ -140,8 +140,10 @@ class SummaryReport(Report):
unknowns += 1 unknowns += 1
# Count unique surnames # Count unique surnames
if name.get_surname() not in namelist: for name in [person.get_primary_name()] + person.get_alternate_names():
namelist.append(name.get_surname()) if not name.get_surname().strip() in namelist \
and not name.get_surname().strip() == "":
namelist.append(name.get_surname().strip())
self.doc.start_paragraph("SR-Normal") self.doc.start_paragraph("SR-Normal")
self.doc.write_text(_("Number of individuals: %d") % num_people) self.doc.write_text(_("Number of individuals: %d") % num_people)