expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-22 07:11:52 +00:00
Code Issues 19 Projects 3 Activity

More fixes to name resolution checking

Browse Source
This commit is contained in:
Philip Sargent 2022-10-09 23:50:32 +03:00
parent 3c31c333f2
commit 861980a8e9
2 changed files with 39 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/views/statistics.py
View File

@ -181,12 +181,14 @@ def aliases(request, year):
personexpeditions = PersonExpedition.objects.filter(expedition=expo) personexpeditions = PersonExpedition.objects.filter(expedition=expo)
persons = Person.objects.all() persons = Person.objects.all()
aliasdict = GetPersonExpeditionNameLookup(expo) aliases = GetPersonExpeditionNameLookup(expo)
res = aliasdict
# invert aliasdict = {key: val for key, val in sorted(aliases.items(), key = lambda ele: ele[0])}
aliasdict={}
for i in sorted(aliases):
aliasdict[i]=aliases[i]
invert ={} invert ={}
for p in res:
invert[res[p]].append(p)
return render(request,'aliases.html', {'year': year, 'aliasdict': aliasdict, 'invert': invert,'personexpeditions': personexpeditions, 'persons': persons}) return render(request,'aliases.html', {'year': year, 'aliasdict': aliasdict, 'invert': invert,'personexpeditions': personexpeditions, 'persons': persons})

47
parsers/people.py
View File

@ -147,6 +147,7 @@ def GetPersonExpeditionNameLookup(expedition):
variations = [] variations = []
variations.append(f) variations.append(f)
variations.append(l) variations.append(l)
variations.append(f + l)
variations.append(f + " " + l) variations.append(f + " " + l)
variations.append(f + " " + l[0]) variations.append(f + " " + l[0])
variations.append(f + l[0]) variations.append(f + l[0])
@ -183,6 +184,7 @@ def GetPersonExpeditionNameLookup(expedition):
if n: if n:
possnames += apply_variations(n, l) possnames += apply_variations(n, l)
if f == "Robert".lower(): if f == "Robert".lower():
possnames += apply_variations("Bob", l) possnames += apply_variations("Bob", l)
if f == "Andrew".lower(): if f == "Andrew".lower():
@ -193,34 +195,49 @@ def GetPersonExpeditionNameLookup(expedition):
possnames += apply_variations("Mike", l) possnames += apply_variations("Mike", l)
if f == "David".lower(): if f == "David".lower():
possnames += apply_variations("Dave", l) possnames += apply_variations("Dave", l)
if f == "Dave".lower():
possnames += apply_variations("David", l)
if f == "Peter".lower(): if f == "Peter".lower():
possnames += apply_variations("Pete", l) possnames += apply_variations("Pete", l)
if f == "Pete".lower():
possnames += apply_variations("Peter", l)
if f == "Olly".lower():
possnames += apply_variations("Oliver", l)
if f == "Oliver".lower():
possnames += apply_variations("Olly", l)
if f == "Becka".lower(): if f == "Becka".lower():
possnames += apply_variations("Rebecca", l) possnames += apply_variations("Rebecca", l)
if f'{f} {l}' == "Andy Waddington".lower(): if f'{f} {l}' == "Andy Waddington".lower():
possnames += apply_variations("AER", "Waddington") possnames += apply_variations("aer", "waddington")
if f'{f} {l}' == "Phil Underwood".lower(): if f'{f} {l}' == "Phil Underwood".lower():
possnames += apply_variations("Phil", "Underpants") possnames += apply_variations("phil", "underpants")
if f'{f} {l}' == "Naomi Griffiths".lower(): if f'{f} {l}' == "Naomi Griffiths".lower():
possnames += apply_variations("Naomi", "Makin") possnames += apply_variations("naomi", "makins")
if f'{f} {l}' == "Tina White".lower():
possnames += apply_variations("tina", "richardson")
if f'{f} {l}' == "Cat Hulse".lower(): if f'{f} {l}' == "Cat Hulse".lower():
possnames += apply_variations("Catherine", "Hulse") possnames += apply_variations("catherine", "hulse")
possnames += apply_variations("Cat", "Henry") possnames += apply_variations("cat", "henry")
if f'{f} {l}' == "Jess Stirrups".lower(): if f'{f} {l}' == "Jess Stirrups".lower():
possnames += apply_variations("Jessica", "Stirrups") possnames += apply_variations("jessica", "stirrups")
if f'{f} {l}' == "Nat Dalton".lower(): if f'{f} {l}' == "Nat Dalton".lower():
possnames += apply_variations("Nathaniel", "Dalton") possnames += apply_variations("nathanael", "dalton") # correct. He has a weird spelling.
if f'{f} {l}' == "Mike Richardson".lower(): if f'{f} {l}' == "Mike Richardson".lower():
possnames.append("MTA") possnames.append("mta")
possnames.append("Mike the Animal") possnames.append("miketa")
possnames.append("Animal") possnames.append("mike the animal")
possnames.append("animal")
if f'{f} {l}' == "Eric Landgraf".lower(): if f'{f} {l}' == "Eric Landgraf".lower():
possnames.append("Eric C.Landgraf") possnames.append("eric c.landgraf")
possnames.append("Eric C. Landgraf") possnames.append("eric c. landgraf")
possnames.append("eric c landgraf")
for i in [4, 5, 6]: if f'{f} {l}' == "Nadia Raeburn".lower():
possnames.append("nadia rc")
possnames.append("nadia raeburn-cherradi")
for i in [3, 4, 5, 6]:
lim = min(i, len(f)+1) # short form, e.g. Dan for Daniel. lim = min(i, len(f)+1) # short form, e.g. Dan for Daniel.
if f[:lim] not in short: if f[:lim] not in short:
short[f[:lim]]= personexpedition short[f[:lim]]= personexpedition