expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2025-12-08 23:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge from server

Browse Source
This commit is contained in:
Wookey
2019-06-29 01:26:38 +01:00
parent 9696f55487 b83703e984
commit 2c8990cdb2
3 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
handbook/computing/gpxupload.html
View File

@@ -45,6 +45,17 @@ Congratulations. You now have your track recorded using GPS as a GPX file.
<h2 id="uploadgpx">Upload instructions</h2>
<font color=red>
<h3>ALL THIS IS NOT WORKING</h3>
<p>We have moved the server to new hardware in a new location, and everything that used the former "cavey:beery" password
for file transfer is now not working. We have to use public/private keys instead on this new server (which is free
by the way, so why we are using it).
<p>The only good method for the next few days is to email things to a nerd: Wookey or myself or whoever..
<p>
<p>Watch this space for updates.. Philip 18/6/2019
</font>
<h3>Simple upload instructions</h3>
<ol>

10
handbook/computing/uploading.html
View File

@@ -14,6 +14,16 @@ href="http://expo.survex.com/photos/">http://expo.survex.com/photos/</a><br />
which is the end result. But all you have to do is to upload the photos to the right place.
A hidden script does the hard work to make it all look nice.
<font color=red>
<h3>ALL THIS IS NOT WORKING</h3>
<p>We have moved the server to new hardware in a new location, and everything that used the former "cavey:beery" password
for file transfer is now not working. We have to use public/private keys instead on this new server (which is free
by the way, so why we are using it).
<p>The only good method for the next few days is to email things to a nerd: Wookey or myself or whoever..
<p>
<p>Watch this space for updates.. Philip 18/6/2019
</font>
<p>If you are really lazy (or really a beginner) you can use the initial simple method (using /uploads/ )
for the photos you have taken of cave entrances for cave survey and prospecting purposes. But please
rename the filenames of the photos intelligently, e.g. "big-hole-near-path-to-fgh.jpg", or

10
years/2018/logbook.html
View File

@@ -317,28 +317,28 @@ and headed out.
<hr />
<div class="tripdate" id="t2018-07-09">2018-07-09</div>
<div class="trippeople"><u>Lydia Clare Leather</u>, Mike Butcher, Michael Holiday</div>
<div class="trippeople"><u>Lydia Clare Leather</u>, Mike Butcher, Michael Holliday</div>
<div class="triptitle">Fisch Gesicht</div>
Rerigged the cave entrance, to pendulum pitch and all the way to blitzen boulavard.
<div class="timeug">T/U 8 hours</div>
<hr />
<div class="tripdate" id="t2018-07-10">2018-07-10</div>
<div class="trippeople"><u>Lydia Clare Leather</u>, Mike Butcher, Michael Holiday</div>
<div class="trippeople"><u>Lydia Clare Leather</u>, Mike Butcher, Michael Holliday</div>
<div class="triptitle">Fisch Gesicht, pushing to liquid luck</div>
Pushed past survey station 14C, found the phreatic tube lead to a small chamber (pissing pot) then continued left to a big pitch. Bolted, Rigged. Michael nearly killed Lydia --> called liquid luck.
<div class="timeug">T/U 10 hours</div>
<hr />
<div class="tripdate" id="t2018-07-13">2018-07-13</div>
<div class="trippeople"><u>Lydia Clare Leather</u>, Mike Butcher, Michael Holiday</div>
<div class="trippeople"><u>Lydia Clare Leather</u>, Mike Butcher, Michael Holliday</div>
<div class="triptitle">Fisch Gesicht, pushing phreatic flies and surveying liquid luck</div>
Surveyed from 14C to 22. Michael bolts, lydia and Mike survey. Mike made a dry stone wall. Mike found Toto chamber.
<div class="timeug">T/U 14 hours</div>
<hr />
<div class="tripdate" id="t2018-07-14">2018-07-14</div>
<div class="trippeople"><u>Lydia Clare Leather</u>, Mike Butcher, Michael Holiday</div>
<div class="trippeople"><u>Lydia Clare Leather</u>, Mike Butcher, Michael Holliday</div>
<div class="triptitle">Fisch Gesicht, Pushing Urinal and fettling rope/rigging</div>
Mike and Michael did more dry stone walling. More gardening. Followed the free attic opposite liquid luck ledge ti findthe Urinal. Bolted and rigged to an awkward body sized squeezing, thatr smelt of pee, having pissed down B. Boulavard. But possible free attic continuation.
<div class="timeug">T/U 7 hours</div>
@@ -352,7 +352,7 @@ Tom joined Mike and Lydia, surveyed free attic frys and Urinal, found thgat Urin
<hr />
<div class="tripdate" id="t2018-07-15">2018-07-15</div>
<div class="trippeople"><u>Lydia Clare Leather</u>, Mike Butcher, Michael Holiday, Tom Crossley</div>
<div class="trippeople"><u>Lydia Clare Leather</u>, Mike Butcher, Michael Holliday, Tom Crossley</div>
<div class="triptitle">Fisch Gesicht, Found Ulysses</div>
<p>Took photos, Mike and Michael go down to crystal crumble, found stalactites, pretty. Tom bolted coral corner, pretty formations. Traversed round Toto chamber on a false floor to the continuation into conintuation of free attic flys called phreatic becomes meander rift, (bolted) and dind a large opening with left and right junction (very false floor) called odious odium. Taking a right turn along the false floor leads to a vast floor now called Ulysses (after the Frans Ferdinand song Michael was singing). Yet to be dropped due to its very unstable nature. Did some gardening but a lot of work needs doing. Left turn at odium, leads to a true floor, leads to multiple boulder chokes and meander in approximately the direction of Ulysses with short pitches not dropped. More photos on the way out. Michael gets ill. Wees a lot.
<p> lots of pee, very loose, less ice than last year, lots of key-hole passage.