diff --git a/parsers/survex.py b/parsers/survex.py index e9c3f6073..e6e1d727f 100644 --- a/parsers/survex.py +++ b/parsers/survex.py @@ -300,7 +300,7 @@ class LoadingSurvex: rx_argsref = re.compile(r"(?i)^[\s.:]*((?:19[6789]\d)|(?:20[012345]\d))\s*#?\s*(X)?\s*(.*?\d+.*?)$") rx_badmerge = re.compile(r"(?i).*(\>\>\>\>\>)|(\=\=\=\=\=)|(\<\<\<\<\<).*$") rx_ref2 = re.compile(r"(?i)\s*ref[.;]?") - rx_commteam = re.compile(r"(?i)\s*(Messteam|Zeichner|LUSS Dead Mountains)\s*[:]?(.*)") # non-expo survex files + rx_commteam = re.compile(r"(?i)\s*(Messteam|Zeichner|Gerätefehler|LUSS Dead Mountains)\s*[:]?(.*)") # non-expo survex files rx_quotedtitle = re.compile(r'(?i)^"(.*)"$') # QM recognizers diff --git a/templates/survexfilewild.html b/templates/survexfilewild.html index 9c4dabedc..a33f07293 100644 --- a/templates/survexfilewild.html +++ b/templates/survexfilewild.html @@ -14,10 +14,10 @@
These are survex blocks within a survex file which have NO ATTACHED WALLET.
i.e. they have a survex block (begin..end) with no *REF line which refers to the wallet holding the raw data for that block of data.
-
These have "; Messteam", "; Zeichner" or "; "LUSS Dead Mountains" in the survex block, so are non expo surveys. +
These have "; Messteam", "; Zeichner", "; Gerätefehler:" or "; "LUSS Dead Mountains" in the survex block, so are non expo surveys.
| survex block with no *ref | date | parent block | within survex file | surveyed length | -Foreign? | *ref text | +*ref text |
|---|---|---|---|---|---|---|---|
| {{sb.parent }} | {{sb.survexfile.path}} | {{sb.legslength|floatformat:"1g" }}m | -{% if sb.foreigners %} ✔ {% endif %} | {% if sb.ref_text %}{{sb.ref_text|truncatechars:50 }}{% endif %} | {% endfor %}
These do not have "; Messteam", "; Zeichner" or "; "LUSS Dead Mountains" in the survex block, so are probably expo surveys; definitely if they have identified expo team members (or have zero length). -
If there is a tick on the "Foreign?" field it means that one of the team members has been recognised as a known "foreigner", -probably from a "; Messteam:" line. +
These do not have "; Messteam", "; Zeichner", "; Gerätefehler:" or "; "LUSS Dead Mountains" in the survex block, so are probably expo surveys; definitely if they have identified expo team members (or have zero length).
| survex block with no *ref | date | parent block | within survex file | surveyed length | team | Foreign? | *ref text |
|---|---|---|---|---|---|---|---|
| survex block with no *ref | date | parent block | within survex file | surveyed length | team | *ref text | |
| {{ sb }} | @@ -44,7 +41,6 @@ probably from a "; Messteam:" line.{{sb.survexfile.path}} | {{sb.legslength|floatformat:"1g" }}m | {{sb.team|truncatechars:50 }} | -{% if sb.foreigners %} ✔ {% endif %} | {% if sb.ref_text %}{{sb.ref_text|truncatechars:50 }}{% endif %} |