xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

Removed unused properties and moving

Browse Source
This commit is contained in:
Philip Sargent
2023-01-30 22:27:17 +00:00
parent 7808005498
commit e35fccea5d
5 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
parsers/people.py
View File

@@ -89,7 +89,7 @@ def load_people_expos():
name = re.sub(r"<.*?>", "", name)
firstname = ""
nickname = ""
nick = ""
rawlastname = personline[header["Lastname"]].strip()
matchlastname = re.match(r"^([\w&;\s]+)(?:\(([^)]*)\))?", rawlastname)
@@ -98,7 +98,7 @@ def load_people_expos():
splitnick = re.match(r"^([\w&;\s]+)(?:\(([^)]*)\))?", name)
fullname = splitnick.group(1)
nickname = splitnick.group(2) or ""
nick = splitnick.group(2) or ""
fullname = fullname.strip()
names = fullname.split(" ")
@@ -112,7 +112,7 @@ def load_people_expos():
vfho = True
lookupAttribs = {"first_name": firstname, "last_name": (lastname or "")}
nonLookupAttribs = {"is_vfho": vfho, "fullname": fullname, "nickname": nickname}
nonLookupAttribs = {"is_vfho": vfho, "fullname": fullname, "nickname": nick}
person = Person.objects.create(**nonLookupAttribs, **lookupAttribs)
parse_blurb(personline=personline, header=header, person=person)
@@ -122,7 +122,7 @@ def load_people_expos():
expedition = Expedition.objects.get(year=year)
if attended == "1" or attended == "-1":
lookupAttribs = {"person": person, "expedition": expedition}
nonLookupAttribs = {"nickname": nickname, "is_guest": (personline[header["Guest"]] == "1")}
nonLookupAttribs = {"is_guest": (personline[header["Guest"]] == "1")}
pe = PersonExpedition.objects.create(**nonLookupAttribs, **lookupAttribs)
print("", flush=True)
@@ -214,7 +214,7 @@ def GetPersonExpeditionNameLookup(expedition):
f = unidecode(unescape(personexpedition.person.first_name.lower()))
l = unidecode(unescape(personexpedition.person.last_name.lower()))
full = unidecode(unescape(personexpedition.person.fullname.lower()))
n = unidecode(unescape(personexpedition.nickname.lower()))
n = unidecode(unescape(personexpedition.person.nickname.lower()))
if full not in possnames:
possnames.append(full)
if n not in possnames:

5
parsers/survex.py
View File

@@ -1390,7 +1390,6 @@ class LoadingSurvex:
name=blkid,
parent=survexblock,
survexpath=pathlist,
cave=self.currentcave,
survexfile=self.currentsurvexfile,
legsall=0,
legslength=0.0,
@@ -2050,7 +2049,7 @@ def LoadSurvexBlocks():
survexfileroot = MakeSurvexFileRoot()
# this next makes a block_object assciated with a file_object.path = SURVEX_TOPNAME
survexblockroot = SurvexBlock(
name=ROOTBLOCK, survexpath="", cave=None, survexfile=survexfileroot, legsall=0, legslength=0.0
name=ROOTBLOCK, survexpath="", survexfile=survexfileroot, legsall=0, legslength=0.0
)
# crashes here sometimes on MariaDB complaining that cave_id should not be null. But it should be.
# django.db.utils.IntegrityError: (1048, "Column 'cave_id' cannot be null")
@@ -2061,7 +2060,7 @@ def LoadSurvexBlocks():
omitsfileroot = MakeOmitFileRoot("_unseens.svx")
survexomitsroot = SurvexBlock(
name=OMITBLOCK, survexpath="", cave=None, survexfile=omitsfileroot, legsall=0, legslength=0.0
name=OMITBLOCK, survexpath="", survexfile=omitsfileroot, legsall=0, legslength=0.0
)
survexomitsroot.save()