expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2025-01-20 09:52:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pushing obscure and old info deeper, putting idiot-guides at the top

Browse Source
This commit is contained in:
Philip Sargent 2018-06-28 21:03:32 +01:00
parent 393abbfd06
commit 7954cc754e
6 changed files with 113 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
handbook/checkin.htm
View File

@ -1,14 +1,16 @@
<html>
<head>
<title>CUCC Expedition Handbook: Updating the website</title>
<title>CUCC Expedition Handbook</title>
<link rel="stylesheet" type="text/css" href="../css/main2.css" />
</head>
<body>
<h1>'Easy' guide to mercurial</h1>
<h1>'Easy' short guide to mercurial</h1>
<p>Beginners: STOP here. This is not for you. You will be using Tortoise, a visual graphical interface to mercurial. Go <a href="index.htm">back</a> to safety now.
<p>Experts: do this in a terminal window on the Expo laptop. This uses the command line, not a graphical user interface.
<h2>Before you start</h2>
cd ~loser</br>
hg diff</br>
<b>If any changes are displayed, commit them:</b></br>
<b>If any changes are displayed, commit them (you will need to find out what they are by looking at the files listed):</b></br>
&nbsp;&nbsp;&nbsp;&nbsp;hg commit -m "<i>surveys in Pooh Passage which John did</i>" -u "<i>YourName</i>"</br>
hg fetch</br>
<b>If there are any errors then STOP, and get someone to fix it.</b>
@ -20,5 +22,20 @@ hg commit -m "<i>surveys of 200m pitch in Far End</i>" -u <i>"YourName"</i><br/>
hg fetch<br/>
<b>If there are any errors then STOP, and get someone to fix it.</b><br/>
hg push<br/></body>
<hr>
<ul id="links">
<li><a href="index.htm">Expedition Handbook</a>
<ul>
<li><a href="survey/index.htm">Surveying guide</a></li>
<li><a href="look4.htm">Prospecting guide</a></li>
<li><a href="rescue.htm">Rescue guide</a></li>
<li><a href="rigit.htm">Rigging guide</a></li>
<li><a href="photo.htm">Photography guide</a></li>
</ul></li>
<li><a href="../infodx.htm">Index to info/topics</a></li>
<li><a href="../index.htm">Back to Expedition Intro</a></li>
<li><a href="../../index.htm">Back to CUCC Home</a></li>
</ul>
</html>

53
handbook/computer.html
View File

@ -1,18 +1,53 @@
<html><head><title>Cambridge University Caving Club Expedition Handbook.</title></head><body>
<html>
<head>
<title>CUCC Expedition Handbook: Expo computer</title>
<link rel="stylesheet" type="text/css" href="../css/main2.css" />
</head>
<h2 id="tophead">CUCC Expedition Handbook</h2>
<h1>Expo server in Potato Hut</h1>
The expo server runs the tatty hut music system and is a core node of the survey data version control system.
<p>
The server is (2017) an Acer Aspire netbook. Plugged into it with cables are
The <em>Expo server</em> is (2017) an Acer Aspire netbook. Plugged into it with cables are
<ol>
<li>Printer
<li>Speakers
<li>Router
<li>Expo laptop 'tunnock'
<li>Hard drive
<li>Speakers (for music)
<li>Router (for networking)
<li>The Expo laptop 'tunnock'
</ol>
It serves it's own DNS domain name potato.hut and publishes WiFi as SSID "tattyhut" - which is NOT connected to the Internet.
<p>The <em>Expo laptop</em> 'tunnock' is another laptop which is connected to the server by a cable and not by WiFi. It runs Linux and has installed all the software for talking to the server for:
<ul>
<li>Typing in survey data
<li>Uploading survey data
<li>Uploading photos and GPS tracks
<li>Controlling the music system
<li>Reading this Handbook
</ul>
<p>Any laptop or phone can connect to the server via the "tattyhut" WiFi and, with some configuration, can be set up to do all those things too (but nothing else - it is not connected to the internet). New expoers are advised to use the Expo laptop first to see how it all works.
<P>
Any laptop can be used to connect to the server via the "tattyhut" WiFi and then use the version control system to synchronise cave data. Many people prefer to use the expo laptop 'tunnock' as then they don't have to install any software on their own laptop.
<P>
At the end of expo the server is brought back to the UK and synchronised with the server expo.survex.com .
Either the Expo laptop or your own laptop will use the version control system to synchronise cave data. Many people prefer to use the expo laptop 'tunnock' as then they don't have to install any software on their own machine.
<P>[Through the miracle of the distributed version control system, people who take their laptops home (or across the road) to connect to the internet can update the public server expo.survex.com with all the latest cave surveys. Rely on other people to do this is this is your first expo.]
<p>
At the end of expo the server is brought back to the UK and any remaining updates are synchronised with the public server expo.survex.com .
<h3>2018</h3>
<p>
For some years the Expo server has served it's own DNS domain name "potato.hut" and published WiFi as SSID "tattyhut" as it's own private network - which was NOT connected to the Internet.
<p>In 2017 the hard-drive died and as part of a general reconfiguration we are intending in 2018 to connect the server to the internet via the Staudnwirt router (which provides the WiFi over the road). This may not work...
<hr>
<ul id="links">
<li><a href="index.htm">Expedition Handbook</a>
<ul>
<li><a href="survey/index.htm">Surveying guide</a></li>
<li><a href="look4.htm">Prospecting guide</a></li>
<li><a href="rescue.htm">Rescue guide</a></li>
<li><a href="rigit.htm">Rigging guide</a></li>
<li><a href="photo.htm">Photography guide</a></li>
</ul></li>
<li><a href="../infodx.htm">Index to info/topics</a></li>
<li><a href="../index.htm">Back to Expedition Intro</a></li>
<li><a href="../../index.htm">Back to CUCC Home</a></li>
</ul>
</body></html>

53
handbook/index.htm
View File

@ -17,8 +17,7 @@
<li><a href="uploading.html">How to upload your photos</a></li>
</ul>
<dt><a href="planning.html">Expo Planning Guide</a></dt>
<dd>How to plan and organise an expo.<dd>
<dl>
<dt><a href="rescue.htm">Rescue</a></dt>
<dd>You fall and break your leg &ndash; probably need a little help to get out of the cave ? How would you feel if everyone at this stage took the rescue guide into Hilde's bar and started reading about what to do ? Not a happy prospect, is it &ndash; so in the hope that it is <strong>not</strong> you who gets hurt, we suggest you read this <strong>now</strong> so you know what to do. It may well help you if it <strong>is</strong> you who gets injured, and may even help prevent that from happening. So don't skip it !</dd>
@ -35,21 +34,24 @@
<dt><a href="look4.htm">Prospecting</a></dt>
<dd>The printable <a href="prospecting_guide_short.html">prospecting guide</a> or <a href="/prospecting_guide/">new prospecting guide (slow to load)</a> is essential reading before you wander the plateau stumbling across holes of potential interest. Vast amounts of work have been wasted in the past through inadequate recording. It isn't very much extra work, but ensures that your hard work gains some recognition in the future rather than making lots of tedious work and the cursing of your name... There is a separate page with pictures of surface landmarks for <a href="findit.htm">taking bearings</a>, and a new guide to getting a <a href="survey/gps.htm">GPS fix</a>.</dd>
<dd>The printable <a href="/prospecting_guide/">new prospecting guide (slow to load)</a> is a list of all known cave entrances and is essential reading before you wander the plateau stumbling across holes of potential interest. <br><br>
Do now read <a href="look4.htm">how to do plateau prospecting</a>.<br><br>
Vast amounts of work have been wasted in the past through inadequate recording. It isn't very much extra work, but ensures that your hard work gains some recognition in the future rather than making lots of tedious work and the cursing of your name... <br><br>
There is also a graphical <a href="prospecting_guide_short.html">prospecting map guide</a> which shows the caves and cave entrances we know about (This is currently broken in that it is not showing a map background so is rather incomprehensible unless you already know the plateau quite well.)<br><br>
There is a separate page with pictures of surface landmarks for <a href="findit.htm">taking bearings</a>, and a new guide to getting a <a href="survey/gps.htm">GPS fix</a>.</dd>
<dt><a href="survey/index.htm">Surveying</a></dt>
<dd>Once the cave starts to get significant (ie. anything which requires getting changed or rigging), it needs good documentation. This is mostly a matter of <br><br>
<ul>
<li>doing a cave survey,
<li>a guidebook description
<li>photographs of the entrance, and usually
<li>a surface survey.
<li>writing a guidebook description
<li>tagging the entrance
<li>taking photographs of the entrance, and
<li>recording the GPS location of the entrance (or doing a surface survey).
</ul>
<br>
The first time you go to explore a poorly documented question mark ("QM"), you will realise how important this is, and it also makes for having a pretty survey on your wall to support your bullshit. The surveying guide has been split into easily digestible chunks, including pages specifically intended for people who <a href="survey/what.htm">haven't surveyed before</a>.
The first time you go to explore a poorly documented question mark ("QM"), you will realise how important this is, and it also makes for having a pretty survey on your wall to support your bullshit. The surveying guide has been split into easily digestible chunks, including pages specifically intended for people who <a href="survey/what.htm">haven't surveyed before</a>. See also the <a href="look4.htm">prospecting introduction</a> for how and why we identify and tag entrances.
<p>
This is <a href="../survey.html">how we survey on Expo</a>.
<p>We use Therion protractors for which we have templates in <a href="../templates/therion1_250.pdf">1:250</a> and <a href="templates/therion1_500.pdf">1:500</a> scales. Thanks to Martin Budaj for these!</dd>
<dt><a href="phone.htm">EXPO Phones</a></dt>
<dd>How to use and update the base camp and top camp mobile phones on expo. (Not your phone.)</dd>
@ -58,21 +60,7 @@ This is <a href="../survey.html">how we survey on Expo</a>.
<dt><a href="rope_history.html">Rope</a></dt>
<dd>History of our ropes and our retirement plans.</dd>
</dl>
<hr />
<h2>Computing stuff</h2>
<dl>
<dt><a href="update.htm">Website and Data</a></dt>
<dd>This tells you how the website and cave data are arranged, accessed and used, including entering new cave data.</dd>
<dt><a href="uploading.html">Uploading files to 'expofiles'</a></dt>
<dd>How to upload photos/reports/surveys/documents/scans to the
filestore section of the website. For larger files that are too fat to
be in the website repository (generaly anything bigger than 200KB).</dd>
<dt><a href="tortoise/tortoise-win.htm">Aled's Windows 101</a></dt>
<dd>A brief, straightforward guide (with pictures!) covering how to get Putty and TortoiseHg working on a Windows PC.
<dt><a href="computer.html">Expo Computer</a></dt>
<dd>Details on how the expo computer and network is set up and adminned.</dd>
</dl>
<hr />
<dl>
<dt><a href="solar.html">Solar Panel system</a></dt>
<dd>Description of setting up and putting away the solar powered battery charging system at the stone bridge</dd>
@ -86,14 +74,27 @@ be in the website repository (generaly anything bigger than 200KB).</dd>
<dt><a href="vocab.htm">Useful vocabulary</a></dt>
<dd>This is hardly a "section", but contains a possibly useful table of translations of climbing (mainly) and caving (some) terms into German, Spanish and French. It's here mainly because I had the material to hand and it would be silly not to make it available.</dd>
<dt><a href="planning.html">Expo Planning Guide</a></dt>
<dd>How to plan and organise an expo.<dd>
<dt><a href="leader.htm">Checklist for expo leaders</a></dt>
<dd>Expo organisers usually haven't done it before, so a list of the necessary jobs is useful. This section is a side-effect of the entire expo leadership being neophytes in 1998. Despite much support from previous leaders, a few odd things got forgotten, like envelopes for survey notes. One of the good things they invented was an annual suggestions file for making things better next time. One of the suggestions was a handbook section telling them what to do! We hope that this checklist will become useful for "experienced" leaders as well as vital guidance for anyone new to the job. However, <strong>do not rely on it being complete or uptodate</strong>, at least, not yet.</dd>
<dt><a href="treasurer.html">How to be Expo Treasurer</a></dt>
<dd>How expo accounting works in theory and practice, the treasurer's tasks, and how to accomplish them.</dd>
</dl>
<dt><a href="planning.html">Expo Planning Guide</a></dt>
<dd>Various helpful information during the planning stages<dd>
<hr />
<h2>Computing stuff</h2>
<dl>
<dt><a href="computer.html">Expo Computer</a></dt>
<dd>Details on how the expo computer and network is set up and administered.</dd>
<dt><a href="update.htm">Website and Data Manual - Experts only</a></dt>
<dd>This tells you how the website and cave data are arranged, accessed and used, including entering new cave data.</dd>
</dl>
<hr />
<ul id="links">
<li><a href="index.htm">Expedition Handbook</a>

2
handbook/survey/how.htm
View File

@ -83,6 +83,8 @@ any prominent bedding or other cleavage planes, and any old flow markings
landmark is also useful, and of course, man-made things like pitch rigging,
traverse lines or cairns.</li>
<li>We use Therion protractors undergound for estimating directions when we are sketching passage shape and direction. We have templates in <a href="../templates/therion1_250.pdf">1:250</a> and <a href="templates/therion1_500.pdf">1:500</a> scales. (Thanks to Martin Budaj for these.)
<li>The left, right, up, down (LRUD) from the survey station to the general
passage wall, not the closest piece of rock. These should be <b>measured</b>
whenever the relevant point can be physically reached (ie. not for the roof

10
handbook/survey/index.htm
View File

@ -1,4 +1,3 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
@ -9,9 +8,9 @@
<h2 id="tophead">CUCC Expedition Handbook</h2>
<h1>Surveying</h1>
<p style="text-align: center; font-size: 140%">
Janet &amp; John document their cave - 1999 revision</p>
Janet &amp; John document their cave</p>
<p style="text-align: center; font-size: 120%; font-style: italic">Mostly by Wookey and Andy Waddington</p>
<p style="text-align: center; font-size: 120%; font-style: italic">Mostly by Wookey and Andy Waddington (1999)</p>
<h3>Introduction</h3>
@ -31,6 +30,8 @@ read all of it, but those who have been surveying before may want to skip the
introductory material, whilst others may not need to read all of the more
detailed topics.</p>
<p>You many find it easier to read and digest <a href="http://expo.survex.com/expofiles/presentations/cave_surveying_20130626.pdf">this Training Course slide-pack</a> before you do anything else as it has very helpful diagrams which are not in this expedition handbook yet.</li>
<ul>
<li><b>For those new to surveying:</b>
<ul>
@ -51,11 +52,14 @@ detailed topics.</p>
<li>Base Camp: <a href="drawup.htm">drawing it up</a>, writing the description</li>
<!-- need to add blurb on QM quality etc. -->
<li><a href="athome.htm">Back in the UK</a>: so you thought you'd finished?</li>
<li>Current Expo survey <a href="../../survey.html">status</a>.</li>
<!-- do we cover the full QM list here ? -->
</ul></li>
<li><a href="http://expo.survex.com/expofiles/presentations/cave_surveying_20130626.pdf">2013 Training Course</a> a slide-pack of a surveying course using Steinbruckhohle as the example</li>
<li><a href="more.htm">More resources</a> on surveying</li>
</ul>
<hr />
<ul id="links">

19
handbook/update.htm
View File

@ -5,11 +5,14 @@
</head>
<body>
<h2 id="tophead">CUCC Expedition Handbook</h2>
<h1>Expo Website</h1>
<p>The website is now large and complicated with a lot of aspects. This handbook section contains info at various levels: simple 'How to add stuff' information for the typical expoer, more detailed info for cloning it onto your own machine for more significant edits, and structural info on how it's all put together for people who want/need to change things. [This page is now so big that it needs to be split up.]</p>
<h1>Expo Website Manual</h1>
<p>The website is now large and complicated with a lot of aspects. This handbook section contains info at various levels: simple 'How to add stuff' information for the typical expoer, more detailed info for cloning it onto your own machine for more significant edits, and structural info on how it's all put together for people who want/need to change things. [This manual is now so big that it is being restructured and split up. Much of it is obsolete.]</p>
<p>We have <a href="http://wookware.org/talks/expocomputer/#/"an Overview Presentation</a> on how the cave data, handbook and website are constructed and managed. It contains material which will be merged into this website manual.
<ul>
<li><a href="#photos">Uploading your photos and GPS tracks</a></li>
<li><a href="#logbooks">Uploading typed logbooks</a></li>
<li><a href="#update">Updating the website</a></li>
<li><a href="#manual">Expo Website manual</a></li>
<li><a href="expodata.html">Expo website developer info</a></li>
@ -17,8 +20,8 @@
<h2><a id="update">Updating the website - overview</a></h2>
<p>Simple <a href="checkin.htm">instructions</a> for updating the website
(on the expo machine).</p>
<p>Short <a href="checkin.htm">command-line instructions</a> for updating the website
(on the expo machine). Thius is a memory job for experts, not beginners.</p>
<p>You can update the site via the troggle pages, by editing pages
online via a browser ("Edit this page" on the menu on the left), by
@ -340,17 +343,19 @@ The directory names are like this: "2014/YourName/" (i.e no spaces, CamelCase fo
<p>The CSV files are actually tab-separated, not comma-separated despite the extension.</p>
<p>The scripts can be very picky and editing the CSVs with microsoft excel has broken them in the past- not sure if this is still the case.</p>
<p>Overview of the automagical scripts on the expo website</p>
[Clearly very out of date is it is assuming the version control is svn whereas we changed to hg years ago.]
<pre>
Script location Input file Output file Purpose
/svn/trunk/expoweb/noinfo/make-indxal4.pl /svn/trunk/expoweb/noinfo/CAVETAB2.CSV many produces all cave description pages
</br>/svn/trunk/expoweb/noinfo/make-folklist.py /svn/trunk/expoweb/noinfo/folk.csv http://expo.survex.com/folk/index.htm Table of all expo members
/svn/trunk/expoweb/noinfo/make-folklist.py /svn/trunk/expoweb/noinfo/folk.csv http://expo.survex.com/folk/index.htm Table of all expo members
</br>/svn/trunk/surveys/tablize-csv.pl /svn/trunk/surveys/tablizebyname-csv.pl
/svn/trunk/surveys/tablize-csv.pl /svn/trunk/surveys/tablizebyname-csv.pl
/svn/trunk/surveys/Surveys.csv
http://expo.survex.com/expo/surveys/surveytable.html http://expo.survex.com/surveys/surtabnam.html
Survey status page: "wall of shame" to keep track of who still needs to draw which surveys
</pre>