2
0
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-12-15 12:37:10 +00:00
This commit is contained in:
2023-09-11 22:42:12 +03:00
parent d323ff2700
commit af136d3432
3 changed files with 11 additions and 10 deletions

View File

@@ -111,7 +111,7 @@ def create_new_cave(svxpath, msg=None):
# e.g. svxpath = "caves-1623/666/beast" .svx
print(f"Create new cave at {svxpath} - {msg}")
#
survex_file = svxpath + ".svx"
survex_file = svxpath.replace("caves-","") + ".svx"
parts = svxpath.split("/")
a = parts[0][-4:]
caveid = parts[1]
@@ -149,11 +149,13 @@ def create_new_cave(svxpath, msg=None):
cave.save()
return cave
def do_ARGE_cave(slug, caveid, svxurl, areacode, svxid):
def do_ARGE_cave(slug, caveid, areacode, svxid):
"""Only called by survex parser, NOT the cave parser.
Creates a new Cave object, but with abbreviated data as the survex file (from ARGE) is all we have.
We already know the survex file.
We already know that the cave doesn't exist... though there are bugs..
caveid may be kataster number or it may be e.g. LA34
"""
default_note = "This is an ARGE cave where we only have the survex file and no other information"
@@ -180,12 +182,12 @@ def do_ARGE_cave(slug, caveid, svxurl, areacode, svxid):
line2 = s.readline()
line3 = s.readline()
else:
print(f"not correct {sv}", file=sys.stderr)
print(f"not correct svxid {svxid} {sv}", file=sys.stderr)
cave = Cave(
underground_description="ARGE cave.\n3 lines of the survexfile:\n" + line1 +line2 +line3,
underground_description="ARGE cave.<br>3 lines of the survexfile:<br><pre>" + line1 +line2 +line3 +"</pre>",
unofficial_number="ARGE",
survex_file= svxurl,
survex_file= f"{svxid}.svx",
url=url,
notes=default_note,
areacode=areacode,