diff options
| -rw-r--r-- | core/views/statistics.py | 1 | ||||
| -rw-r--r-- | parsers/survex.py | 10 | ||||
| -rw-r--r-- | templates/survexfilewild.html | 25 |
3 files changed, 33 insertions, 3 deletions
diff --git a/core/views/statistics.py b/core/views/statistics.py index f1b73cc..6c1e538 100644 --- a/core/views/statistics.py +++ b/core/views/statistics.py @@ -82,6 +82,7 @@ def svxfilewild(request, year=None): "wildlength": wildlength, "foreignlength": foreignlength, "year":year, + "expeditions": Expedition.objects.all(), "svxwild": svxwild, "svxforeign": svxforeign} ) diff --git a/parsers/survex.py b/parsers/survex.py index 270bcea..42b71a3 100644 --- a/parsers/survex.py +++ b/parsers/survex.py @@ -26,7 +26,7 @@ todo = """ easier to understand and maintain https://mathspp.com/blog/til/re-match-groupdict -- replace hard-coded instuments list with reding an editable textfile in expoweb. +- replace hard-coded instuments list with reading an editable textfile in expoweb. - Obscure bug in the *team inheritance and rootblock initialization needs tracking down, probably in the team cache which should NOT be global, but should be an instance variable of @@ -1092,6 +1092,13 @@ class LoadingSurvex: # delete the object to save memory survexleg = None + + def LoadSurvexMessteam(self, survexblock, args): + """Interpret the ; Messteam and ; Zeichner records, + Currently this just sets a flag that the survex block is not CUCC + """ + survexblock.foreigners = True + survexblock.save() def LoadSurvexRef(self, survexblock, args): """Interpret the *ref record, and all the many variants @@ -1640,6 +1647,7 @@ class LoadingSurvex: team = self.rx_commteam.match(comment) if team: # print(f'rx_commteam -- {comment=} in {survexblock.survexfile.path} :: {survexblock}') + self.LoadSurvexMessteam(survexblock, comment) pass diff --git a/templates/survexfilewild.html b/templates/survexfilewild.html index b2bb7f3..ce95276 100644 --- a/templates/survexfilewild.html +++ b/templates/survexfilewild.html @@ -3,12 +3,32 @@ {% block content %} + + <h1>'Wild' Survex files</h1> +<p> +{% for otherexpedition in expeditions %} + | <a <a href="/survexfilewild/{{ otherexpedition.year }}">{{otherexpedition.year}}</a> +{% endfor %} -<p>These are survex files which have NO ATTACHED WALLET. +<p>These are survex blocks within a survex file which have NO ATTACHED WALLET. <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. +<p>These have "; Messteam" or "; Zeichner" in the survex block, so are non expo surveys. +<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> +{% for sb in svxforeign %} +<tr> + <td style="text-align:center"> {{ sb }} </td> + <td style="text-align:center"><a href="/wallets/year/{{sb.year}}">{{sb.date }}</a> </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:center"> {{sb.legslength|floatformat:"1g" }}m </td> + +{% endfor %} +</table> +<p>These do not have "; Messteam" or "; Zeichner" in the survex block, so are <em>probably</em> expo surveys; definitely if they have identified team members (or have zero length). <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></tr> {% for sb in svxwild %} @@ -22,7 +42,8 @@ i.e. they have a survex block (begin..end) with no *REF line which refers to the {% endfor %} </table> <br /> -So we are missing {{wildlength|floatformat:"0g"}}m of surveyed cave from our wallet records. +So we are missing {{wildlength|floatformat:"0g"}}m of wild surveyed cave from our wallet records.<br> +and there is {{foreignlength|floatformat:"0g"}}m of foreign (non-expo) surveyed cave from ARGE and others. <br /><br /> If the "team" field is empty, it probably means that it is an ARGE survey (in German) and so we do not recognise any participants as valid 'expo' members. Or it may mean that we did it, but that the survex file has been created since the last database reset. |