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

Merge remote-tracking branch 'refs/remotes/origin/expoweb' into expoweb

Browse Source
This commit is contained in:
Wookey 2020-05-25 02:40:11 +01:00
commit 29d51802d7
9 changed files with 162 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
areas.htm
View File

@ -31,7 +31,12 @@ area 1626.</p>
<p>Access to the area is relatively easy at its southern edge, as the <a
href="tollrd.htm">Loser Panoramastra&szlig;e</a> (a toll road) climbs the
southern slopes of Loser to reach a large parking area and self-service
restaurant at 1600m just below Augst See. From here, good paths reach both the
restaurant at 1600m just below Augst See.
<ul>
<li><a href="handbook/tollrd.html">Loser Panoramastra&szlig;e</a></li>
</ul>
From the car park - now called "Loser Alm" and formerly just known as the
Bergrestaurant- good paths reach both the
southern slopes of Vd. Schwarzmooskogel, and also north to a col overlooking
the extensive pathless central plateau. Both the further reaches of the central
plateau and the areas around the Sch&ouml;nberg, Gries Kogel and Augst-Eck
@ -78,6 +83,7 @@ areas, though the map overlaps onto most of the others.</p>
<li><a href="gschwand.html">Gschwandt Alm and area east of Blaa-Alm</a></li>
<li><a href="aausee.html">North of Altausseer-See and valley to Hochklapf</a></li>
<li><a href="augstb.html">Ramsau/Posern area: Augst Bach valley below Toll road</a> <i>(not shown on map)</i></li>
<li><a href="handbook/tollrd.html">Loser Panoramastra&szlig;e</a> <i>(not shown on map)</i></li>
</ol>
<div style="text-align: center">

43
cave_data/1623-2018-dm-07.html
View File

@ -1,4 +1,3 @@
<!DOCTYPE html>
<!-- Only put one cave in this file -->
<!-- If you edit this file, make sure you update the websites database -->
<html lang="en">
@ -10,18 +9,44 @@
<non_public>False</non_public>
<caveslug>1623-2018-dm-07</caveslug>
<official_name>Homecoming Cave</official_name>
<area>1623</area>
<area>1626</area>
<kataster_code></kataster_code>
<kataster_number></kataster_number>
<kataster_number>359</kataster_number>
<unofficial_number>2018-dm-07</unofficial_number>
<entrance>
<entranceslug>1623-2018-dm-07</entranceslug>
<letter></letter>
</entrance>
<explorers>CUCC</explorers>
<underground_description>Significant cave on the western edge of our area, the first cave this far out on the Plateau to break into typical complex horizontal cave.</underground_description>
<underground_description><p><strong>Homecoming description 2019</strong></p>
<p><strong><em>Dickon Morris and Becka Lawson</em></strong></p>
<p><em>___________________________________________________________________________</em></p>
<p><strong><em><u>Acronyms: </u></em></strong></p>
<p><em>R = right; L = left; </em></p>
<p><em>p = pitch (e.g., p30 = 30m pitch)</em></p>
<p><em>c = climb (e.g., c10 = 10m climb)</em></p>
<p><em>N = north, S = south, E = east, W = west</em></p>
<p><em>QM = question mark meaning an open, unexplored lead</em></p>
<p><em>PT = point marked on survey</em></p>
<p><em>___________________________________________________________________________</em></p>
<p><strong>Bold </strong>text indicates passage / series names.</p>
<p>The main route is described in normal text and side passages / oxbows are described in <em>italics</em>.</p>
<p>_______________________________________________________________________________________________</p>
<p>A significant cave found in 2018 on the western edge of our area. This is the first cave so far out onto the Plateau that breaks into complex and extensive horizontal passage. The entrance is located in a gully with thick vegetation on either side. It is an obvious open pit with a snow plug in the bottom.</p>
<p><strong><u>2018 Discoveries</u></strong></p>
<p><strong>Entrance series</strong></p>
<p>The entrance pitch (p5) drop onto a snow plug where heading downslope leads to a stance on jammed boulders. A p4 drops onto a narrow ledge which is traversed for a short distance to the head of a p7 which lands on a second snow plug. (<em>The p4 is very wet if it is raining on the surface but it would not be hazardous to exit the cave in these conditions, just very unpleasant</em>)</p>
<p>From the bottom of the second snow plug a short, drafting crawl over boulders leads directly to two more pitches, a p5 then immediately a p10. Below here a short wriggle through boulders on the L side of the passage leads to a short section of rift passage ending at a p3 to a ledge. The ledge looks out over a large chamber with jammed boulders in the roof directly opposite the ledge. <em>(There may be passage leading off from these jammed boulders, QMB). </em>The p30 from this ledge to the floor of the chamber is <strong>Radagast</strong> and it lands on a boulder floor. (<em>5m below the top of <strong>Radagast</strong> it is possible to swing into a series of small phreatic tubes and immature vadose shafts trending SW at point PT01 and leading past PT02. This area does not contain any great leads but may be worth a look as it is an easy, shallow trip).</em></p>
<p>From the bottom of <strong>Radagast</strong> a traverse on the L along a bedrock ledge with jammed boulders leads to a p5. From here the route narrows to a meander which is followed as close to the roof as possible to a point where the floor opens out and there is a short traverse (left rigged in 2019) to drop into a boulder-floored aven chamber. Downslope in this chamber chokes; the way on is an up pitch (left rigged in 2019) onto another boulder floor, from which a tall meander leads off (<strong>Definitely not the Dachstein</strong>).</p>
<p><strong>Definitely not the Dachstein</strong> leads (via a number of traverses, two short pitches down and one short pitch up) to the top of <strong>Wallace</strong> (p30) which drops down to the base of a large meander then lands on a ledge. From the ledge, two short hangs lead to a very exposed stance below which the continuing meander bells out into a large free hanging rift pitch, <strong>Grommit</strong> (p55). (<em>Traversing S along the walls of the <strong>Grommit</strong> is likely to gain entry to the upstream continuation of <strong>The Second Coming; </strong>this is QMA 2019-01). </em>Around 10m from the base of Grommit pitch it is possible to swing onto a ledge on the W wall (this is awkward to rig; the easiest option is to descend to the base of the pitch and climb up the wall protected with jammers on the pitch rope). Traversing along the ledge leads to an abandoned meander with a very strong outward draft. A short p5 N of PT03 at the far end of the traverse drops down to the start of <strong>The Second Coming. </strong><em>(Continuing to the bottom of <strong>Grommit </strong>lands on a rock floor with a vadose trench and a stream in the bottom. This leads via a p10 to a short series of narrow tubes which end in tight sumps and chokes).</em></p>
<p><strong>The Second Coming</strong></p>
<p><strong>The Second Coming </strong>starts below the p5 N of PT03 (which is at the end of the traverse from the Entrance Series). (<em>From here a p8 (left rigged 2019) up to a small phreatic tube on the R leads to <strong>Propane Nightmares). </strong></em>The passage continues as a very drafty phreatic tube with a vadose trench to quickly reach a junction at PT04. (<em>Heading L at this junction leads to <strong>Hobnob Hallway</strong> (described in a separate section below). </em>Continuing directly NE along <strong>The Second Coming </strong>the passage immediately passes a small L passage (<em>this immediately goes to a junction. Here, L oxbows down Kitkat Connection straight back to Hobnob Hallway whilst R goes to a parallel passage to The Second Coming). </em>After a further section of straight, high rift to the NE it reaches a junction at PT05 with a large, abandoned meander. (<em>L here heading downstream and SW in this meander, the roof gradually lowers - passing a junction on the L that goes to Kitkat Connection - until a high aven with a flowstone floor is reached. Beyond this aven a short section of passage leads to a pitch (QMA) with a passage visible on the other side (QMA) that is presumed to be the continuation of the aforementioned meander).</em></p>
<p>From PT05, heading &lsquo;upstream&rsquo; (though there is not always any water flowing) from the junction in the meander leads, via some exposed traversing and an area of boulder collapse, to another junction at PT06. Here a phreatic tube on the L comes in halfway up the meander. (<em>Continuing along the meander past the junction passes a number of pools and sections of crawling to reach a large pool across the entire passage. This has not yet been crossed</em>. <em>Just before the pool it is possible to climb up around 5m at PT07 to a higher-level passage which goes around 10m NE to reach a traverse, <strong>Wilfully Endangering Lives,</strong> over a large window into the lower passage). </em></p>
<p>At PT06 the phreatic tube on the L passes through several stooping sections and a well decorated canyon with pools in the floor to reach a free climbable hole in the floor which is the top of the 5m climb at PT07 previously described. Crossing over <strong>Wilfully Endangering Lives </strong>reaches some jammed boulders about 5m E of PT08 and the passage continues on as a pleasant but very drafty canyon. (<em>At PT09 at the first corner there is a climb down on the L into a passage which is presumed to be the continuation of the lower level passage. This QM B has not been pushed beyond the wide pool). </em>Continuing past this junction the passage becomes maze-like and needs fully surveying. It eventually ends at a deep drafty rift. (<em>This has been pushed by Haydon Saunders et al in 2018, supposedly to a large chamber called the <strong>Lizard King, </strong>beyond PT10, but no survey data has been forthcoming. The whole area needs a good push; there are probably no easy leads but the draft is absolutely ridiculous</em>).</p>
<p><strong>Hobnob Hallway</strong></p>
<p><em>(This description should be checked and related to the QMs marked on the survey) </em>Heading L at the first junction along <strong>The</strong> <strong>Second Coming</strong> leads to <strong>Hobnob Hallway</strong>. This starts as a sand floored phreatic passage. A short distance along a hole in the floor leads N to <strong>Kit Kat connection </strong>which loops back to <strong>The Second Coming</strong>. Further along, a fine false floor crosses a small stream, not explored. A small sandy slope leads down to a canyon on the R, with a phreatic passage at the top. A short way along this phreas, <strong>Phil Lynn&rsquo;s Concert Hall</strong>, a small chamber, is reached. From here a hole to the R leads to <strong>Dead Bat Dead End</strong>. Back at the canyon, a small passage can be followed to another junction, returning to the canyon. To the R is unsurveyed, but the L continues along a phreatic named <strong>Papsi Passage</strong>, with the canyon in the floor. Occasional smaller (barely body sized) phreatics break off from this. Eventually the canyon is lost, and the phreatic continues. A further junction is reached, to the R, <strong>Papsi Passage</strong> continues. To the L leads down<strong> Dead Fly Passage</strong>, ending at the top of a canyon, presumably the continuation of the earlier canyon. <strong>Papsi Passage</strong> continues in the phreatic until it too reaches a canyon, presumably the same)<em>. </em></p>
<p><strong><u>2019 Discoveries</u></strong></p>
<p><strong>Propane Nightmares</strong></p>
<p>From PT03 at the end of the traverse from the Entrance Series descend the p5 to the N. (<em>Ahead the main passage is The Second Coming).</em> <em>Ascend a p8 (left rigged 2019) </em>up to a small phreatic tube on the R. This enters <strong>Propane Nightmares. </strong>It starts as a stooping size phreatic tube formed on a fault plane heading E. (<em>Around 10m from the start of the passage a narrow canyon leads up on the R and then heads steeply down towards the sound of a waterfall. This ends in a steep slope which the survey suggests connects with <strong>Grommit</strong>)</em>. The main passage continues E with a similar size, passing a handline c8 up (<em>left rigged in 2019)</em> immediately followed by a p12 down. Continuing E soon reaches a three-way junction at PT11. This is the beginning of a maze area. Down and keeping L (N) leads to another junction. Turning R at this second junction shortly leads to the top of a p5 down. <em>(Straight on at this second junction leads, via a steeply descending phreas with a squeeze, to a steep sided static sump. Traversing around the edge of this sump leads to a larger passage which heads SW and shortly reaches the bottom of the p5 described above. This route bypasses the p5 but it is not recommended due to the risk of falling into the static sump which would likely be fatal. E of the sump a drafty ramp ascends to a short bolt climb with a good draft, QMA)</em>.</p>
<p>From the bottom of the p5 the passage develops a trench in the floor and soon leads to a T junction at PT12 with a large pitch in the floor (QMA)<em>. (To the R leads to a splashy aven and the head of an immature canyon, QM_not_worth_the_misery). </em>To the L at the PT12 junction is a short, roped traverse (left rigged 2019) which leads to a crawling sized phreatic tube that soon arrives at a p4 with a tiny wet inlet in the roof at the head of the pitch. Below, the phreas continues as a crawl until a canyon develops in the floor which, after a couple of short climbs, arrives at the top of <strong>Strained by Gravity </strong>(p75)</p>
<p><strong>Strained by Gravity </strong>is broken by four large ledges and lands on a boulder floor with a waterfall entering on the E side. (<em>A passage leads off directly behind the waterfall - it is not possible to avoid getting wet - and traverses over a pit in the floor with a streamway at the bottom; after the traverse it is possible to drop down into a streamway (described next) or to continue to traverse into a phreatic tube in the roof, QMB). </em>Clambering down among the boulders at the bottom of <strong>Strained By Gravity</strong> it is possible to scurry under a drippy area below the waterfall (umbrella recommended) to enter <strong>Watershed</strong>, a fine streamway that trends SE. (<em>Just past the waterfall the passage passes beneath the traverse mentioned above)</em>.</p></underground_description>
<equipment></equipment>
<references></references>
<survey></survey>

25
handbook/essentials.html
View File

@ -84,19 +84,20 @@ Connect the GPS device to your laptop (or the expo laptop) using the USB cable.
of the device.
You will see a subfolder called "GARMIN". Open the folder "GARMIN" and copy the file essentials.gpx which you
downloaded into that folder.
<h3>Old Garmin handheld GPS devices</h3>
<p>
These need the Garmin communication protocol to import cave entrance locations (waypoints) and paths (tracks).
You can't do it by simply copying files.
This means that you need special software on your laptop in addition to a USB cable that
connects your laptop to the Garmin device.
<p>Even modern (2019) Garmin GPS devices use this old style mini-USB socket. So you will need the special cable that comes with the device. An ordinary phone USB cable won't work.
<p>
<figure>
<img src="t/usb-minib-5pin-m-c.jpg" alt="mini-USB socket" />
<figcaption><em>mini-USB b socket</em></figcaption>
</figure>
If your Garmin has a <b>mini</b>-USB socket, rather than the usual micro-USB found in phones, then you might have an "old" Garmin handheld, but some modern handhelds still use this old socket.
<h3>Very Old Garmin handheld GPS devices</h3>
<p>
These need the Garmin communication protocol to import cave entrance locations (waypoints) and paths (tracks).
You can't do it by simply copying files.
This means that you need special software on your laptop in addition to a USB cable that
connects your laptop to the Garmin device.
<p>Once you have the right cable and connected your handheld to your laptop:
<ul>
<li>On a Windows machine, use "GPSbabel for Windows" which has an easy to use graphical user interface:
@ -115,11 +116,11 @@ devise new routes to reach them.
<p>
To regenerate the <i>most recent version</i> which contains the cave entrances discovered during expo
you will need to ask someone who is competent in logging into the server and running scripts.
<p>The data is in the version control system <a href="computing/repos.html">repository</a> :loser: in
<p>The data is in the version control system <a href="computing/repos.html">repository</a> <var>:loser:</var> in
<pre>
loser/gpx/
</pre>
and is generated from the survex data by a script. It is best to do this on a laptop which has the entire :loser:
and is generated from the survex data by a script. It is best to do this on a laptop which has the entire <var>:loser:</var>
repo downloaded onto it (e.g. the <i>expo laptop</i>) rather than on the server itself as the server can run out of memory doing this.
<p>The most recent track data will have been uploaded by an expoer into e.g.
@ -133,9 +134,9 @@ repo downloaded onto it (e.g. the <i>expo laptop</i>) rather than on the server
This is actually entirely hand-edited from original tracks. The only survex data it uses is the entrances waypoints which are exported
by the script which has been hand-edited in. It also has the kataster boundaries hand-edited in.
<p>Last year's (17 July 2018)
<p>The 17 July 2018 version
can be downloaded from here : <a href="essentials.gpx" download>essentials.gpx</a> (190K).
(This is a symlink to loser/gpx/essentials.gpx).
(This is a symlink to loser/gpx/essentials.gpx). This works fine on laptops but most phones don't like this sort of link.
<hr />

3
handbook/index.htm
View File

@ -27,6 +27,7 @@ You've never been to expo? This is what you need to know before packing to come:
<h2>Second steps</h2>
This is what it's all about:
<ul>
<li><a href="intro.htm">Introduction to expo</a> - a 40-year institution</li>
<li><a href="primer.html">Primer</a> - For new expedition members - the caves we are exploring</li>
<li><a href="survey/index.htm">Surveying</a> - Why and how we survey caves. (important!)</li>
<li><a href="survey/what.htm">Surveying - beginners guide</a> - Jump to: Beginners guide.</li>
@ -56,6 +57,7 @@ This is a scientific expedition - the Austrian government allows us to wander ar
<br />
<li><a href="survey/caveentry.html">New Cave - How to Enter the Data</a> - Straight to <var>step #6</var> of the online cave data-entry process</li>
<li><a href="survey/status.html">Trip report status</a> - Missing .svx's, missing tunnel drawings etc.</li>
</ul>
<hr />
@ -119,6 +121,7 @@ Things that are likely to be relevant at basecamp.
<h2>Misc</h2>
<ul>
<li><a href="photo.htm">Photography Guide</a> - vital for entrances and documenting caves.
<li><a href="vocab.htm">Travelling cavers phrases</a> - Vocabulary in (German, Spanish, French).</li>
</ul>

5
handbook/survey/index.htm
View File

@ -19,9 +19,7 @@ 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
it also includes writing <b>passage descriptions</b> and taking
<b>photographs</b>. Documenting old caves which are refound, and short new
caves is covered by the <a href="../look4.htm">Prospecting Guide</a>. Taking
photographs may one day be covered by a better expedition <a
href="../photo.htm">Photography Guide</a> than the current effort. <b>This</b>
caves is covered by the <a href="../look4.htm">Prospecting Guide</a>. <b>This</b>
guide covers essentially everything that goes in the <b>Survey Book</b> on each
expedition.</p>
@ -42,6 +40,7 @@ detailed topics.</p>
</li>
<li><b>For those new to CUCC expo surveying:</b>
<ul>
<li><a href="../logbooks.html">Expo logbooks</a> - how and why
<li><a href="newcave.html">The complete process for recording cave data</a></li>
<li>Current Expo survey <a href="/expofiles/surveyscans/2019/walletindex.html">wallet status</a>.</li>
<li>Current Expo survey data <a href="../computing/todo-data.html">TO-DO list</a>.</li>

6
handbook/tollrd.html
View File

@ -47,9 +47,9 @@ trip for the view, but quickly becomes prohibitive for a caving expedition
made up mainly of impoverished students needing to make a dozen or more
return journeys. Cyclists go free, but 900m of ascent from the village is a
little excessive with heavy gear. It does make a splendid run back down,
however ! Trying only to travel at night is possible, but is both underhand
and rather restrictive, particularly if an emergency arises. Permission is
needed to camp within the Nature Reserve at the top, so it is best to
however ! Trying only to travel at night is no longer possible
because of the automated gates and automated number-plate recognition system.
Permission is needed to camp within the Nature Reserve at the top, so it is best to
negotiate a cheaper deal. The owner is very interested to know about the
caves on "his" plateau, so it's important to send a report as soon as
possible after the expedition.</p>

28
handbook/troggle/trogstatus.html
View File

@ -30,19 +30,27 @@ The loser repo and expoweb repo need more care in migration (expoweb is the webs
<p>
Similarly expoweb is full of bloat from fat images and surveys and one 82MB thesis that got checked in and then removed. Clearing that out is a good idea. I have a set of 'unused fat blob' lists which can be stripped out with git-gilter. It's not hard to make a 'do the conversion' script, ready for sometime after expo 2019 has calmed down.
<h4>April/May 2020 and django versions</h4>
<h4>May 2020 and django versions</h4>
<p>
Wookey has now moved 'expoweb' from mercurial to git largely "as-is" and will to use the git tools to patch up the history and to remove redundancies, rather than the original plan to tidy them up "at the time of conversion". Mark Shinwell is working on loser.
<p>Sam continues to work on upgrading django from v1.7 . We are using python 2.7.17 and while we <a href="https://docs.djangoproject.com/en/1.10/topics/python3/">could upgrade</a> to Python v3 using the same version (1.7) of django, we would rather upgrade django as much as possible first before we tackle that. Old versions of django have unpatched security issues.
<p> "Django 1.11 is the last version to support Python 2.7. Support for Python 2.7 and Django 1.11 ends in 2020." see: <a href="https://docs.djangoproject.com/en/3.0/faq/install/">django versions</a>.
<p>Ubuntu 20.04 came out on 23rd April but it does not support python2 at all. So we cannot use it for software maintenance.
<p>For a table displaying the various versions of django and support expiry dates
Wookey has now moved 'expoweb' from mercurial to git largely "as-is" and will to use the git tools to patch up the history and to remove redundancies, rather than the original plan to tidy them up "at the time of conversion". Mark Shinwell is working on loser with him.
<p>Sam continues to work on upgrading django from v1.7 on python 2.7.17 . We would like to upgrade django as quickly as possible because old versions of django have unpatched security issues.
Upgrading to later django versions is a real pig - not helped by the fact that all the tools to help do it are now out of date for these very old django releases.
<ul>
<li>"Django 1.11 is the last version to support Python 2.7. Support for Django 1.11 ends in 2020." see: <a href="https://docs.djangoproject.com/en/3.0/faq/install/">django versions</a>. You will notice that we are really outstaying our welcome here, especially as python2.7 was <a href="https://python-release-cycle.glitch.me/">declared dead in January</a> this year.
<li>For a table displaying the various versions of django and support expiry dates
see <a href="https://www.djangoproject.com/download/">the django download</a> page.
Django 1.7 expired in December 2015.
Django: <a href="">full deprecation timeline</a>.</p>
<p>Ideally we should upgrade from django 1.7 to django 1.11, then port from python2 to python3 on
the same version of django,
then upgrade to as recent a version of django as we can.
Django: <a href="">full deprecation timeline</a>.
<li>Ubuntu 20.04 came out on 23rd April but it does not support python2 at all. So we cannot use it for software maintenance (well be can, but only using non-recommended software, which is what we are trying to get away from).
</ul>
<p>We planned to upgrade from django 1.7 to django 1.11, then port from python2 to python3 on
the same version of django, then upgrade to as recent a version of django as we could. But we have
discovered that django1.7 works just fine with <a href="https://docs.djangoproject.com/en/1.10/topics/python3/">python3</a>, so we will probably move to python3 during June and
then upgrade the server operating system from Debian <var>stretch</var> to <var>buster</var> before
tackling the next step: thinking deeply about when we migrate from django
<a href="trogdesignx.html">to something else</a>.
</p>
<p>
Enforced time at home is giving us a new impetus to writing and restructuring the documentation for everything.

47
infodx.htm
View File

@ -13,12 +13,14 @@
<ul>
<li><a href="indxal.htm">Cave Descriptions Index</a>. Recently-explored major caves:
<ul>
<li><a href="1623/2017-cucc-28/">Fischgesicht </a></li>
<li><a href="1623/258/258.html">Tunnockschacht</a></li>
<li><a href="1623/290/">Fischgesicht-H&ouml;hle </a> - FishFace</li>
<li><a href="1626/359/">Heimkehrh&ouml;hle </a> - Homecoming</li>
<li><a href="1623/264/264.html">Balkonh&ouml;hle</a></li>
<li><a href="1623/258/258.html">Tunnockschacht</a></li>
<li><a href="1623/40/cucc.htm">Schwarzmooskogeleish&ouml;hle</a></li>
<li><a href="1623/76/76.htm">Eislufth&ouml;hle</a></li>
<!--<li><a href="1623/76/76.htm">Eislufth&ouml;hle</a></li>
<li><a href="1623/107.htm">Gemsh&ouml;hle</a></li>
-->
<li><a href="1623/161/top.htm">Kaninchenh&ouml;hle</a></li>
<li><a href="1623/204/204.html">Steinbr&uuml;ckenh&ouml;hle</a></li>
</ul>
@ -35,8 +37,23 @@
<td><a href="years/2019/">2019</a></td>
<td>|</td>
<td><a href="years/2020/">2020</a></td>
<td>|</td>
<td>expedition planning and logistics</td>
</tr>
</table>
<tr>
<td><a href="/expedition/2016">2016</a></td>
<td>|</td>
<td><a href="/expedition/2017">2017</a></td>
<td>|</td>
<td><a href="/expedition/2018">2018</a></td>
<td>|</td>
<td><a href="/expedition/2019">2019</a></td>
<td>|</td>
<td><a href="/expedition/2020">2020</a></td>
<td>|</td>
<td>expedition cave exploration and survey data</td>
</tr>
</table>
</li>
<li><a href="years/">Other years<a/></li>
</ul>
@ -44,37 +61,33 @@
<h2>Public articles and presentations</h2>
<ul>
<li><a href="intro.htm">Introduction to expo</a></li>
<li><a href="pubs.htm">Published Articles and Presentations</a> in Journals and at conferences (bibliography with links)</li>
<li><a href="expofiles/presentations/">External Presentations(Hidden Earth, etc)</a></li>
</ul>
<h2>Area Description</h2>
<ul>
<li><a href="pubs.htm">Published Articles and Presentations</a> in Journals and at conferences (bibliography with links)</li>
<li><a href="areas.htm">Area/subarea descriptions</a></li>
<li><a href="geolog.htm">Geological outline</a></li>
<li><a href="indxal.htm">Cave Descriptions Index</a>
<li>The Austrian <a href="katast.htm">Kataster</a> or cave catalogue</li>
<li><a href="noinfo/all.3d">Current data</a> - download file for display using aven</li>
<li><a href="handbook/tollrd.html">Loser Panoramastra&szlig;e</a></li>
<li><a href="katast.htm">Kataster</a> - The Austrian cave catalogue</li>
<li><a href="http://www.tagesbild.at/">The weather at Grundlesee</a> from a webcam about 5km from basecamp</li>
<li><a href="handbook/fester.html">Festering</a> - or alternative activities for jaded cavers</li>
<li><a href="dclaim.htm">Independent visitors' info</a></li>
<li><a href="others/index.htm">Other groups</a> who have worked in the area.</li>
<li><a href="dplong.htm">Deep and Long Caves list</a> - out of date</li>
<li><a href="fixaid.htm">Fixed Ropes</a> in CUCC caves - very out of date</li>
<li><a href="noinfo/all.3d">Current data</a> - download file for display using aven</li>
</ul>
<h2>Expedition Handbook</h2>
<ul>
<li>Full <a href="handbook/index.htm">Expedition Handbook</a> - start here.<br />
This contains the Prospecting Handbook and the Surveying Handbook sections.</li>
<li><a href="handbook/survey/index.htm">Handbook section on surveying</a></li>
<li><a href="primer.htm">Primer</a> - for new expedition members</li>
<li><a href="handbook/primer.html">Primer</a> - for new expedition members</li>
<li><a href="handbook/index.htm">Expedition Handbook</a> -
the Prospecting, Surveying, GPS, Rigging and How To Expo.</li>
<li><a href="handbook/rescue.htm">Rescue guide</a> IMPORTANT </li>
<li><a href="handbook/logbooks.html">Expo logbooks procedures</a>
<li><a href="handbook/look4.htm">Handbook section on prospecting</a>
<li><a href="handbook/essentials.html">Get GPS data on cave locations</a>
<li><a href="handbook/survey/index.htm">Surveying Handbook</a></li>
<li><a href="handbook/look4.htm">Prospecting Handbook</a>
<li><a href="handbook/essentials.html">Essential GPS in the mountains</a>
<li><a href="handbook/rig/rigit.html">Rigging guide</a>
<li><a href="handbook/planning.html">Expo Planning Guide</a> -
How to plan and make an expo happen.

104
scripts/detect-filename-clashes.py
View File

@ -1,53 +1,53 @@
#!/usr/bin/env python
"""
Recursively checks that no filenames from the current working directory
down are the same, even if they are in different subdirectories. Exits
with status 0 if no matching filenames are found, or 1 if a match is
found.
2020-03-25 PMS Copied originally from https://gist.github.com/seanh/229455
Modified to lowercase everything before checking, to detect clashes caused
by capitalisation, and to capture full path for all clashing files
"""
import sys,os
print "Checking for filename clashes...",
def sortSecond(val):
return val[1]
allfilenames = []
detect = []
clashes = []
report = []
exclude = set([".git",".hg"])
for root, dirs, files in os.walk('.', topdown=True):
dirs[:] = [d for d in dirs if d not in exclude] # modifies dirs in-place.
for filename in files:
if filename.endswith('~'):
# Ignore automatically created backup files.
continue
if os.path.islink(os.path.join(root,filename)):
# Don't count symlinks as filename clashes.
continue
allfilenames.append((root,filename))
if filename.lower() in detect:
clashes.append(filename.lower())
else:
detect.append(filename.lower())
print len(allfilenames), 'files found...',
if clashes == []:
print 'OK'
sys.exit(0)
else:
print len(clashes)," clash(es) found."
for r,f in allfilenames:
if f in clashes:
report.append((r,f))
# sorts the array in descending according to
# second element: the clashing filename
report.sort(key = sortSecond)
for r,f in report:
print os.path.join(r,f)
print len(clashes)," clash(es) found."
#!/usr/bin/env python
"""
Recursively checks that no filenames from the current working directory
down are the same, even if they are in different subdirectories. Exits
with status 0 if no matching filenames are found, or 1 if a match is
found.
2020-03-25 PMS Copied originally from https://gist.github.com/seanh/229455
Modified to lowercase everything before checking, to detect clashes caused
by capitalisation, and to capture full path for all clashing files
"""
import sys,os
print "Checking for filename clashes...",
def sortSecond(val):
return val[1]
allfilenames = []
detect = []
clashes = []
report = []
exclude = set([".git",".hg"])
for root, dirs, files in os.walk('.', topdown=True):
dirs[:] = [d for d in dirs if d not in exclude] # modifies dirs in-place.
for filename in files:
if filename.endswith('~'):
# Ignore automatically created backup files.
continue
if os.path.islink(os.path.join(root,filename)):
# Don't count symlinks as filename clashes.
continue
allfilenames.append((root,filename))
if filename.lower() in detect:
clashes.append(filename.lower())
else:
detect.append(filename.lower())
print len(allfilenames), 'files found...',
if clashes == []:
print 'OK'
sys.exit(0)
else:
print len(clashes)," clash(es) found."
for r,f in allfilenames:
if f in clashes:
report.append((r,f))
# sorts the array in descending according to
# second element: the clashing filename
report.sort(key = sortSecond)
for r,f in report:
print os.path.join(r,f)
print len(clashes)," clash(es) found."
sys.exit(1)