expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2024-11-22 07:11:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

bad urls fixed using online forms

Browse Source
This commit is contained in:
Philip Sargent 2021-04-05 00:27:24 +01:00
parent 51f0450df5
commit bf13a4b743
9 changed files with 52 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
cave_data/1623-288.html
View File

@ -1,46 +1,41 @@
<!DOCTYPE html><!-- THIS IS INFO FOR ONE CAVE--> <!DOCTYPE html>
<!-- Only put one cave in this file (it may have multiple entrances) --> <!-- This file is generated using the form documented at /handbook/survey/caveentry.html -->
<!-- If you edit this file, make sure it is uploaded (pushed) to the expoweb repository (cave folder) and that you have added one or more entrance files to the entrances folder--> <!-- Only put one cave in this file -->
<!-- If you edit this file by hand, make sure you update the database by doing a full data import -->
<html lang="en"> <html lang="en">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title></title> </head>
<link rel="stylesheet" type="text/css" href="/css/main2.css" /></head>
<body> <body>
<cave> <cave>
<non_public>False</non_public> <non_public>False</non_public>
<caveslug>1623-288</caveslug> <caveslug>1623-288</caveslug>
<official_name>Lila Lupinenh&ouml;hle</official_name><!-- Use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck--> <official_name>Lila Lupinenh&ouml;hle</official_name>
<area>1623</area> <area>1623</area>
<area></area> <area></area>
<kataster_code></kataster_code> <kataster_code></kataster_code>
<kataster_number>288</kataster_number> <kataster_number>288</kataster_number>
<unofficial_number>2015-mf-06</unofficial_number> <unofficial_number>2015-mf-06</unofficial_number>
<!-- Add one entrance stanza for each entrance-->
<entrance> <entrance>
<entranceslug>1623-288</entranceslug> <!-- Internal ID to refer to each entrance instance in the entrance files (typically the same as that filename (e.g. 1623-161c). Matches the 'slug' field in the entrance file --> <entranceslug>1623-288</entranceslug>
<letter></letter> <!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID. --> <letter></letter>
</entrance> </entrance>
<explorers><p>CUCC 2015</p></explorers> <!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. --> <explorers><p>CUCC 2015</p></explorers>
<underground_description></underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. --> <underground_description></underground_description>
<equipment><p></p></equipment> <equipment><p></p></equipment>
<references><p></references></p><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. --> <references><p></references>
<survey><p></p></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. --> <survey><p></p></survey>
<kataster_status></kataster_status> <kataster_status></kataster_status>
<underground_centre_line></underground_centre_line> <underground_centre_line></underground_centre_line>
<notes></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost --> <notes></notes>
<length></length> <length></length>
<depth></depth> <depth></depth>
<extent></extent> <extent></extent>
<survex_file>caves-1623/288/288.svx</survex_file> <!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves/cavenum/cavnum.svx". (e.g. caves/204/204.svx --> <survex_file>caves-1623/2015-mf-06/2015-mf-06.svx</survex_file>
<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. --> <description_file></description_file>
<url>1623/288/288.html</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum.html, e.g ('1623/165.html')--> <url>1623/288/288.html</url>
</cave> </cave>
</body> </body>
</html> </html>

4
cave_data/1623-76.html
View File

@ -35,8 +35,8 @@
<underground_description><ul><li><a href="entrance.htm">Entrance Series</a></li><li><a href="70sroute.htm">1970's Route</a></li><li><a href="keg.htm">Keg Series</a></li><li><a href="brave.htm">Brave New World</a></li></ul></underground_description> <underground_description><ul><li><a href="entrance.htm">Entrance Series</a></li><li><a href="70sroute.htm">1970's Route</a></li><li><a href="keg.htm">Keg Series</a></li><li><a href="brave.htm">Brave New World</a></li></ul></underground_description>
<equipment></equipment> <equipment></equipment>
<references>The exploration is written up in many places:</p><ul><li><a href="../../years/1977/report.htm#youth">Cambridge Underground 1978</a></li><li><a href="../../years/1977/771649.htm">Belfry Bulletin 354</a>, Nick Thorne</li><li><a href="../../years/1978/report.htm#ropes">Cambridge Underground 1979</a></li><li><a href="../../years/1978/bcracc.htm">BCRA Caves &amp; Caving 2</a>, Andy Waddington </li><li><a href="../../years/1978/npc79.htm">Northern Pennine Club Journal vol 3 no. 2, 1979</a>, Andy Waddington, Simon Farrow</li><li><a href="../../years/1978/descnt.htm">Descent 40 (Jan/Feb 1979)</a>, Nick Thorne</li><li><a href="../../years/1978/782034.htm">Belfry Bulletin 366 (Oct 1978)</a>, Nick Thorne</li><li><a href="../../years/1979/report.htm">Cambridge Underground 1980</a></li><li><a href="../../years/1979/descnt.htm">Descent 44</a>, Nick Thorne</li><li><a href="../../years/1979/792026.htm">Belfry Bulletin 378</a>, Nick Thorne</li><li><a href="../../years/1979/bcracc.htm">BCRA Caves &amp; Caving 8</a>, Andy Waddington</li><li><a href="../../years/1977/andylg.htm#id1977-76-1">Logbook accounts</a></li><li><a href="histry.htm">Trip index</a></li><li><a href="../../years/1979/811412.htm">Speleo Krakow 1/2 Dec 1980</a>, Andy Waddington</li></ul><p>This last item, the only complete write up of 1977-79, appeared in Polish translation, and is published in the English original for the first time here.</references> <references>The exploration is written up in many places:</p><ul><li><a href="../../years/1977/report.htm#youth">Cambridge Underground 1978</a></li><li><a href="../../years/1977/771649.htm">Belfry Bulletin 354</a>, Nick Thorne</li><li><a href="../../years/1978/report.htm#ropes">Cambridge Underground 1979</a></li><li><a href="../../years/1978/bcracc.htm">BCRA Caves &amp; Caving 2</a>, Andy Waddington </li><li><a href="../../years/1978/npc79.htm">Northern Pennine Club Journal vol 3 no. 2, 1979</a>, Andy Waddington, Simon Farrow</li><li><a href="../../years/1978/descnt.htm">Descent 40 (Jan/Feb 1979)</a>, Nick Thorne</li><li><a href="../../years/1978/782034.htm">Belfry Bulletin 366 (Oct 1978)</a>, Nick Thorne</li><li><a href="../../years/1979/report.htm">Cambridge Underground 1980</a></li><li><a href="../../years/1979/descnt.htm">Descent 44</a>, Nick Thorne</li><li><a href="../../years/1979/792026.htm">Belfry Bulletin 378</a>, Nick Thorne</li><li><a href="../../years/1979/bcracc.htm">BCRA Caves &amp; Caving 8</a>, Andy Waddington</li><li><a href="../../years/1977/andylg.htm#id1977-76-1">Logbook accounts</a></li><li><a href="histry.htm">Trip index</a></li><li><a href="../../years/1979/811412.htm">Speleo Krakow 1/2 Dec 1980</a>, Andy Waddington</li></ul><p>This last item, the only complete write up of 1977-79, appeared in Polish translation, and is published in the English original for the first time here.</references>
<survey><p>The lower parts of the 1970s surveys are based on measurement of rope lengths and thus probably best categorised as Grade 2. The 2004 resurveyed depth for the taproom agrees closely with the 1970s surveys: <ul><li> <a href="../../years/1977/106.png">After first year of exploration (1977)</a></li><li> <a href="../../years/1978/106.png">After 1978 exploration</a></li><li> After 1979, the end of the original 1970's exploration: <a href="76upper.png">Upper half</a> and <a href="76lower.png">Lower half</a></li><li> <a href="76_final_col_small.png">2004 new exploration and resurvey down to the taproom</a></li><li> <a href="76_A2_2005.png">2005 exploration and resurvey down to spent ledge</a> <survey><p>The lower parts of the 1970s surveys are based on measurement of rope lengths and thus probably best categorised as Grade 2. The 2004 resurveyed depth for the taproom agrees closely with the 1970s surveys: <ul><li> <a href="../../years/1977/106.png">After first year of exploration (1977)</a></li><li> <a href="../../years/1978/106.png">After 1978 exploration</a></li><li> After 1979, the end of the original 1970's exploration: <a href="76upper.png">Upper half</a> and <a href="76lower.png">Lower half</a></li><li> <a href="76_final_col_small.png">2004 new exploration and resurvey down to the taproom</a></li><li> <a href="76_A2_2005.jpg">2005 exploration and resurvey down to spent ledge</a>
[<a href="/expofiles/surveys/76/72_A2_2005.png">More detailed 3,182kB image</a>]</ul></p></survey> [<a href="/expofiles/surveys/76/76_A2_2005.png">More detailed 3,182kB image</a>]</ul></p></survey>
<kataster_status></kataster_status> <kataster_status></kataster_status>
<underground_centre_line>Data for the sections covered so far by the resurvey project begun in 2004 can be downloaded as a <a href="76.3d">.3d file</a>.</underground_centre_line> <underground_centre_line>Data for the sections covered so far by the resurvey project begun in 2004 can be downloaded as a <a href="76.3d">.3d file</a>.</underground_centre_line>
<notes></notes> <notes></notes>

BIN
handbook/i/76-clipart.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 273 KiB

4
handbook/survey/how.htm
View File

@ -26,8 +26,8 @@ chance to survey, on the derigging trip of a cave which is now "finished"),
it is better to record all the passage, rather than part of it to a very high it is better to record all the passage, rather than part of it to a very high
standard. Particularly to be avoided is a survey that doesn't connect to the standard. Particularly to be avoided is a survey that doesn't connect to the
rest of the cave.</p> rest of the cave.</p>
<p><img class="onleft" width=70% src ="../i/76-clipart.png" />
<p>You are collecting data to fulfill a number of needs: the actual position You are collecting data to fulfill a number of needs: the actual position
of the passage for finding where it goes and possible connections; the shape of the passage for finding where it goes and possible connections; the shape
of it for drawing pretty surveys; the location of possible leads for future of it for drawing pretty surveys; the location of possible leads for future
exploration; geological info for working out how it got there.</p> exploration; geological info for working out how it got there.</p>

2
handbook/survey/index.htm
View File

@ -13,7 +13,7 @@ Janet &amp; John document their cave</p>
<p style="text-align: center; font-size: 120%; font-style: italic">Mostly by Wookey and Andy Waddington (1999)</p> <p style="text-align: center; font-size: 120%; font-style: italic">Mostly by Wookey and Andy Waddington (1999)</p>
<h3>Introduction</h3> <h3>Introduction</h3>
<img class="onright" src ="../t/76-clipart.jpg" />
<p>This part of the Expedition Handbook is about documentation - recording what <p>This part of the Expedition Handbook is about documentation - recording what
the expedition found for posterity and so future expeditions have something to the expedition found for posterity and so future expeditions have something to
build upon. Mostly this means producing a good <b>survey</b> of each cave, but build upon. Mostly this means producing a good <b>survey</b> of each cave, but

BIN
handbook/t/76-clipart.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 82 KiB

12
handbook/troggle/trog2030.html
View File

@ -59,7 +59,14 @@ Documentation is the key to keeping troggle in a state where someone can pick it
<p> <p>
New functionality: e.g. making the whole thing GIS-centric is a possibility. New functionality: e.g. making the whole thing GIS-centric is a possibility.
A GIS db could make a lot of sense. Not in scope for this discussion. A GIS db could make a lot of sense. Not in scope for this discussion.
<p>There is not yet a front-end (javascript) framework on the client, i.e. a phone app or webpage, which is stable enough for us to commit effort to. Bits of troggle use very old jQuery ("edit this page", and the svx file editor) , and Flask looks interesting, but maybe in 2025 we could see a good way to move all the user interface to the client and just have an API on the server. <p>There is not yet a front-end (javascript) framework on the client, i.e. a phone app or webpage, which is stable enough for us to commit
effort to. Bits of troggle use very old jQuery ("edit this page", and the svx file editor) , and Flask looks interesting
(but <a href="https://adamj.eu/tech/2019/04/03/django-versus-flask-with-single-file-applications/">maybe is only simpler when
starting a new project and doesn't scale to complexity</a> the way Django does, but maybe in 2025 we
could see a good way to move all the user interface (rewritten to be GIS-centric) to the client
(re-written in <a href="https://www.educba.com/typescript-vs-dart/">Typescript
or Dart</a>) and just have an API on the server. [We already have a proof of principle JSON export API working at
<a href="http://expo.survex.com/api/expeditions_json">expo.survex.com/api/expeditions_json</a>.]
<h3>API</h3> <h3>API</h3>
<p>We will also need an API now-ish, whatever we do, so that keen kids can write their own special-purpose front-ends using new cool toys. Which will keep them out of our hair. We can do this easily with Django templates that generate JSON, which is <a href="https://www.cuyc.org.uk/committee/events_json_short/">what CUYC do</a> <p>We will also need an API now-ish, whatever we do, so that keen kids can write their own special-purpose front-ends using new cool toys. Which will keep them out of our hair. We can do this easily with Django templates that generate JSON, which is <a href="https://www.cuyc.org.uk/committee/events_json_short/">what CUYC do</a>
@ -69,8 +76,7 @@ A GIS db could make a lot of sense. Not in scope for this discussion.
<p> <p>
So a useful goal, I think, is to make 'troggle2' accessible to a generic python programmer with no specialist skills in any databases or frameworks. Put against that is the argument that that might double the volume of code to be maintained, which would be worse. Nevertheless, an aim to keep in mind. So a useful goal, I think, is to make 'troggle2' accessible to a generic python programmer with no specialist skills in any databases or frameworks. Put against that is the argument that that might double the volume of code to be maintained, which would be worse. Nevertheless, an aim to keep in mind.
But even 'just Python' is not that easy. Python is a much bigger language now than it used to be, with some esoteric corners. (Some of which could be very useful, such as the self-testing unit test But even 'just Python' is not that easy. Python is a much bigger language now than it used to be, with some esoteric corners.
capability: <a href="https://docs.python.org/3.8/library/doctest.html">docs.python.org/3.8/library/doctest</a> )

19
handbook/troggle/trogsimpler.html
View File

@ -15,8 +15,11 @@ Day to day cave recording and surveying tasks are documented
in the expo "survey handbook" in the expo "survey handbook"
<h3>stroggle</h3> <h3>stroggle</h3>
<p>At one time Martin Green attempted to reimplement troggle as "stroggle" using <a href="https://www.fullstackpython.com/flask.html">flask</a> instead of Django at <p>At one time Martin Green attempted to reimplement troggle as "stroggle" using <a href="https://www.fullstackpython.com/flask.html">flask</a> instead of Django at
<a href="https://en.wikipedia.org/wiki/Gitorious">git@gitorious.org:stroggle/stroggle.git</a> (but gitorious has been deleted).</p> <a href="https://en.wikipedia.org/wiki/Gitorious">git@gitorious.org:stroggle/stroggle.git</a> (but gitorious has been deleted).
</p>
<p>A copy of this project is archived by Wookey on <a href="http://wookware.org/software/cavearchive/stroggle/">wookware.org/software/cavearchive/stroggle/</a>. <p>A copy of this project is archived by Wookey on <a href="http://wookware.org/software/cavearchive/stroggle/">wookware.org/software/cavearchive/stroggle/</a>.
<p>(but <a href="https://adamj.eu/tech/2019/04/03/django-versus-flask-with-single-file-applications/">maybe is only simpler when
starting a new project and doesn't scale to complexity</a> the way Django does?)
<p>There is also a copy of stroggle on the backed-up, read-only copy of gitorious on "<a href="https://gitorious.org/">gitorious valhalla</a>"<br /> <p>There is also a copy of stroggle on the backed-up, read-only copy of gitorious on "<a href="https://gitorious.org/">gitorious valhalla</a>"<br />
<a href="https://gitorious.org/stroggle/stroggle.git/">stroggle code</a></br> <a href="https://gitorious.org/stroggle/stroggle.git/">stroggle code</a></br>
<a href="https://gitorious.org/stroggle/stroggle-gitorious-wiki.git/">stroggle-gitorious-wiki</a></br> <a href="https://gitorious.org/stroggle/stroggle-gitorious-wiki.git/">stroggle-gitorious-wiki</a></br>
@ -68,12 +71,12 @@ But it has to be said that the
<a href="https://docs.djangoproject.com/en/2.1/ref/templates/builtins/#std:templatefilter-dictsort">django <a href="https://docs.djangoproject.com/en/2.1/ref/templates/builtins/#std:templatefilter-dictsort">django
HTML templating mechanism</a> is sufficiently powerful that it does almost HTML templating mechanism</a> is sufficiently powerful that it does almost
amount to an additional language to learn. amount to an additional language to learn.
<p>Troggle has 66 different url recognisersand there are 71 HTML django <p>Troggle has 66 different url recognisers and there are 71 HTML django
template files which the recognisers direct to. template files which the recognisers direct to.
Not all page templates are currently used but still some kind of templating system would seem to be Not all page templates are currently used but still some kind of templating system would seem to be
probably necessary.</p> probably necessary for sanity and maintenance self-documentation.</p>
<p>The django system is sufficiently well-thought-of <p>The django system is sufficiently well-thought-of
that it forms the basis for the framework-independent templaing engine that it forms the basis for the framework-independent templating engine
<a href="https://jinja.palletsprojects.com/en/2.11.x/">Jinja</a> - and that site has a good discussion <a href="https://jinja.palletsprojects.com/en/2.11.x/">Jinja</a> - and that site has a good discussion
on whether templating is a good thing or not. There are about on whether templating is a good thing or not. There are about
<a href="https://wiki.python.org/moin/Templating">20 different python template engines</a>.] <a href="https://wiki.python.org/moin/Templating">20 different python template engines</a>.]
@ -121,9 +124,13 @@ exist
[This vastly underestimates the number of things that troggle does for us. [This vastly underestimates the number of things that troggle does for us.
See "<a href="/expofiles/documents/troggle/troggle2020.pdf" download> See "<a href="/expofiles/documents/troggle/troggle2020.pdf" download>
Troggle: a revised system for cave data management</a>"</em>.] And a VM is not required to run and debug troggle. Troggle: a revised system for cave data management</a>"</em>.] And a VM is not required to run and debug troggle.
Sam has produced a docker variant which he uses extensively. Sam has produced a docker variant which he uses extensively and I run it directly on local
<a href="https://ubuntu.com/wsl">WSL/Ubuntu</a> in Windows10.
<p>Troggle today has 6,400 non-comment lines of python and 2,500 non-comment lines of django HTML template code. Plus there is the integration with the in-browser HTML editor in JavaScript. Half of the python is in the parsers which will not change whatever we do. Django itself is much, much bigger and includes all the security middleware necessary in the web today. <p>Troggle today has 6,400 non-comment lines of python and 2,500 non-comment lines of django HTML template code. Plus there is the integration with the in-browser HTML editor in JavaScript. Half of the python is in the parsers which will not change whatever we do. Django itself is much, much bigger and includes all the security middleware necessary in the web today.
<p>But maintaining the code with the regular Django updates is <a href="trogdjango.html">a heavy job</a>.] <p>But maintaining the code with the regular Django updates is <a href="trogdjango.html">a heavy job</a>.
<p><em>"the horrifying url rewrites that correspond to no files"</em> were bugs introduced by people who edited troggle without knowing what they were doing. We now have a test suite and these have all been fixed.
<p>Troggle is now packaged such that it can run entirely on a standalone laptop and re-loads from scratch in 2 minutes, not 5 hours. So if one has a microSD card with 40GB of historical scanned images and photos, it will run on any Windows or Linux laptop. Even at top camp.
]
</div> </div>
How much work would this actually take: How much work would this actually take:
<ul> <ul>

8
piclinks/ssvypl.htm
View File

@ -8,7 +8,13 @@ Surface Survey - Stellerweg area
<body> <body>
<div class="centre"><img src="../images/ssvypl.jpg" width="486" height="487" alt="" /></div> <div class="centre"><img src="../images/ssvypl.jpg" width="486" height="487" alt="" /></div>
<p>Pete Lancaster surface surveying on the SE slopes of the Vorderer <p>Pete Lancaster surface surveying on the SE slopes of the Vorderer
Schwarzmooskogel, above the Stellerwegh&ouml;hle system.</p> Schwarzmooskogel in 1983, above the Stellerwegh&ouml;hle system.</p>
<p>This was the first attempt to find surface entrances corresponding to the large phreatic level
of the 'Dartford Tunnel' area in 115, and specifically to find the surface location of the very
string outward draft at the end of the Fuitility Series (Nutzlos) found by Chas and Phil Sargent.
Phil had another look for these hoped-for entrances in 2018 and 2019, and learned that GPS altitudes are too poor
to be useful. We need to do more surface suyveying like this!
<p class="caption">Photo &copy; Chas. Butcher, 1983. lookfutile.svx</p> <p class="caption">Photo &copy; Chas. Butcher, 1983. lookfutile.svx</p>
<!-- Photo 195, Photo-CD 6121 1651 2353 img 35 --> <!-- Photo 195, Photo-CD 6121 1651 2353 img 35 -->