2
0
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-21 23:01:52 +00:00

error msg was incorrect. fix.

This commit is contained in:
Philip Sargent 2022-09-26 00:18:41 +03:00
parent f0195682f2
commit 78a62a1551
2 changed files with 8 additions and 2 deletions

View File

@ -757,7 +757,11 @@ class LoadingSurvex():
with open(fpending, "r") as fo:
cids = fo.readlines()
for cid in cids:
self.pending.add(cid.rstrip('\n').upper())
id = cid.rstrip('\n').upper()
if cid.startswith("162"):
self.pending.add(id)
else:
self.pending.add("1623-" + id)
if headpath in self.ignorenoncave:
message = f" - {headpath} is <ignorenoncave> (while creating '{includelabel}' sfile & sdirectory)"
@ -776,7 +780,7 @@ class LoadingSurvex():
# print(f'! ALREADY PENDING {caveid}',file=sys.stderr)
return
message = f" ! Error: not a cave nor ignorable. headpath:'{headpath}' while parsing '{includelabel=}.svx' at depth:[{len(depth)}]. ignore prefix list:'{self.ignoreprefix}'"
message = f" ! Error: {caveid} not a cave nor ignorable. headpath:'{headpath}' while parsing '{includelabel=}.svx' at depth:[{len(depth)}]. ignore prefix list:'{self.ignoreprefix}'"
print("\n"+message)
print("\n"+message,file=sys.stderr)
DataIssue.objects.create(parser='survex', message=message, url=get_offending_filename(headpath))

View File

@ -9,6 +9,8 @@
plans and elevations. It also contains scans of centre-line survex output on which
hand-drawn passage sections are drawn. These hand-drawn passages will eventually be
traced to produce Tunnel or Therion drawings and eventually the final complete cave survey.
<p>Cave identifiers in italics are derived from the current setting in the metdata JSON file,
otherwise they come from *ref statements in survex files as of the most recent data import.
<p>See also wallets
<ul>
<li>per year, e.g. <a href="/wallets/year/2018">2018</a>, <a href="/wallets/year/2019">2019</a>, <a href="/wallets/year/2022">2022</a>