Correct some variable names.
* src/plugins/webreport/NarrativeWeb.py svn: r11940
This commit is contained in:
parent
5d64756737
commit
c7edbc7cdd
@ -282,12 +282,13 @@ class BasePage:
|
|||||||
Will create the alphabetical navigation bar...
|
Will create the alphabetical navigation bar...
|
||||||
"""
|
"""
|
||||||
|
|
||||||
first_letter_dict = get_first_letter_dict(db, handle_list, key)
|
|
||||||
sorted_set = {}
|
sorted_set = {}
|
||||||
|
|
||||||
for ltr in first_letter_dict:
|
for ltr in get_first_letters(db, handle_list, key):
|
||||||
try: sorted_set[ltr] += 1
|
try:
|
||||||
except KeyError: sorted_set[ltr] = 1
|
sorted_set[ltr] += 1
|
||||||
|
except KeyError:
|
||||||
|
sorted_set[ltr] = 1
|
||||||
|
|
||||||
sorted_first_letter = sorted_set.keys()
|
sorted_first_letter = sorted_set.keys()
|
||||||
sorted_first_letter.sort(locale.strcoll)
|
sorted_first_letter.sort(locale.strcoll)
|
||||||
@ -3605,10 +3606,10 @@ def get_place_keyname(db, handle):
|
|||||||
|
|
||||||
return ReportUtils.place_name(db, handle)
|
return ReportUtils.place_name(db, handle)
|
||||||
|
|
||||||
def get_first_letter_dict(db, handle_list, key):
|
def get_first_letters(db, handle_list, key):
|
||||||
""" key is _PLACE or _PERSON ...."""
|
""" key is _PLACE or _PERSON ...."""
|
||||||
|
|
||||||
namedict = []
|
first_letters = []
|
||||||
|
|
||||||
for handle in handle_list:
|
for handle in handle_list:
|
||||||
if key == _PERSON:
|
if key == _PERSON:
|
||||||
@ -3617,10 +3618,10 @@ def get_first_letter_dict(db, handle_list, key):
|
|||||||
keyname = get_place_keyname(db, handle)
|
keyname = get_place_keyname(db, handle)
|
||||||
|
|
||||||
if keyname:
|
if keyname:
|
||||||
firstletter = normalize('NFC', keyname)[0].upper()
|
c = normalize('NFC', keyname)[0].upper()
|
||||||
|
first_letters.append(c)
|
||||||
|
|
||||||
namedict.append(firstletter)
|
return first_letters
|
||||||
return namedict
|
|
||||||
|
|
||||||
# ------------------------------------------
|
# ------------------------------------------
|
||||||
#
|
#
|
||||||
|
Loading…
x
Reference in New Issue
Block a user