expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2026-02-08 07:40:19 +00:00
Code Issues 18 Projects 3 Activity

better unwalleted survex report

Browse Source
This commit is contained in:
Philip Sargent
2025-10-21 14:16:08 +03:00
parent 7daef9f253
commit ac50d28d36
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
parsers/survex.py
View File

@@ -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_argsref = re.compile(r"(?i)^[\s.:]*((?:19[6789]\d)|(?:20[012345]\d))\s*#?\s*(X)?\s*(.*?\d+.*?)$")
rx_badmerge = re.compile(r"(?i).*(\>\>\>\>\>)|(\=\=\=\=\=)|(\<\<\<\<\<).*$") rx_badmerge = re.compile(r"(?i).*(\>\>\>\>\>)|(\=\=\=\=\=)|(\<\<\<\<\<).*$")
rx_ref2 = re.compile(r"(?i)\s*ref[.;]?") 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)^"(.*)"$') rx_quotedtitle = re.compile(r'(?i)^"(.*)"$')
# QM recognizers # QM recognizers

12
templates/survexfilewild.html
View File

@@ -14,10 +14,10 @@
<p>These are survex blocks within a survex file which have NO ATTACHED WALLET. <p>These are survex blocks within a survex file which have NO ATTACHED WALLET.
<br /> <br />
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. 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.
<p>These have "; Messteam", "; Zeichner" or "; "LUSS Dead Mountains" in the survex block, so are non expo surveys. <p>These have "; Messteam", "; Zeichner", "; Gerätefehler:" or "; "LUSS Dead Mountains" in the survex block, so are non expo surveys.
<table> <table>
<tr><th>survex block with no *ref</th><th>date</th><th>parent block</th><th>within survex file</th><th>surveyed length</th> <tr><th>survex block with no *ref</th><th>date</th><th>parent block</th><th>within survex file</th><th>surveyed length</th>
<th>Foreign?</th><th>*ref text</th> <th>*ref text</th>
</tr> </tr>
{% for sb in svxforeign %} {% for sb in svxforeign %}
<tr> <tr>
@@ -26,16 +26,13 @@ i.e. they have a survex block (begin..end) with no *REF line which refers to the
<td style="text-align:center"> {{sb.parent }} </td> <td style="text-align:center"> {{sb.parent }} </td>
<td style="text-align:left"> <a href="{% url "svx" sb.survexfile.path %}">{{sb.survexfile.path}}</a> </td> <td style="text-align:left"> <a href="{% url "svx" sb.survexfile.path %}">{{sb.survexfile.path}}</a> </td>
<td style="text-align:center"> {{sb.legslength|floatformat:"1g" }}m </td> <td style="text-align:center"> {{sb.legslength|floatformat:"1g" }}m </td>
<td style="text-align:center"> {% if sb.foreigners %} &#10004; {% endif %}</td>
<td style="text-align:left"> {% if sb.ref_text %}{{sb.ref_text|truncatechars:50 }}{% endif %} </td> <td style="text-align:left"> {% if sb.ref_text %}{{sb.ref_text|truncatechars:50 }}{% endif %} </td>
{% endfor %} {% endfor %}
</table> </table>
<p>These do not have "; Messteam", "; Zeichner" or "; "LUSS Dead Mountains" in the survex block, so are <em>probably</em> expo surveys; definitely if they have identified expo team members (or have zero length). <p>These do not have "; Messteam", "; Zeichner", "; Gerätefehler:" or "; "LUSS Dead Mountains" in the survex block, so are <em>probably</em> expo surveys; definitely if they have identified expo team members (or have zero length).
<p>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.
<table> <table>
<tr><th>survex block with no *ref</th><th>date</th><th>parent block</th><th>within survex file</th><th>surveyed length</th><th>team</th><th>Foreign?</th><th>*ref text</th></tr> <tr><th>survex block with no *ref</th><th>date</th><th>parent block</th><th>within survex file</th><th>surveyed length</th><th>team</th><th>*ref text</th></tr>
{% for sb in svxwild %} {% for sb in svxwild %}
<tr> <tr>
<td style="text-align:center"> {{ sb }} </td> <td style="text-align:center"> {{ sb }} </td>
@@ -44,7 +41,6 @@ probably from a "; Messteam:" line.
<td style="text-align:left"> <a href="{% url "svx" sb.survexfile.path %}">{{sb.survexfile.path}}</a> </td> <td style="text-align:left"> <a href="{% url "svx" sb.survexfile.path %}">{{sb.survexfile.path}}</a> </td>
<td style="text-align:center"> {{sb.legslength|floatformat:"1g" }}m </td> <td style="text-align:center"> {{sb.legslength|floatformat:"1g" }}m </td>
<td style="text-align:center"> {{sb.team|truncatechars:50 }} </td> <td style="text-align:center"> {{sb.team|truncatechars:50 }} </td>
<td style="text-align:center"> {% if sb.foreigners %} &#10004; {% endif %}</td>
<td style="text-align:left"> {% if sb.ref_text %}{{sb.ref_text|truncatechars:50 }}{% endif %} </td> <td style="text-align:left"> {% if sb.ref_text %}{{sb.ref_text|truncatechars:50 }}{% endif %} </td>
</tr> </tr>
{% endfor %} {% endfor %}