diff options
| -rw-r--r-- | parsers/survex.py | 8 | ||||
| -rw-r--r-- | templates/manywallets.html | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/parsers/survex.py b/parsers/survex.py index 44f72f8..c426c73 100644 --- a/parsers/survex.py +++ b/parsers/survex.py @@ -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)) diff --git a/templates/manywallets.html b/templates/manywallets.html index 5810ac9..6f08def 100644 --- a/templates/manywallets.html +++ b/templates/manywallets.html @@ -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> |