Beginners: STOP here. This is not for you. You will be using Tortoise, a visual graphical interface to mercurial. Go back to safety now.
+
Experts: do this in a terminal window on the Expo laptop. This uses the command line, not a graphical user interface.
Before you start
cd ~loser
hg diff
-If any changes are displayed, commit them:
+If any changes are displayed, commit them (you will need to find out what they are by looking at the files listed):
hg commit -m "surveys in Pooh Passage which John did" -u "YourName"
hg fetch
If there are any errors then STOP, and get someone to fix it.
@@ -20,5 +22,20 @@ hg commit -m "surveys of 200m pitch in Far End" -u "YourName"
hg fetch If there are any errors then STOP, and get someone to fix it.
hg push
+
+
diff --git a/handbook/computer.html b/handbook/computer.html
index 6c971d13f..53c172c3e 100644
--- a/handbook/computer.html
+++ b/handbook/computer.html
@@ -1,18 +1,53 @@
-Cambridge University Caving Club Expedition Handbook.
+
+
+CUCC Expedition Handbook: Expo computer
+
+
CUCC Expedition Handbook
Expo server in Potato Hut
The expo server runs the tatty hut music system and is a core node of the survey data version control system.
-The server is (2017) an Acer Aspire netbook. Plugged into it with cables are
+The Expo server is (2017) an Acer Aspire netbook. Plugged into it with cables are
Printer
-
Speakers
-
Router
-
Expo laptop 'tunnock'
+
Hard drive
+
Speakers (for music)
+
Router (for networking)
+
The Expo laptop 'tunnock'
-It serves it's own DNS domain name potato.hut and publishes WiFi as SSID "tattyhut" - which is NOT connected to the Internet.
+
The Expo laptop '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:
+
+
Typing in survey data
+
Uploading survey data
+
Uploading photos and GPS tracks
+
Controlling the music system
+
Reading this Handbook
+
+
+
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.
-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.
-
-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.
+
[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.]
+
+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 .
+
2018
+
+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.
+
+
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...
+
\ No newline at end of file
diff --git a/handbook/index.htm b/handbook/index.htm
index 12bc8ac44..85402e19e 100644
--- a/handbook/index.htm
+++ b/handbook/index.htm
@@ -17,8 +17,7 @@
You fall and break your leg – 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 – so in the hope that it is not you who gets hurt, we suggest you read this now so you know what to do. It may well help you if it is you who gets injured, and may even help prevent that from happening. So don't skip it !
The printable prospecting guide or new prospecting guide (slow to load) 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 taking bearings, and a new guide to getting a GPS fix.
+
The printable new prospecting guide (slow to load) is a list of all known cave entrances and 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 also a graphical prospecting map guide 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.)
+There is a separate page with pictures of surface landmarks for taking bearings, and a new guide to getting a GPS fix.
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
doing a cave survey,
-
a guidebook description
-
photographs of the entrance, and usually
-
a surface survey.
+
writing a guidebook description
+
tagging the entrance
+
taking photographs of the entrance, and
+
recording the GPS location of the entrance (or doing a surface survey).
-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 haven't surveyed before.
+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 haven't surveyed before. See also the prospecting introduction for how and why we identify and tag entrances.
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).
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.
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, do not rely on it being complete or uptodate, at least, not yet.
This tells you how the website and cave data are arranged, accessed and used, including entering new cave data.
+
+
+
Expedition Handbook
diff --git a/handbook/survey/how.htm b/handbook/survey/how.htm
index 4f0eb74e6..a892b3ec4 100644
--- a/handbook/survey/how.htm
+++ b/handbook/survey/how.htm
@@ -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.
+
We use Therion protractors undergound for estimating directions when we are sketching passage shape and direction. We have templates in 1:250 and 1:500 scales. (Thanks to Martin Budaj for these.)
+
The left, right, up, down (LRUD) from the survey station to the general
passage wall, not the closest piece of rock. These should be measured
whenever the relevant point can be physically reached (ie. not for the roof
diff --git a/handbook/survey/index.htm b/handbook/survey/index.htm
index 2ad2289bf..521f7facb 100755
--- a/handbook/survey/index.htm
+++ b/handbook/survey/index.htm
@@ -1,4 +1,3 @@
-
@@ -9,9 +8,9 @@
CUCC Expedition Handbook
Surveying
-Janet & John document their cave - 1999 revision
+Janet & John document their cave
-
Mostly by Wookey and Andy Waddington
+
Mostly by Wookey and Andy Waddington (1999)
Introduction
@@ -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.
+
You many find it easier to read and digest this Training Course slide-pack before you do anything else as it has very helpful diagrams which are not in this expedition handbook yet.
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.]
+
Expo Website Manual
+
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.]
Simple instructions for updating the website
-(on the expo machine).
+
Short command-line instructions for updating the website
+(on the expo machine). Thius is a memory job for experts, not beginners.
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
The CSV files are actually tab-separated, not comma-separated despite the extension.
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.
Overview of the automagical scripts on the expo website
+[Clearly very out of date is it is assuming the version control is svn whereas we changed to hg years ago.]
+
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
-/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
-/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
-
+