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

trap bug that Tom B found

Browse Source
This commit is contained in:
Philip Sargent
2025-07-26 22:56:08 +02:00
parent df0ea7ab30
commit f0c5168067
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
parsers/survex.py
View File

@@ -2652,10 +2652,20 @@ def parse_one_file(fpath): # --------------------------------------in progress--
"""
cave = find_cave_from_path(svxpath)
if cave:
cave_svxpath = cave.survex_file[:-4] # remove .svx
fileroot = SurvexFile.objects.get(path=cave_svxpath)
print(f" - Setting the root survexfile for this import: {svxpath} to be that for cave {cave}")
if cave.survex_file: # i.e. cave has been fully created and has a value for this
cave_svxpath = cave.survex_file[:-4] # remove .svx
else:
cave.survex_file = svxpath + ".svx"
save(cave)
cave_svxpath = svxpath
try:
fileroot = SurvexFile.objects.get(path=cave_svxpath)
except:
fileroot = SurvexFile.objects.create(path=cave_svxpath, cave=cave)
print(f" !! - No SurvexFile object found for {svxpath=}, making a new one..")
print(f" - Setting the root survexfile for this import: {svxpath} to be that for cave {cave} {cave.survex_file=}")
return fileroot
# make a dummy SurvexFile object, which will be removed later
dummyroot = SurvexFile(path=svxpath)