From 4933515be64fadd509d7540970e419fdc6c771a3 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Thu, 28 Aug 2025 23:35:09 +0300 Subject: [PATCH] stop verbose warnings, change colour on cave names --- parsers/survex.py | 13 ++++++------- templates/cave_red_star.html | 6 +++--- templates/cavelist_columns.html | 6 +++--- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/parsers/survex.py b/parsers/survex.py index cc04f9e..00afad5 100644 --- a/parsers/survex.py +++ b/parsers/survex.py @@ -1654,15 +1654,14 @@ class LoadingSurvex: This _should_ also check that the first QM survey point exists in the block in this survex file. """ - message = f' ! QM "{survexblock.survexfile.path}" line:{comment} {qml=}' - print(message, file=sys.stderr) qml = self.rx_qm_digit.match(comment) # checks for valid QM digit(s) if not qml: - message = f' ! QM Unrecognised QM number in "{survexblock.survexfile.path}" line:{comment}' - print(message) - stash_data_issue( - parser="survex", message=message, url=None, sb=(survexblock.survexfile.path) - ) + if not comment.startswith("QM doesn't go anywhere"): + message = f' ! QM Unrecognised QM number in "{survexblock.survexfile.path}" line:{comment}' + print(message) + stash_data_issue( + parser="survex", message=message, url=None, sb=(survexblock.survexfile.path) + ) return False qmline = self.rx_qm.match(comment) if qmline: diff --git a/templates/cave_red_star.html b/templates/cave_red_star.html index 5a28596..01c271b 100644 --- a/templates/cave_red_star.html +++ b/templates/cave_red_star.html @@ -1,7 +1,7 @@ -Red star * against a name indicates that no survex file is explicitly associated with the cave
-Blue star * against a name indicates that no survex file is explicitly associated with the cave but it is marked as 'fully explored'
+Red star against a name indicates that no survex file is explicitly associated with the cave
+Blue star against a name indicates that no survex file is explicitly associated with the cave but it is marked as 'fully explored'
Blue triangle against a name indicates that the cave is 'pending' creation properly.
Orange triangle against a name indicates that the cave has no Entrance (and is not 'pending').
Black triangle against a name indicates that the cave has an Entrance, but no entrances have valid located survey stations.
Red triangle against a name indicates that the cave has unticked QMs
-Cavename in red means that the cave is undescended/unexplored. \ No newline at end of file +Cavename in this colour means that the cave is undescended/unexplored. \ No newline at end of file diff --git a/templates/cavelist_columns.html b/templates/cavelist_columns.html index ffe7378..754250e 100644 --- a/templates/cavelist_columns.html +++ b/templates/cavelist_columns.html @@ -1,6 +1,6 @@ {% if cave.unexplored %} - + {% else %} {% endif %} @@ -21,9 +21,9 @@ {% endif %} {% if cave.survex_file %}{% else %} {% if cave.fully_explored %} - * + {% else %} - * + {% endif %} {% endif %} {% if cave.any_qm_open %}{% endif %}