expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-12-15 14:17:09 +00:00
Code Issues 18 Projects 3 Activity

ent.url removed and entrance edit path simplified

Browse Source
This commit is contained in:
Philip Sargent
2023-11-07 23:23:15 +02:00
parent 1ba37665b5
commit 1e8a5bea6e
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
parsers/caves.py
View File

@@ -551,10 +551,9 @@ def read_entrance(filename, ent=None):
ent.other_description=other_description[0]
ent.other_station=other_station[0]
ent.photo=photo[0]
# ent.slug=slugs[0]
# ent.slug=slugs[0] # set algorithically
ent.tag_station=tag_station[0]
ent.underground_description=underground_description[0]
ent.url=url[0]
for st in [ent.other_station, ent.tag_station]:
#validate_station(st)
@@ -604,12 +603,15 @@ def read_cave(filename, cave=None):
letter = getXML(e, "letter", maxItems=1, context=context)[0]
if len(entrances) > 1 and letter =="":
# user error, but we can recover
# Usually the second entrance is 'b', but the first is still unlettered. So probably 'a'
letter = eslug[-1].lower()
if letter.lower() not in list(string.ascii_lowercase):
letter = "x"
message = f"- Warning - Empty 'letter' field for '{eslug}' in multiple-entrance cave '{cave}', setting to {letter}."
DataIssue.objects.create(parser="entrances", message=message, url=f"{cave.url}_cave_edit/")
letter = "a"
message = f"- Warning - Empty 'letter' field for '{eslug}' in multiple-entrance cave '{cave}', setting to {letter}."
#eurl = f"{cave.url}_cave_edit/"
eurl = Path(cave.url).parent + f"{cave.slug()}_cave_edit/"
# edit recognizer: (?P<path>.*)/(?P<slug>[^/]+)_cave_edit/$
DataIssue.objects.create(parser="entrances", message=message, url=eurl)
print(message)
if len(entrances) == 1 and not eslug: # may be empty: <entranceslug></entranceslug>
@@ -821,8 +823,7 @@ def read_cave(filename, cave=None):
cave.extent=extent[0]
cave.survex_file=survex_file[0]
cave.description_file=description_file[0]
# cave.url=url[0]
# override url in file. We now have a standard canonical form:
# cave.url=url[0] # set algorithically:
cave.url = f"{cave.areacode}/{cave.number()}/{cave.number()}.html"
check_directory(cave.areacode, cave.number(), cave.url, cave)