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

Replace assert() with DataIssue message

Browse Source
This commit is contained in:
Philip Sargent
2021-03-29 02:06:19 +01:00
parent c81f17c24b
commit 0f024b27f0
6 changed files with 46 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/views_survex.py
View File

@@ -272,7 +272,7 @@ def identifycavedircontents(gcavedir):
subdirs = [ ]
subsvx = [ ]
primesvx = None
for f in os.listdir(gcavedir):
for f in os.listdir(gcavedir): # These may get outdated as data gets tidied up. This should not be in the code!
if name == "204" and (f in ["skel.svx", "template.svx", "204withents.svx"]):
pass
elif name == "136" and (f in ["136-noents.svx"]):
@@ -289,10 +289,11 @@ def identifycavedircontents(gcavedir):
if nf.lower() == name.lower() or nf[:3] == "all" or (name, nf) in [("resurvey2005", "145-2005"), ("cucc", "cu115")]:
if primesvx:
if nf[:3] == "all":
assert primesvx[:3] != "all", (name, nf, primesvx, gcavedir, subsvx)
#assert primesvx[:3] != "all", (name, nf, primesvx, gcavedir, subsvx)
primesvx = nf
else:
assert primesvx[:3] == "all", (name, nf, primesvx, gcavedir, subsvx)
#assert primesvx[:3] == "all", (name, nf, primesvx, gcavedir, subsvx)
pass
else:
primesvx = nf
else: