diff --git a/core/views/logbooks.py b/core/views/logbooks.py index 8bec554..d7d6b87 100644 --- a/core/views/logbooks.py +++ b/core/views/logbooks.py @@ -30,6 +30,7 @@ def notablepersons(request): def notabilitykey(person): return person.notability() + print(request) persons = Person.objects.order_by('fullname') # From what I can tell, "persons" seems to be the table rows, while "pcols" is the table columns. - AC 16 Feb 09 pcols = [] diff --git a/templates/statistics.html b/templates/statistics.html index 3040c91..4e321bd 100644 --- a/templates/statistics.html +++ b/templates/statistics.html @@ -10,10 +10,16 @@

Number of survey legs: {{nsurvexlegs}}
Total length: {{addupsurvexlength|stringformat:".1f"}} km adding up the total for each year.

-

These are uncorrected tape lengths which include pitches and duplicates but exclude splays or surface-surveys. They are also before any loop-closure corrections. -

+

These lengths are from surveys which have been recorded in expo wallets. Non-expo surveys done by other clubs, and surveys +which have not been properly recorded +in an expo wallet are excluded. +

These are uncorrected tape lengths which include pitches and duplicates but exclude splays or surface-surveys. They are uncorrected +because they are lengths before any loop-closure corrections done by survex. +

This only includes lengths surveyed by expo survey trips (though not all have valid expo-attendees as some survex files are administrative collections of *include statements). This no longer (since 30 June 2025) includes non-expo surveys (ARGE and others). -

This only includes lengths surveyed by Expo survey trips (though not all have valid Expo-attendees as some survex files are administrative collections of *include statements). This no longer (since 30 June 2025) includes non-expo surveys (ARGE and others). +

Authoritative survey lengths for each cave are calculated using a script which uses the +loop-closure corrected lengths and is manually curated to exclude duplicate surveys of the same cave. The results are maintained +in an ODS-format spreadsheet. diff --git a/templates/survexfilewild.html b/templates/survexfilewild.html index 972f56f..35a1f92 100644 --- a/templates/survexfilewild.html +++ b/templates/survexfilewild.html @@ -48,7 +48,7 @@ and there is {{foreignlength|floatformat:"0g"}}m of foreign (non-expo) surveyed 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.
-If the parent block says "troggle _unseens" or "None" then the survex file has not been plumbed in to the expo survex network yet. +If the parent block says "troggle _unseens" or "None" then the survex file has either not been plumbed in to the expo survex network yet, or it is a duplicate survey.
If there is a *ref line of the correct format, then maybe that wallet has not been created yet. Create it, and fill in the data.

@@ -67,11 +67,15 @@ Length of survex data referenced by wallets in this year {{walletslength|floatfo
YearSurvex
Survey
Blocks
Survex
Survey Legs
Survex
length(m)
Caversmeters/caver
-

These are uncorrected tape lengths which include pitches and duplicates but exclude splays or surface-surveys. +

These are uncorrected tape lengths (before loop-closure corrections) which include pitches and duplicates but exclude splays or surface-surveys.

One Survex Survey Block is one *begin/*end block of data in a survex file. Some files from other caving clubs may have a convention of using many more blocks per file than we do, e.g. if the file is exported from other software into survex format.

This only includes lengths surveyed by Expo survey trips (though not all have valid Expo-attendees as some survex files are administrative collections of *include statements). This no longer (since 30 June 2025) includes ARGE and other non-expo surveys. +

Authoritative survey lengths for each cave are calculated using a script which uses the +loop-closure corrected lengths and is manually curated to exclude duplicate surveys of the same cave. The results are maintained +in an ODS-format spreadsheet. + {% endblock %} \ No newline at end of file diff --git a/urls.py b/urls.py index ba19397..b36de61 100644 --- a/urls.py +++ b/urls.py @@ -161,7 +161,7 @@ trogglepatterns = [ re_path(r'^caves$', cavesall, name="cavesall"), re_path(r'^indxal.htm$', cavesall, name="cavesall"), # ~420 hrefs to this url in expoweb files - re_path(r'^people/?$', notablepersons, name="notablepersons"), + path('people', notablepersons, name="notablepersons"), path('people_ids', people_ids, name="people_ids"), path('folk_export', folk_export, name="folk_export"), path('caveslist', caveslist, name="caveslist"),