diff options
| author | Philip Sargent <philip.sargent@gmail.com> | 2023-09-11 22:42:12 +0300 |
|---|---|---|
| committer | Philip Sargent <philip.sargent@gmail.com> | 2023-09-11 22:42:12 +0300 |
| commit | af136d34326530b3a8ca2dd6fcd200f7b3914096 (patch) | |
| tree | 3fc8b6dc245a6571af995954d1195fe778f31e0e /parsers/caves.py | |
| parent | d323ff270083ead337f8297653bb833100306999 (diff) | |
| download | troggle-af136d34326530b3a8ca2dd6fcd200f7b3914096.tar.gz troggle-af136d34326530b3a8ca2dd6fcd200f7b3914096.tar.bz2 troggle-af136d34326530b3a8ca2dd6fcd200f7b3914096.zip | |
fixes
Diffstat (limited to 'parsers/caves.py')
| -rw-r--r-- | parsers/caves.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/parsers/caves.py b/parsers/caves.py index 974f73e..d89aae0 100644 --- a/parsers/caves.py +++ b/parsers/caves.py @@ -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, |