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

Merge

Browse Source
This commit is contained in:
expo laptop 2018-08-18 18:02:44 +02:00
commit 5668773901
14 changed files with 662 additions and 383 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
handbook/exposerver.html Normal file
View File

@ -0,0 +1,19 @@
<html>
<head>
<title>Expo server</title>
<link rel="stylesheet" type="text/css" href="../css/main2.css" />
</head>
<body>
<h2 id="tophead">CUCC Expedition Handbook - Expo server in Cambridge</h2>
<h1>Expo server in Cambridg</h1>
<p>This is not the page you are looking for.
<p>This will be replaced with the information you want as soon as someone gets around to writing it. Why not find out how to do this yourself ?
<hr />
<ul id="links">
<li><a href="index.htm">Expedition Handbook</a>
</ul>
</body>
</html>

30
handbook/getsurvex.html
View File

@ -1,7 +1,7 @@
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>Handbook placeholder page</title> <title>CUCC Expedition Handboo - Survey software</title>
<link rel="stylesheet" type="text/css" href="../css/main2.css" /> <link rel="stylesheet" type="text/css" href="../css/main2.css" />
</head> </head>
<body> <body>
@ -30,9 +30,35 @@ convert your sketches into actual plan and elevation presentation-quality survey
<h2>Therion</h2> <h2>Therion</h2>
<p> <p>
<a href="https://therion.speleo.sk/">Therion<a/> <a href="https://therion.speleo.sk/">Therion</a>
<h2>GPS stuff</h2>
<p>GPS is increasingly important for all the surface work.
<p>
<a href="https://wiki.openstreetmap.org/wiki/GpsPrune">GPS Prune</a> is a vitally useful utility.
<h2>Other old stuff</h2>
<p>
<a href="https://code.google.com/archive/p/loch/">Loch</a> This is fork off of Therion's loch program.
The goal is to model Cave systems in 3d and have a high degree
of interaction between the user and the information.
There is currently no working version and is under very heavy development.
<p>
<a href="https://code.google.com/archive/p/topolinux/">TopoLinux</a>
consists of cave surveying applications for Linux PC and Android devices.
TopoDroid is an Open Source Android app to make cave surveys with the DistoX.
<p>
<a href="https://code.google.com/archive/p/psurvex/">psurvex</a>
My task was to write a new program which could read the data from an external file,
ideally one which resembled a .svx file as much as possible.
Psurvex supports
only a subset of the .svx file format but the same file should process in Survex
without any problems. You need to write a .svx file and save it somewhere on your machine.
This program will then process the file and create a second file containing a list of
points for plotting on graph paper and some statistics about your survey.
<hr /> <hr />

29
handbook/index.htm
View File

@ -39,6 +39,10 @@
<li><a href="essentials.html">Download GPS data to my device</a> - to find caves and to not get lost.</li> <li><a href="essentials.html">Download GPS data to my device</a> - to find caves and to not get lost.</li>
<li><a href="gpxupload.html">Upload GPS data from my phone (or device)</a> - where I found a new cave.</li> <li><a href="gpxupload.html">Upload GPS data from my phone (or device)</a> - where I found a new cave.</li>
<li><a href="survey/newcave.html">Record my new cave discovery</a> - on paper and online</li> <li><a href="survey/newcave.html">Record my new cave discovery</a> - on paper and online</li>
<br>
<li><a href="survey/status.html">Discover whether my trip notes have been scanned</a> - what is the current status of all expo cave surveying?</li>
<br> <br>
<li><a href="stool.htm">Perform bodily functions up the mountain</a> - on a matter of stooling.</li> <li><a href="stool.htm">Perform bodily functions up the mountain</a> - on a matter of stooling.</li>
@ -46,7 +50,7 @@
<li><a href="bierbook.html">Record how much beer I've drunk</a> - from the base camp fridge.</li><br> <li><a href="bierbook.html">Record how much beer I've drunk</a> - from the base camp fridge.</li><br>
<li><a href="paperwork.html#nok">Record who my next of kin is</a> - & emergency medical details.</li><br> <li><a href="paperwork.html#nok">Record who my next of kin is</a> - & emergency medical details.</li><br>
<li><a href="getsurvex.html">Set up my laptop for looking at cave surveys</a> - Survex, aven etc.</li> <li><a href="getsurvex.html">Set up my laptop for looking at cave surveys</a> - Survex, aven etc.</li>
<li><a href="nerd.html">Set up my laptop for everything</a> - surveying, website management etc.</li> <li><a href="nerd.html">Set up my laptop for everything</a> - surveying, data management, version control etc.</li>
</ul> </ul>
<h2>Where and How</h2> <h2>Where and How</h2>
@ -111,8 +115,16 @@ The first time you go to explore a poorly documented question mark ("QM"), you
<dt><a href="photo.htm">Photography </a></dt> <dt><a href="photo.htm">Photography </a></dt>
<dd>- embryonic photography handbook.</dd> <dd>- embryonic photography handbook.</dd>
<dt><a href="rigit.htm">SRT Rigging</a></dt> <dd>This one's also minimal &ndash; but links to useful info on another site. There is (Jan 2000), however, in addition to the rudimentary page above, a few pages towards a full Austria-specific guide. The <a href="rig/index.htm">contents page</a> links to an <a href="rig/intro.htm">Introduction</a> and a useful section on <a href="rig/boltin.htm">placing bolts</a> and it may be useful to refer to the expedition <a href="../fixaid.htm">Fixed Aids</a> list to see what gear has been left in place from previous years. See also Sherry's <a href="http://www.cavepage.magna.com.au/cave/SRTrig.html">Alpine Rigging guide</a> (beta release)</li> <!--<br>... of which there may be a <a href="handbook/3rdparty/sherry/srtrig.htm">local copy</a> if you are <dt><a href="rigit.htm">SRT Rigging</a></dt> <dd>This one's also minimal &ndash; but links to useful info on another site.
browsing from disc--></dd> There is (Jan 2000), however, in addition to the rudimentary page above, a few pages towards a full
Austria-specific guide. The <a href="rig/index.htm">contents page</a> links to an <a href="rig/intro.htm">Introduction</a>
and a useful section on <a href="rig/boltin.htm">placing bolts</a> and it may be useful to refer to the
expedition <a href="../fixaid.htm">Fixed Aids</a> list to see what gear has been left in place from
previous years. See also Sherry's <a href="http://www.cavepage.magna.com.au/cave/SRTrig.html">Alpine Rigging guide</a>
(beta release)</li>
<!--... of which there may be a <a href="handbook/3rdparty/sherry/srtrig.htm">local copy</a> if you are
browsing from disc-->
</dd>
<dt><a href="vocab.htm">Useful vocabulary</a></dt> <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> <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>
@ -126,14 +138,19 @@ The first time you go to explore a poorly documented question mark ("QM"), you
</dl> </dl>
<hr /> <hr />
<h2>Computing stuff</h2> <h2>Computing and data stuff</h2>
<dl> <dl>
<dt><a href="computer.html">Expo Computer</a></dt> <dt><a href="computer.html">Expo Computer</a></dt>
<dd>Details on how the expo computer and network is set up and administered.</dd> <dd>Details on how the expo computer and network is set up and administered.</dd>
<dt><a href="exposerver.html">Expo Server</a></dt>
<dd>The current location of the expo server which holds the master archives and
serves the web pages.</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> <dt><a href="update.htm">Online Systems and Data - Manual</a></dt>
<dd>This reminds the expert administrator nerds how the cave survey data, trip reports, rigging guides,
handbook pages and cave guidebook descriptions are arranged, accessed and updated.</dd>
</dl> </dl>

322
handbook/manual.html Normal file
View File

@ -0,0 +1,322 @@
<html>
<head>
<title>CUCC Expedition Handbook: Online system manual</title>
<link rel="stylesheet" type="text/css" href="../css/main2.css" />
</head>
<body>
<h2 id="tophead">CUCC Expedition Handbook - Online systems</h2>
<h1>Expo Online Systems Manual</h1>
<h2><a id="manual">Expo data management systems manual</a></h2>
<p>Editing the expo data management system is an adventure. Until 2007, there was no
guide which explained the whole thing as a functioning system. Learning
it by trial and error is non-trivial. There are lots of things we
could improve about the system, and anyone with some computer nous is
very welcome to muck in. It is slowly getting better organised.</p>
<p>This manual is organized in a how-to sort of style. The categories,
rather than referring to specific elements of the data management system, refer to
processes that a maintainer would want to do.</p>
<p>Note that to display the survey data you will need a copy of the survex software.
<h3>Contents</h3>
<ol>
<li><a href="#usernamepassword">Getting a username and password</a></li>
<li><a href="#repositories">The repositories</a></li>
<li><a href="#howitworks">How the data management system works</a></li>
<li><a href="#quickstart">Quick start</a></li>
<li><a href="#editingthedata management system">Editing the data management system</a></li>
<li><a href="#Mercurialinwindows">Using version control software in Windows</a></li>
<li><a href="#expowebupdate">The expoweb-update script</a></li>
<li><a href="#cavepages">Updating cave pages</a></li>
<li><a href="#updatingyears">Updating expo year pages</a></li>
<li><a href="logbooks.html">Adding typed logbooks</a></li>
<li><a href="uploading.html">Uploading photos</a></li>
<li><a href="#tickingoff">Ticking off QMs</a></li>
<li><a href="#surveystatus">Maintaining the survey status table</a></li>
<li><a href="#automation">Automation</a></li>
<li><a href="#arch">Archived updates</a></li>
</ol>
Appendices:
<ul>
<li><a href="data management system-history.html">History of the data management system</a></li>
</ul>
<h3><a id="usernamepassword">Getting a username and password</a></h3>
<p>Use these credentials for access to the site. The user is 'expo',
with a cavey:beery password. Ask someone if this isn't enough clue for you.
<b>This password is important for security</b>. The whole site <strong>will</strong> get hacked by spammers or worse if you are not careful with it. Use a secure method for passing it on to others that need to know (i.e not unencrypted email), don't publish it anywhere, don't check it in to the data management system by accident. A lot of people use it and changing it is a pain for everyone so do take a bit of care.
</p>
<p>Note that you don't need a password to view most things, but you will need one to change them</p>
<h3><a id="repositories">The repositories</a></h3>
<p>All the expo data is contained in 4 "repositories" at
expo.survex.com. This is currently hosted on a server at the university. We use a distributed version control system (DVCS) to manage these repositories because this allows simultaneous collaborative editing and keeps track of all changes so we can roll back and have branches if needed.</p>
<p>The site has been split into four parts:</p>
<ul>
<li><a href="http://expo.survex.com/repositories/home/expo/expoweb/graph">expoweb</a> - the data management system itself, including generation scripts</li>
<li><a href="http://expo.survex.com/repositories/home/expo/troggle/graph/">troggle</a> - the database-driven part of the data management system</li>
<li><a href="http://expo.survex.com/repositories/home/expo/loser/graph/">loser</a> - the survex survey data</li>
<li><a href="http://expo.survex.com/repositories/home/expo/tunneldata/graph/">tunneldata</a> - the tunnel (and therion) data and drawings</li>
</ul>
<p>All the scans, photos, presentations, fat documents and videos are
stored just as files (not in version control) in 'expofiles'. See
below for details on that.</p>
<h3><a id="howitworks">How the data management system works</a></h3>
<p>Part of the data management system is static HTML, but quite a lot is generated by scripts. So anything you check in which affects cave data or descriptions won't appear on the site until the data management system update scripts are run. This happens automatically every 30 mins, but you can also kick off a manual update. See 'The expoweb-update script' below for details.</p>
<p>Also note that the data management system you see is its own Mercurial checkout (just like your local one) so that has to be 'pulled' from the server before your changes are reflected.</p>
<h3><a id="editthispage">Using 'Edit This Page'</a></h3>
<p>This edits the file served by the webserver on
the expo server in Cambridge but it does not update the copy of the file in the
repository in expo.survex.com. To properly finish the job you need to
<ul>
<li>
ssh into expo@expo.survex.com (use putty on a Windows machine)
<li>cd to the directory containing the repo you want, i.e. "cd loser" for
cave data or "cd expoweb" for the handbook and visible data management system, which takes you to /home/expo/expoweb
<li>Then run "hg status" (to check what
changes are pending),
<li>then "hg diff" to see the changes in detail
(or "hg diff|less" if you know how to use "less" or "more") and
<li>then DO NOT just run 'hg commit' unless you know how emacs works as it will dump
you into an emacs editing window (C-x C-C is the way to exit emacs). Instead, do
'hg commit -m "found files left over - myName" '
which submits the obligatory comment witht he commit operation.
</ul>
<h3><a id="quickstart">Quick start</a></h3>
<p>If you know what you are doing here is the basic info on what's where:<br>
(if you don't know what you're doing, skip to <a href="#editingthedata management system">Editing the data management system</a> below.)
<dl>
<dt>expoweb (The data management system)</dt>
<dd>
<tt>hg clone ssh://expo@expo.survex.com/expoweb</tt> (read/write)<br />
<tt>hg clone http://expo.survex.com/repositories/home/expo/expoweb/</tt> (read-only checkout)
</dd>
<dt>troggle (The data management system backend)</dt>
<dd>
<tt>hg clone ssh://expo@expo.survex.com/troggle</tt> (read/write)<br />
<tt>hg clone http://expo.survex.com/repositories/home/expo/troggle/</tt> (read-only checkout)
</dd>
<dt>loser (The survey data)</dt>
<dd>
<tt>hg clone ssh://expo@expo.survex.com/loser</tt> (read/write)<br />
<tt>hg clone http://expo.survex.com/repositories/home/expo/loser/</tt> (read-only)
</dd>
<dt>tunneldata (The Tunnel drawings)</dt>
<dd>
<tt>hg clone ssh://expo@expo.survex.com/tunneldata</tt> (read/write)<br />
<tt>hg clone http://expo.survex.com/repositories/home/expo/expoweb/</tt> (read-only)
</dd>
</dl>
<dl>
<dt>expofiles (all the big files and documents)</dt>
<p>Photos, scans (logbooks, drawn-up cave segments) (This was about
60GB of stuff in 2017 which you probably don't actually need locally).
<p>If you don't need an entire copy of all 60GB, then it is probably best to use Filezilla to copy just a small part of the filesystem to your own machine and to upload the bits you add to or edit.
Instructions for installing and using Filezilla are found in the expo user instructions for uploading photographs: <a href="uploading.html">uploading.html</a>.
<p> To sync all
the files from the server to local expofiles directory:</p>
<p><tt>rsync -av expo@expo.survex.com:expofiles /home/expo</tt></p>
<p>To sync the local expofiles directory back to the server (but only if your machine runs Linux):</p>
<p><tt>rsync --dry-run --delete-after -a /home/expo/expofiles expo@expo.survex.com</tt></p>
then CHECK that the list of files it produces matches the ones you absolutely intend to delete forever! ONLY THEN do:
<p><tt>rsync -av /home/expo/expofiles expo@expo.survex.com:</tt></p>
<p>(do be <b>incredibly</b> careful not to delete piles of stuff then rsync back, or to get the directory level of the command wrong - as it'll all get deleted on the server too, and we may not have backups!). It's <b>absolutely vital</b>Use rsync --dry-run --delete-after -a first to check what would be deleted.
<p>If you are using rsync from a Windows machine you will <em>not</em> get all the files as some filenames are incompatible with Windows. What will happen is that rsync will invisibly change the names as it downloads them from the Linux expo server to your Windows machine, but then it forgets what it has done and tries to re-upload all the renamed files to the server even if you have touched none of them. Now there won't be any problems with simple filenames using all lowercase letters and no funny characters, but we have nothing in place to stop anyone creating such a filename somewhere in that 60GB or of detecting the problem at the time. So don't do it. If you have a Windows machine use Filezilla not rsync.
<p>(We may also have an issue with rsync not using the appropriate user:group attributes for files pushed back to the server. This may not cause any problems, but watch out for it.)</p>
</dl>
<h3><a id="editingthedata management system">Editing the data management system</a></h3>
<p>To edit the data management system fully, you need to use the disributed version control system (DVCM) software which is currently mercurial/TortoiseHg. Some (static text) pages can be edited directly on-line using the 'edit this page link' which you'll see if you are logged into troggle. In general the dynamically-generated pages, such as those describing caves which are generated from the cave survey data, can not be edited in this way, but forms are provided for some types of these like 'caves'.</p>
<p>What follows is for Linux. If you are running Windows then see below <a href="#Mercurialinwindows">Using Mercurial/TortoiseHg in Windows</a>.
<p>Mercurial can be used from the command line, but if you prefer a GUI, TourtoiseHg is highly recommended on all OSes.</p>
<p>Linux: Install mercurial and tortoisehg-nautilus from synaptic,
then restart nautilus <tt>nautilus -q</tt>. If it works, you'll be able to see the menus of tortoise within your Nautilus windows. </p>
<p>Once you've downloaded and installed a client, the first step is to create what is called a checkout of the data management system. This creates a copy on your machine which you can edit to your heart's content. The command to initially check out ('clone') the entire expo data management system is:</p>
<p><tt>hg clone ssh://expo@expo.survex.com/expoweb</tt></p>
<p>for subsequent updates</p>
<p><tt>hg update</tt></p>
<p>will generally do the trick.</p>
<p>In TortoiseHg, merely right-click on a folder you want to check out to, choose "Mercurial checkout," and enter</p>
<p><tt>ssh://expo@expo.survex.com/expoweb</tt></p>
<p>After you've made a change, commit it to you local copy with:</p>
<p><tt>hg commit</tt> (you can specify filenames to be specific)</p>
<p>or right clicking on the folder and going to commit in TortoiseHg. Mercurial can't always work out who you are. If you see a message like "abort: no username supplied" it was probably not set up to deduce that from your environment. It's easiest to give it the info in a config file at ~/.hgrc (create it if it doesn't exist, or add these lines if it already does) containing something like</p>
<p><tt>
[ui]<br/>username = Firstname Lastname &lt;myemail@example.com&gt;
</tt></p>
<p>The commit has stored the changes in your local Mercurial DVCS, but it has not sent anything back to the server. To do that you need to:</p>
<p><tt>hg push</tt></p>
<p>Before pushing, you should do an <tt>hg pull</tt> to sync with upstream first. If someone else has edited the same files you may also need to do:</p>
<p><tt>hg merge</tt></p>
<p>(and sort out any conflicts if you've both edited the same file) before pushing again</p>
<p>Simple changes to static files will take effect immediately, but changes to dynamically-generated files (cave descriptions, QM lists etc) will not take effect, until the server runs the expoweb-update script.</p>
<h3><a id="Mercurialinwindows">Using Mercurial/TortoiseHg in Windows</a></h3>
<p>Read the instructions for setting up TortoiseHG in <a href="tortoise/tortoise-win.htm">Tortoise-on-Windows</a>.
<p>In Windows: install Mercurial and TortoiseHg of the relevant flavour from <a href="https://tortoisehg.bitbucket.io/">https://tortoisehg.bitbucket.io/</a> (ignoring antivirus/Windows warnings). This will install a submenu in your Programs menu)</p>
<p>To start cloning a repository: first create the folders you need for the repositories you are going to use, e.g. D:\CUCC-Expo\loser and D:\CUCC-Expo\expoweb. Then start TortoiseHg Workbench from your Programs menu, click File -> Clone repository, a dialogue box will appear. In the Source box type</p>
<p><tt>ssh://expo@expo.survex.com/expoweb</tt></p>
<p>for expoweb (or similar for the other repositories). In the Destination box type whatever destination you want your local copies to live in on your laptop e.g. D:\CUCC-Expo\expoweb. Hit Clone, and it should hopefully prompt you for the usual beery password.
<p>The first time you do this it will probably not work as it does not recognise the server. Fix this by running putty (downloading it from <a href="https://www.chiark.greenend.org.uk/~sgtatham/putty/">https://www.chiark.greenend.org.uk/~sgtatham/putty/</a>), and connecting to the server 'expo@expo.survex.com' (on port 22). Confirm that this is the right server. If you succeed in getting a shell prompt then ssh connection are working and TortoiseHg should be able to clone the repo, and send changes back.</p>
<h3><a id="expowebupdate">The expoweb-update script</a></h3>
<p>The script at the heart of the data management system update mechanism is a makefile that runs the various generation scripts. It is run every 15 minutes as a cron job (at 0,15,30 and 45 past the hour), but if you want to force an update more quickly you can run it he</p>
<p>The scripts are generally under the 'noinfo' section of the site just because that has (had) some access control. This will get changed to something more sensible at some point</p>
<h3><a id="cavepages">Updating cave pages</a></h3>
<p>Cave description pages are automatically generated from a set of
cave files in noinfo/cave_data/ and noinfo/entrance_data/. These files
are named <area>-<cavenumber>.html (where area is 1623 or 1626). These
files are processed by troggle. Use <tt>python databaseReset.py
caves</tt> in /expofiles/troggle/ to update the site/database after
editing these files.</p>
<p>Clicking on 'New cave' (at the bottom of the cave index) lets you enter a new cave. <a href="caveentry.html">Info on how to enter new caves has been split into its own page</a>.</p>
<p>(If you remember something about CAVETAB2.CSV for editing caves, that was
superseded in 2012).</p>
<p>This may be a useful reminder of what is in a survex file <a href="survey/how_to_make_a_survex_file.pdf">how to create a survex file</a>.
<h3><a id="updatingyears">Updating expo year pages</a></h3>
<p>Each year's expo has a documentation index which is in the folder</p>
<p>/expoweb/years</tt></p>
<p>, so to checkout the 2011 page, for example, you would use</p>
<p>hg clone ssh://expo@expo.survex.com/expoweb/years/2011</tt></p>
<p> Once you have pushed your changes to the repository you need to update the server's local copies, by ssh into the server and running hg update in the expoweb folder. </p>
<h3>Adding a new year</h3>
<p>Edit noinfo/folk.csv, adding the new year to the end of the header
line, a new column, with just a comma (blank
cell) for people who weren't there, a 1 for people who were there, and
a -1 for people who were there but didn't go caving. Add new lines for
new people, with the right number of columns.</p>
<p>This proces is tedious and error-prone and ripe for improvement.
Adding a list of people, fro the bier book, and their aliases would be
a lot better, but some way to make sure that names match with previous
years would be
good.</p>
<h3><a id="tickingoff">Ticking off QMs</a></h3>
<p>To be written.</p>
<h3><a id="surveystatus">Maintaining the survey status table</a></h3>
<p>There is a table in the survey book which has a list of all the surveys and whether or not they have been drawn up, and some other info.</p>
<p>This is generated by the script tablizebyname-csv.pl from the input file Surveys.csv</p>
<h3 id="automation">Automation on expo.survex.com</h3>
<p>Ths section is entirely out of date (June 2014), and awaiting deletion or removal</p>.
<p>The way things normally work, python or perl scripts turn CSV input into HTML for the data management system. Note that:</p>
<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 data management system</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
/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/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>
<h3><a id="arch">Archived updates</a></h3>
<p>Since 2008 we have been keeping detailed records of all data management system updates in the version control system.
Before then we manually maintained <a href="../update.htm">a list of updates</a> which are now only of historical interest.
<h2>The data management system conventions bit</h2>
<p>This is likely to change with structural change to the site, with style changes which we expect to implement and with the method by which the info is actually stored and served up.</p>
<p>... and it's not written yet, either :-)</p>
<ul>
<li>Structure</li>
<li>Info for each cave &ndash; automatically generated by <tt>make-indxal4.pl</tt></li>
<li>Contents lists &amp; relative links for multi-article publications like journals. Complicated by expo articles being in a separate hierarchy from journals.</li>
<li>Translations</li>
<li>Other people's work - the noinfo hierarchy.</li>
<li>Style guide for writing cave descriptions: correct use of boldface (<em>once</em> for each passage name, at the primary definition thereof; other uses of the name should be links to this, and certainly should not be bold.) </li>
</ul>
<hr />
</body>
</html>

5
handbook/survey/onlinewallet.html
View File

@ -67,7 +67,7 @@ have a different Austrian Kataster number issued for it in due course).
</ul> </ul>
<li>Tunnel <li>Tunnel
<li>Website updated <li>Online guidebook updated
<li>json file edited <li>json file edited
</ul> </ul>
<p>(where the "json file updated" step only refers to the initial editing of the json file to ensure <p>(where the "json file updated" step only refers to the initial editing of the json file to ensure
@ -97,7 +97,8 @@ looks like this:
"name": "Homecoming cave" "name": "Homecoming cave"
} }
</pre> </pre>
Yes, this is a programming format and every comma is critical. Yes, this is <a href="https://en.wikipedia.org/wiki/JSON">a programming format</a>
(standardised in 2013) and every comma is critical.
<h3>"To do" lists for every caver</h3> <h3>"To do" lists for every caver</h3>
<p>The folder containing all the wallets for the year, e.g. <p>The folder containing all the wallets for the year, e.g.

29
handbook/survey/status.html Normal file
View File

@ -0,0 +1,29 @@
<html>
<head>
<title>Expo server</title>
<link rel="stylesheet" type="text/css" href="../css/main2.css" />
</head>
<body>
<h2 id="tophead">CUCC Expedition Handbook - status of surveys</h2>
<h1>Current status of surveying during expo</h1>
<h3>How do I.. find out the progress of surveying during expo?</h3>
<p>You simply look online at <br>
<a href="http://expo.survex.com/expofiles/surveyscans/2018/index.html"><b>/expofiles/surveyscans/2018/</b></a>
<br>
replacing "2018" with whatever year you want to check up on.
<p>Then scroll down to check the list against your own name, or the status of the particular wallet
you want to know about.
<p>The online wallet system and how it works are <a href="newcave.html#onlinew">well documented in the survey handbook</a>.
<hr />
<ul id="links">
<li><a href="index.htm">Expedition Handbook</a>
</ul>
</body>
</html>

427
handbook/update.htm
View File

@ -1,385 +1,122 @@
<html> <html>
<head> <head>
<title>CUCC Expedition Handbook: The Website</title> <title>CUCC Expedition Handbook: Online system overview</title>
<link rel="stylesheet" type="text/css" href="../css/main2.css" /> <link rel="stylesheet" type="text/css" href="../css/main2.css" />
</head> </head>
<body> <body>
<h2 id="tophead">CUCC Expedition Handbook</h2> <h2 id="tophead">CUCC Expedition Handbook - Online systems</h2>
<h1>Expo Website Manual</h1> <h1>Expo Online Systems Overview</h1>
<p>The website is now large and complicated with a lot of aspects. <p>The online data system and webinterface is now large and complicated with a lot of aspects.
This handbook section contains info at various levels: This handbook section contains info at various levels:
simple 'How to add stuff' information for the typical expoer, simple 'How to add stuff' information for the typical expoer,
more detailed info for cloning it onto your own machine for more significant edits, 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. 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.
<p>We have <a href="http://wookware.org/talks/expocomputer/#/">an Overview Presentation</a> (many parts out of date)
on how the cave data,
handbook and public website are constructed and managed.
It contains material which will be merged into this online systems manual.
<ul> <ul>
<li><a href="uploading.html">Uploading your photos</a></li> <li><a href="uploading.html">Uploading your photos</a></li>
<li><a href="logbooks.html">Uploading typed logbooks</a></li> <li><a href="logbooks.html">Uploading typed logbooks</a></li>
<li><a href="gpxupload.html">Uploading GPS tracks</a></li> <li><a href="gpxupload.html">Uploading GPS tracks</a></li>
<li><a href="#update">Updating the website</a></li> <li><a href="manual.html#update">Updating the guidebook descriptions and handbook</a></li>
<li><a href="#manual">Expo Website manual</a></li> <li><a href="manual.html#manual">Expo software and server maintenance manual</a></li>
</ul> </ul>
<h2><a id="update">Updating the website - overview</a></h2> <h2><a id="update">Updating the online systems - overview</a></h2>
<p>Short <a href="checkin.htm">command-line instructions</a> for updating the website <h3>Experts short cut</h3>
(on the expo machine). This is a memory jog for experts, not beginners.</p>
<p>You can update the site via the troggle pages, by editing pages <p>Short <a href="checkin.htm">command-line instructions</a> for updating the
online via a browser ("Edit this page" on the menu on the left), by data on the server
editing them on the server remotely, or by checking out the relevant part to (using the <em>expo laptop</em>). This is a memory jog for experts, not beginners.</p>
your computer and editing it there. Which is best depends on your
knowledge and what you want to do. For simple addition of cave or
survey data troggle ("edit this page") is recommended. For other edits it's best if you
can edit the files directly but that means you either need to be on expo with the expo
computer, or be able to check out a local copy using the version control system. If neither of these
apply then using the 'edit this page' button is fine.</p>
<p>It's important to understand that everything on the site (except things under <h3>Autogenerated pages</h3>
'expofiles') is stored in a distributed version control system (DVCS) <p>Some key sections of the online webpages are autogenerated by
which means that every edited <a href="#troggle">troggle</a>, and are not static files,
file needs to be 'checked in' after editing. The Expo website manual
goes into more detail about this, below. This stops us losing data and
makes it very hard for you to screw anything up permanently, so don't
worry about making changes - they can always be reverted if there is a
problem. It also means that several people can work on the site on
different computers at once and normally merge their changes
easily.</p>
<p>Increasing amounts of the site are autogenerated by <a href="#troggle">troggle</a>, and are not static files,
so you have to edit the base data, not the generated file (e.g cave so you have to edit the base data, not the generated file (e.g cave
pages, QM (question mark) lists, expo members list, prospecting pages). All pages, QM (question mark) lists, expo members list, prospecting pages). All
autogenerated files say 'This file is autogenerated - do not edit' at autogenerated files say 'This file is autogenerated - do not edit' at
the top - so check for that before wasting time on changes that will the top - so check for that before wasting time on changes that will
just be overwritten</p> just be overwritten</p>
<h3 id="troggle">Troggle - what it is</a></h3> <h3>Using "Edit this page"</h3>
<p>
Troggle is a system under development . <p>You can update the site via the troggle pages, by editing pages
<p> online via a browser ("Edit this page" on the menu on the left), by
Troggle is the software collection (not really a "package") based on <a href="https://www.djangoproject.com/">Django</a> editing them on the server remotely, or by checking out the relevant part to
for keeping track of all expo data in a logical and accessible way, and displaying it on the web. your computer and editing it there. Which is best depends on your
It also re-formats HTML web pages (such as the Expo Handbook) to create useful links knowledge and what you want to do. For simple addition of cave or
(such as "Edit this page" in the left hand menu of this page that you are reading - if you are a logged-on user). survey data troggle ("edit this page") is recommended. (For other edits it's best if you
<p>See the <a href="http://www.srcf.ucam.org/caving/wiki/Troggle">Troggle page on the CUCC website</a> - which is not up to date. can edit the files directly but that means you either need to be on expo with the expo
computer, or be able to check out a local copy using the version control system -
see the <a href="manual.html#manual">Expo software and server maintenance manual</a>. If neither of these
apply then using the 'edit this page' button is fine.</p>
<p>It's important to understand that the pages you can edit by this method
are stored in a distributed version control system (see below). This stops us losing data and
makes it very hard for you to screw anything up permanently, so don't
worry about making changes - they can always be reverted if there is a
problem. It also means that several people can work on the site on
different computers at once and normally merge their changes
easily.
<p>After doing this, you need to ask a nerd to finish the process fairly soon as the "Edit this page"
mechanism does not tidy-up after itself properly.
See <a href="manual.html#editthispage">these instructions for this tidy-up</a>
<h3><a id="surveystatus">Maintaining the status of new surveys being drawn up</a></h3>
<p>This is managed in this years' folder in e.g.
<pre>
expofiles/surveyscans/2018/
</pre>
and is documented in the <a href="survey/newcave.html">New Cave survey data entry</a>
manual pages.
<h3 id="mercurial">DVCS - version control</a></h3> <h3 id="mercurial">DVCS - version control</a></h3>
<p>We use a distributed revision control system (DVCS) for all the important data. On expo this means that many people can edit and merge their changes with the expo server in the Tatty Hut even if there is no internet access. Also anyone who is up to date with the Tatty Hut can take their laptop somewhere where there is internet access and update expo.survex.com - which will then get all the updates done by everyone on expo. <p>We use a distributed revision control system (DVCS) for all the important data.
On expo this means that many people can edit and merge their changes with the expo
server in the Tatty Hut even if there is no internet access. Also anyone who is up
to date with the Tatty Hut can take their laptop somewhere where there is internet
access and update expo.survex.com - which will then get all the updates done by everyone on expo.
</p> </p>
<p>In principle, survey notes can be typed into a laptop up on the plateau which is then synchronised with the Tatty Hut on returning to base. <p>In principle, survey notes can be typed into a laptop up on the plateau which is
then synchronised with the Tatty Hut on returning to base.
</p> </p>
<p>A DVCS is inefficient for scanned survey notes, which are large files that do not get modified, so they are kept as a plain directory of files 'expofiles'. The same goes for holiday photographs and GPS logs.</p> <p>A DVCS is inefficient for scanned survey notes, which are large files that
do not get modified, so they are kept as a plain directory of files 'expofiles'.
The same goes for holiday photographs and GPS logs.</p>
<h2><a id="manual">Expo website manual</a></h2>
<p>Editing the expo website is an adventure. Until 2007, there was no
guide which explained the whole thing as a functioning system. Learning
it by trial and error is non-trivial. There are lots of things we
could improve about the system, and anyone with some computer nous is
very welcome to muck in. It is slowly getting better organised.</p>
<p>This manual is organized in a how-to sort of style. The categories,
rather than referring to specific elements of the website, refer to
processes that a maintainer would want to do.</p>
<p>Note that to display the survey data you will need a copy of the survex software.
<h3>Contents</h3>
<ol> <h3 id="troggle">Troggle - what it is</a></h3>
<li><a href="#usernamepassword">Getting a username and password</a></li>
<li><a href="#repositories">The repositories</a></li>
<li><a href="#howitworks">How the website works</a></li>
<li><a href="#quickstart">Quick start</a></li>
<li><a href="#editingthewebsite">Editing the website</a></li>
<li><a href="#Mercurialinwindows">Using version control software in Windows</a></li>
<li><a href="#expowebupdate">The expoweb-update script</a></li>
<li><a href="#cavepages">Updating cave pages</a></li>
<li><a href="#updatingyears">Updating expo year pages</a></li>
<li><a href="logbooks.html">Adding typed logbooks</a></li>
<li><a href="uploading.html">Uploading photos</a></li>
<li><a href="#tickingoff">Ticking off QMs</a></li>
<li><a href="#surveystatus">Maintaining the survey status table</a></li>
<li><a href="#automation">Automation</a></li>
<li><a href="#arch">Archived updates</a></li>
</ol>
Appendices:
<ul>
<li><a href="website-history.html">History of the website</a></li>
</ul>
<h3><a id="usernamepassword">Getting a username and password</a></h3> <p>
Troggle is the software collection (not really a "package") based on <a href="https://www.djangoproject.com/">Django</a>
originally intended to manage all expo data in a logical and accessible way
and displaying it on the web.
<p>Only a small part of troggle's original plan was fully implemented and deployed: that bit which
re-formats HTML web pages (such as the Expo Handbook). Troggle creates the contents index on every page
and provides the
"Edit this page" capability and provides some help in creating online guidebook descriptions
for the caves. (You can see "Edit this page" in the left hand menu of this
page that you are reading if you are a logged-on user.)
<p> Once you have edited the page you need to
update the server's local repo copies, by ssh into the server and running hg update in the expoweb folder.
Otherwise nobody else can use your changes via the repo mechanism even though they are pubished by the webserver</p>
<p>Use these credentials for access to the site. The user is 'expo', <p>See the outdated <a href="http://www.srcf.ucam.org/caving/wiki/Troggle">Troggle page
with a cavey:beery password. Ask someone if this isn't enough clue for you. </a> for a snapshot of development some years ago.
<b>This password is important for security</b>. The whole site <strong>will</strong> get hacked by spammers or worse if you are not careful with it. Use a secure method for passing it on to others that need to know (i.e not unencrypted email), don't publish it anywhere, don't check it in to the website by accident. A lot of people use it and changing it is a pain for everyone so do take a bit of care.
</p>
<p>Note that you don't need a password to view most things, but you will need one to change them</p>
<h3><a id="repositories">The repositories</a></h3>
<p>All the expo data is contained in 4 "repositories" at
expo.survex.com. This is currently hosted on a server at the university. We use a distributed version control system (DVCS) to manage these repositories because this allows simultaneous collaborative editing and keeps track of all changes so we can roll back and have branches if needed.</p>
<p>The site has been split into four parts:</p>
<ul>
<li><a href="http://expo.survex.com/repositories/home/expo/expoweb/graph">expoweb</a> - the website itself, including generation scripts</li>
<li><a href="http://expo.survex.com/repositories/home/expo/troggle/graph/">troggle</a> - the database-driven part of the website</li>
<li><a href="http://expo.survex.com/repositories/home/expo/loser/graph/">loser</a> - the survex survey data</li>
<li><a href="http://expo.survex.com/repositories/home/expo/tunneldata/graph/">tunneldata</a> - the tunnel (and therion) data and drawings</li>
</ul>
<p>All the scans, photos, presentations, fat documents and videos are
stored just as files (not in version control) in 'expofiles'. See
below for details on that.</p>
<h3><a id="howitworks">How the website works</a></h3>
<p>Part of the website is static HTML, but quite a lot is generated by scripts. So anything you check in which affects cave data or descriptions won't appear on the site until the website update scripts are run. This happens automatically every 30 mins, but you can also kick off a manual update. See 'The expoweb-update script' below for details.</p>
<p>Also note that the website you see is its own Mercurial checkout (just like your local one) so that has to be 'pulled' from the server before your changes are reflected.</p>
<h3><a id="editthispage">Using 'Edit This Page'</a></h3>
<p>This edits the file served by the webserver (Apache) on
expo.survex.com but it does not update the copy of the file in the
repository in expo.survex.com. To properly finish the job you need to
<ul>
<li>
ssh into expo@expo.survex.com (use putty on a Windows machine)
<li>cd to the directory containing the repo you want, i.e. "cd loser" for
cave data or "cd expoweb" for the handbook and visible website, which takes you to /home/expo/expoweb
<li>Then run "hg status" (to check what
changes are pending),
<li>then "hg diff" to see the changes in detail
(or "hg diff|less" if you know how to use "less" or "more") and
<li>then DO NOT just run 'hg commit' unless you know how emacs works as it will dump
you into an emacs editing window (C-x C-C is the way to exit emacs). Instead, do
'hg commit -m "found files left over - myName" '
which submits the obligatory comment witht he commit operation.
</ul>
<h3><a id="quickstart">Quick start</a></h3>
<p>If you know what you are doing here is the basic info on what's where:<br>
(if you don't know what you're doing, skip to <a href="#editingthewebsite">Editing the website</a> below.)
<dl>
<dt>expoweb (The Website)</dt>
<dd>
<tt>hg clone ssh://expo@expo.survex.com/expoweb</tt> (read/write)<br />
<tt>hg clone http://expo.survex.com/repositories/home/expo/expoweb/</tt> (read-only checkout)
</dd>
<dt>troggle (The Website backend)</dt>
<dd>
<tt>hg clone ssh://expo@expo.survex.com/troggle</tt> (read/write)<br />
<tt>hg clone http://expo.survex.com/repositories/home/expo/troggle/</tt> (read-only checkout)
</dd>
<dt>loser (The survey data)</dt>
<dd>
<tt>hg clone ssh://expo@expo.survex.com/loser</tt> (read/write)<br />
<tt>hg clone http://expo.survex.com/repositories/home/expo/loser/</tt> (read-only)
</dd>
<dt>tunneldata (The Tunnel drawings)</dt>
<dd>
<tt>hg clone ssh://expo@expo.survex.com/tunneldata</tt> (read/write)<br />
<tt>hg clone http://expo.survex.com/repositories/home/expo/expoweb/</tt> (read-only)
</dd>
</dl>
<dl>
<dt>expofiles (all the big files and documents)</dt>
<p>Photos, scans (logbooks, drawn-up cave segments) (This was about
60GB of stuff in 2017 which you probably don't actually need locally).
<p>If you don't need an entire copy of all 60GB, then it is probably best to use Filezilla to copy just a small part of the filesystem to your own machine and to upload the bits you add to or edit.
Instructions for installing and using Filezilla are found in the expo user instructions for uploading photographs: <a href="uploading.html">uploading.html</a>.
<p> To sync all
the files from the server to local expofiles directory:</p>
<p><tt>rsync -av expo@expo.survex.com:expofiles /home/expo</tt></p>
<p>To sync the local expofiles directory back to the server (but only if your machine runs Linux):</p>
<p><tt>rsync --dry-run --delete-after -a /home/expo/expofiles expo@expo.survex.com</tt></p>
then CHECK that the list of files it produces matches the ones you absolutely intend to delete forever! ONLY THEN do:
<p><tt>rsync -av /home/expo/expofiles expo@expo.survex.com:</tt></p>
<p>(do be <b>incredibly</b> careful not to delete piles of stuff then rsync back, or to get the directory level of the command wrong - as it'll all get deleted on the server too, and we may not have backups!). It's <b>absolutely vital</b>Use rsync --dry-run --delete-after -a first to check what would be deleted.
<p>If you are using rsync from a Windows machine you will <em>not</em> get all the files as some filenames are incompatible with Windows. What will happen is that rsync will invisibly change the names as it downloads them from the Linux expo server to your Windows machine, but then it forgets what it has done and tries to re-upload all the renamed files to the server even if you have touched none of them. Now there won't be any problems with simple filenames using all lowercase letters and no funny characters, but we have nothing in place to stop anyone creating such a filename somewhere in that 60GB or of detecting the problem at the time. So don't do it. If you have a Windows machine use Filezilla not rsync.
<p>(We may also have an issue with rsync not using the appropriate user:group attributes for files pushed back to the server. This may not cause any problems, but watch out for it.)</p>
</dl>
<h3><a id="editingthewebsite">Editing the website</a></h3>
<p>To edit the website fully, you need to use the disributed version control system (DVCM) software which is currently mercurial/TortoiseHg. Some (static text) pages can be edited directly on-line using the 'edit this page link' which you'll see if you are logged into troggle. In general the dynamically-generated pages, such as those describing caves which are generated from the cave survey data, can not be edited in this way, but forms are provided for some types of these like 'caves'.</p>
<p>What follows is for Linux. If you are running Windows then see below <a href="#Mercurialinwindows">Using Mercurial/TortoiseHg in Windows</a>.
<p>Mercurial can be used from the command line, but if you prefer a GUI, TourtoiseHg is highly recommended on all OSes.</p>
<p>Linux: Install mercurial and tortoisehg-nautilus from synaptic,
then restart nautilus <tt>nautilus -q</tt>. If it works, you'll be able to see the menus of tortoise within your Nautilus windows. </p>
<p>Once you've downloaded and installed a client, the first step is to create what is called a checkout of the website. This creates a copy on your machine which you can edit to your heart's content. The command to initially check out ('clone') the entire expo website is:</p>
<p><tt>hg clone ssh://expo@expo.survex.com/expoweb</tt></p>
<p>for subsequent updates</p>
<p><tt>hg update</tt></p>
<p>will generally do the trick.</p>
<p>In TortoiseHg, merely right-click on a folder you want to check out to, choose "Mercurial checkout," and enter</p>
<p><tt>ssh://expo@expo.survex.com/expoweb</tt></p>
<p>After you've made a change, commit it to you local copy with:</p>
<p><tt>hg commit</tt> (you can specify filenames to be specific)</p>
<p>or right clicking on the folder and going to commit in TortoiseHg. Mercurial can't always work out who you are. If you see a message like "abort: no username supplied" it was probably not set up to deduce that from your environment. It's easiest to give it the info in a config file at ~/.hgrc (create it if it doesn't exist, or add these lines if it already does) containing something like</p>
<p><tt>
[ui]<br/>username = Firstname Lastname &lt;myemail@example.com&gt;
</tt></p>
<p>The commit has stored the changes in your local Mercurial DVCS, but it has not sent anything back to the server. To do that you need to:</p>
<p><tt>hg push</tt></p>
<p>Before pushing, you should do an <tt>hg pull</tt> to sync with upstream first. If someone else has edited the same files you may also need to do:</p>
<p><tt>hg merge</tt></p>
<p>(and sort out any conflicts if you've both edited the same file) before pushing again</p>
<p>Simple changes to static files will take effect immediately, but changes to dynamically-generated files (cave descriptions, QM lists etc) will not take effect, until the server runs the expoweb-update script.</p>
<h3><a id="Mercurialinwindows">Using Mercurial/TortoiseHg in Windows</a></h3>
<p>Read the instructions for setting up TortoiseHG in <a href="tortoise/tortoise-win.htm">Tortoise-on-Windows</a>.
<p>In Windows: install Mercurial and TortoiseHg of the relevant flavour from <a href="https://tortoisehg.bitbucket.io/">https://tortoisehg.bitbucket.io/</a> (ignoring antivirus/Windows warnings). This will install a submenu in your Programs menu)</p>
<p>To start cloning a repository: first create the folders you need for the repositories you are going to use, e.g. D:\CUCC-Expo\loser and D:\CUCC-Expo\expoweb. Then start TortoiseHg Workbench from your Programs menu, click File -> Clone repository, a dialogue box will appear. In the Source box type</p>
<p><tt>ssh://expo@expo.survex.com/expoweb</tt></p>
<p>for expoweb (or similar for the other repositories). In the Destination box type whatever destination you want your local copies to live in on your laptop e.g. D:\CUCC-Expo\expoweb. Hit Clone, and it should hopefully prompt you for the usual beery password.
<p>The first time you do this it will probably not work as it does not recognise the server. Fix this by running putty (downloading it from <a href="https://www.chiark.greenend.org.uk/~sgtatham/putty/">https://www.chiark.greenend.org.uk/~sgtatham/putty/</a>), and connecting to the server 'expo@expo.survex.com' (on port 22). Confirm that this is the right server. If you succeed in getting a shell prompt then ssh connection are working and TortoiseHg should be able to clone the repo, and send changes back.</p>
<h3><a id="expowebupdate">The expoweb-update script</a></h3>
<p>The script at the heart of the website update mechanism is a makefile that runs the various generation scripts. It is run every 15 minutes as a cron job (at 0,15,30 and 45 past the hour), but if you want to force an update more quickly you can run it he</p>
<p>The scripts are generally under the 'noinfo' section of the site just because that has (had) some access control. This will get changed to something more sensible at some point</p>
<h3><a id="cavepages">Updating cave pages</a></h3>
<p>Cave description pages are automatically generated from a set of
cave files in noinfo/cave_data/ and noinfo/entrance_data/. These files
are named <area>-<cavenumber>.html (where area is 1623 or 1626). These
files are processed by troggle. Use <tt>python databaseReset.py
caves</tt> in /expofiles/troggle/ to update the site/database after
editing these files.</p>
<p>Clicking on 'New cave' (at the bottom of the cave index) lets you enter a new cave. <a href="caveentry.html">Info on how to enter new caves has been split into its own page</a>.</p>
<p>(If you remember something about CAVETAB2.CSV for editing caves, that was
superseded in 2012).</p>
<p>This may be a useful reminder of what is in a survex file <a href="survey/how_to_make_a_survex_file.pdf">how to create a survex file</a>.
<h3><a id="updatingyears">Updating expo year pages</a></h3>
<p>Each year's expo has a documentation index which is in the folder</p>
<p>/expoweb/years</tt></p>
<p>, so to checkout the 2011 page, for example, you would use</p>
<p>hg clone ssh://expo@expo.survex.com/expoweb/years/2011</tt></p>
<p> Once you have pushed your changes to the repository you need to update the server's local copies, by ssh into the server and running hg update in the expoweb folder. </p>
<h3>Adding a new year</h3>
<p>Edit noinfo/folk.csv, adding the new year to the end of the header
line, a new column, with just a comma (blank
cell) for people who weren't there, a 1 for people who were there, and
a -1 for people who were there but didn't go caving. Add new lines for
new people, with the right number of columns.</p>
<p>This proces is tedious and error-prone and ripe for improvement.
Adding a list of people, fro the bier book, and their aliases would be
a lot better, but some way to make sure that names match with previous
years would be
good.</p>
<h3><a id="tickingoff">Ticking off QMs</a></h3>
<p>To be written.</p>
<h3><a id="surveystatus">Maintaining the survey status table</a></h3>
<p>There is a table in the survey book which has a list of all the surveys and whether or not they have been drawn up, and some other info.</p>
<p>This is generated by the script tablizebyname-csv.pl from the input file Surveys.csv</p>
<h3 id="automation">Automation on expo.survex.com</h3>
<p>Ths section is entirely out of date (June 2014), and awaiting deletion or removal</p>.
<p>The way things normally work, python or perl scripts turn CSV input into HTML for the website. Note that:</p>
<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
/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/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>
<h3><a id="arch">Archived updates</a></h3>
<p>Since 2008 we have been keeping detailed records of all website updates in the version control system.
Before then we manually maintained <a href="../update.htm">a list of updates</a> which are now only of historical interest.
<h2>The website conventions bit</h2>
<p>This is likely to change with structural change to the site, with style changes which we expect to implement and with the method by which the info is actually stored and served up.</p>
<p>... and it's not written yet, either :-)</p>
<ul>
<li>Structure</li>
<li>Info for each cave &ndash; automatically generated by <tt>make-indxal4.pl</tt></li>
<li>Contents lists &amp; relative links for multi-article publications like journals. Complicated by expo articles being in a separate hierarchy from journals.</li>
<li>Translations</li>
<li>Other people's work - the noinfo hierarchy.</li>
<li>Style guide for writing cave descriptions: correct use of boldface (<em>once</em> for each passage name, at the primary definition thereof; other uses of the name should be links to this, and certainly should not be bold.) </li>
</ul>
<hr /> <hr />

7
infodx.htm
View File

@ -88,7 +88,7 @@ How to plan and make an expo happen.
<li><a href="folk/index.htm">Members</a> 1976-present, with links to mugshots</li> <li><a href="folk/index.htm">Members</a> 1976-present, with links to mugshots</li>
<li><a href="folk/author.htm">Authors</a> of material here <!--(for contacts, see Feedback)</li>--> <li><a href="folk/author.htm">Authors</a> of material here <!--(for contacts, see Feedback)</li>-->
<li><a href="copyit.htm">Copyright info</a></li> <li><a href="copyit.htm">Copyright info</a></li>
<li><a href="links.htm">Links</a> to other relevant websites</li> <li><a href="links.htm">Links</a> to Austrian and other caving clubs working in this area</li>
<li><a href="sponsr.htm">Sponsors</a> - our thanks to those supporting Expo</li> <li><a href="sponsr.htm">Sponsors</a> - our thanks to those supporting Expo</li>
<li><a href="https://www.srcf.net/mailman/listinfo/caving-expo">CUCC Expo mailing list</a></li> <li><a href="https://www.srcf.net/mailman/listinfo/caving-expo">CUCC Expo mailing list</a></li>
</ul> </ul>
@ -96,14 +96,15 @@ How to plan and make an expo happen.
<h2>Useful links for experts</h2> <h2>Useful links for experts</h2>
<p>These links are shortcuts for those <em>already familiar</em> with the expo surveying <p>These links are shortcuts for those <em>already familiar</em> with the expo surveying
and data-management procedures, the respository software system and manual procedures. and data-management procedures, the respository software system and manual procedures.
<p>These files are not version-controlled (take care updating), and will not be available if you are looking at an offline copy of the website.</p> <p>These files are not version-controlled (take care updating).</p>
<ul> <ul>
<li><a href="expofiles">General file bucket</a></li> <li><a href="expofiles">General file bucket</a></li>
<li><a href="expofiles/surveyscans/">Survey scans</a></li> <li><a href="expofiles/surveyscans/">Survey scans</a></li>
<li><a href="expofiles/surveys">Full-size surveys</a></li> <li><a href="expofiles/surveys">Full-size surveys</a></li>
<li><a href="expofiles/rigging_topos">Rigging topos</a></li> <li><a href="expofiles/rigging_topos">Rigging topos</a></li>
<li><a href="expofiles/terrain">Terrain models</a></li> <li><a href="expofiles/terrain">Terrain models</a></li>
<li><a href="handbook/planning.html">Website repository updating</a> - updating online data (including the website pages). Experts only. <li><a href="handbook/planning.html">Data repository updating</a> - updating online data
(including most of the website and handbook pages). Experts only.
<li><a href="expofiles/tunnelwiki/wiki/pages/Tunnel.html">Tunnel Wiki (documentation)</a></li> <li><a href="expofiles/tunnelwiki/wiki/pages/Tunnel.html">Tunnel Wiki (documentation)</a></li>

44
years/2018/basecamplist.html
View File

@ -13,7 +13,7 @@
<li>3kg sack of THE WRONG CUSTARD</li> <li>3kg sack of THE WRONG CUSTARD</li>
<li>18x 72g sachets of the RIGHT custard</li> <li>18x 72g sachets of the RIGHT custard</li>
<li>5x 227g GROUND coffee bags- Sainsburys</li> <li>5x 227g GROUND coffee bags- Sainsburys</li>
<li>5x 200g instant coffee jars- Sainsburys</li> <li>6x 200g instant coffee jars- Sainsburys(unopened)</li>
<li>12 toilet rolls</li> <li>12 toilet rolls</li>
<li>3x UNOPENED Red Label tebags sacks (480 teabags) new in 2018</li> <li>3x UNOPENED Red Label tebags sacks (480 teabags) new in 2018</li>
<li>2x Opened Red Label tebags sack (480 teabags) more than half full, left over from 2017</li> <li>2x Opened Red Label tebags sack (480 teabags) more than half full, left over from 2017</li>
@ -29,11 +29,15 @@
<h2>Gear</h2> <h2>Gear</h2>
<ul> <ul>
<li>Tarpaulins <li>Tarpaulins (size measured when folded) at hut
<ul> <ul>
<li>unused, unopened white tarp 7x9m 110gsm <li>new, unused, unopened white tarp 7x9m 110gsm - 63sq.m.
<li>small light-green tarp (tent extra groundsheet? Backup water-collector?) <li>mid-green tarp (formerly end-of-hut cover?) ~44 sq.m.
<li>medium mid-green tarp (formerly top end of top camp bivvy ?) <li>mid-green tarp 3.2m x 5.8m = 18.5 sq.m, quite good condition
<li>2x mid-green tarps,each ~9 sq.m. good condition
<li>dark-green, many eyelets ~3 sq.m. good condition
<li>dark-green, many eyelets ~8 sq.m.good condition
<li>blue, ~9 sq.m. very worn
</ul> </ul>
<li>2x Bosch drills <li>2x Bosch drills
<li>3x Bosch drill batteries <li>3x Bosch drill batteries
@ -62,7 +66,7 @@
<li>USB cable with <b>mini</b>USB - special for use with GPS devices <li>USB cable with <b>mini</b>USB - special for use with GPS devices
<li>3x UK 4-way with Euro plug</li> <li>3x UK 4-way with Euro plug</li>
<li>2x UK 4 way with UK plug</li> <li>2x UK 4 way with UK plug</li>
<li>Expo Stereo</li> <li>Expo Stereo (ghettoblaster)</li>
<li>scanner</li> <li>scanner</li>
<li>Colour laser printer</li> <li>Colour laser printer</li>
<li>Spare black toner cartridge</li> <li>Spare black toner cartridge</li>
@ -99,25 +103,23 @@ They are loaned to expo and belong to Wookey and Philip Sargent.
<li>expo bike, lock and bike-pump (all gear-taped purple)</li> <li>expo bike, lock and bike-pump (all gear-taped purple)</li>
<li>6 tea-towels <li>6 tea-towels
<li>2x tubes Austrian toothpaste <li>2x tubes Austrian toothpaste
<li>various suncream lotions, shampoos, hand cream, handwash soap, washingup liquid <li>various suncream lotions, shampoos, hand cream, handwash soap
<li>3x full washingup liquid bottles
</ul>
<h2>More stuff...</h2>
<ul>
<li>yellow Speleo Narnia bag containing toddlers' sand playing toys
<li>2x bothy bags (1x Rab:4-6 people, 1x Highlander: 4-5 people)</li>
</ul> </ul>
<h2>More gear - expected to be left but not finalised</h2> <h2>More gear - expected to be left but not finalised</h2>
<ul>
<li>yellow Speleo Narnia bag containing toddlers' sand playing toys
<br><br>
<li>4x 4-man bothy bags (survival and warm at pitch-heads)</li>
<li>1 empty 5kg gas cylinder</li> <ul>
<li>1 mostly empty 5kg gas cylinder</li>
<li>1 empty 11kg gas cylinder</li> <li>gaz cylinders ??
<li>1 part-used 11kg gas cylinder</li>
<li>6x drybags</li>
<li>5x largish tacksack</li>
<li>1x small tacklesack</li>
<li>3 x drill bag</li>
<li>250 (non-composting plastic bags)</li>
<li>1 bag assorted crap</li>
</ul> </ul>
</body></html> </body></html>

6
years/2018/index.html
View File

@ -27,10 +27,10 @@
<ul> <ul>
<li><a href="basecamplist.html">Things left at Base Camp 2018</a></li> <li><a href="basecamplist.html">Things left at Base Camp 2018</a></li>
<li><a href="topcamplist.html">Things left at Top Camp 2018</a></li> <li><a href="topcamplist.html">Things left at Top Camp 2018</a></li>
<li><a href="krakencamplist.html">Things left at undergound Camp 2018</a></li> <li><a href="ugcamplist.html">Things left at undergound Camp 2018</a></li>
<li><a href="thingsfor2019.html">Things neededed for next year</a></li> <li><a href="thingsfor2019.html">Things neededed for next year</a></li>
<li>Caver's Forum expo report Postings <li>Caver's Forum expo 2018 postings
<a href="http://ukcaving.com/board/index.php?topic=22020.0">(original on forum)</a> <a href="https://ukcaving.com/board/index.php?topic=23424.0">(original on forum)</a>
and <a href="ukcaving/index.html">(local copy)</a>,</li> and <a href="ukcaving/index.html">(local copy)</a>,</li>
</ul> </ul>

50
years/2018/logbook.html
View File

@ -755,6 +755,56 @@ me a lift to the potato hut and I showed him the posters and aven. (He also has
<div class="timeug">T/U: 0 hours</div> <div class="timeug">T/U: 0 hours</div>
<br><br>
<div class="tripdate" id="t2018-08-15">2018-08-15</div>
<div class="trippeople"><u>Chris Holt</u>, Radost, Luke, Max</div>
<div class="triptitle">"FGH Derig"</div>
<p>
Derig was going to be a big job. Tonnes of rope still down several holes, and most people had already buggered off, and a fair few of those still around had buggered themselves in some fashion! So we had maybe 6 decent cavers to do maybe 20 bags worth of rope from 3 different entrances in two days. The real hard nuts had done most of Balkonhole on a camp/push/derig the day before, and half of that group were quite deservedly taking a day off. Ruaridh's broken arm had mysteriously 'Got better, honest' until we made him prove it by climbing into the Animal house, so he was out. Fishface/Fischgesicht was the next biggest project, with ~300m depth and vague rumours of a drill left at the bottom for the &quot;unclimbable&quot; leads.
<p>
I'd always known it was goin to be a little bit cheeky turning up just for the end of Expo and still hoping to get a chance to push something, but as it turned out I wasn't even the most jammy of the lot! I'd had a couple of days to acclimatise to camp life and reacquaint myself with the hypothermic delights of Alpine caving when Radost finally arrived (Actually, he had been there earlier, but was just showing his Dad around and wasn't caving), making two of us who hadn't pushed anything. So, the priorities for this trip were to be
<ul>
<li>Derig a metric tonne of rope.
<li> Retrieve the drill
<li> Check whether the sod who left the drill hadn't left other vital equipment too
<li> Show me (Christopher) and Rad how to bolt, and do a little bit of surveying
<li> Maybe do a rigging guide to speed things up next year
</ul>
<p>
Anyway, after the standard intrepid hike across the plateau, all looking super-cool if I don't say so myself, we change and Luke and Rad zip down while Max waited for me to get changed. Max and I had already been all the way to Ulysses earlier that week, so he assumed I remembered the way and shot ahead. I have a terrible memory for complex junctions and my light casts a very sharp throw-pattern, so I still got lost a couple of times and found them all taking a leisurely rest at that nice picnic spot, below the free-climb pitchy thing, where left goes to the way on and right to that disgusting traverse across Ulysses (which Max had derigged two days before and left 70m in a pile in case people wanted to bolt leads below).
<p>
There was a brief discussion of what we should expect, and we settled on the priorities listed above. Luke declared 4pm(?) to be our turnaround time. He wasn't keen on taking more rope deeper into the cave, but given Rad's and my keenness to push the two of us decided to pack it anyway once Luke and Max went ahead. It was only ten minutes later that the shout was relayed to us &quot;Guys! There's more rope down here anyway! DEFINITELY don't bring that other rope!&quot; I duly returned the bag to its original position and retrieved the survey gear, which I had of course forgotten to put back in the bag.
<p>
The lower shaft of Fischgesicht is a truly marvellous black hole - One of those can't-see-the-bottom, can't-see-the-top ones. In stark contrast to the rest of the cave above, it was extremely poorly rigged. Well, I suppose it could have been worse, but even on the way down I was thinking &quot;Should I retie that knot? It really looks like it rubs. No, it's probably just me being a wuss and it's like that for a reason&quot;. This was looking at a lop-sided, 2-metre wide Y-hang that required a sort of acrobatic climb down to access. New rope, at least, though it was quite dry and required a lot of patience to avoid glazing. Plenty of time to look around the blackness and ponder the geological mysteries of metamorphosed Carboniferous sediments.
<p>
We needn't have brought in a drill battery, as together with the drill there were 3 high-capacity ones already there. Rad informed me that Luke and Max had gone up the slightly more obvious (right turn at both junctions) of the labyrinthine passages in this new horizontal level to check that the dead end really was one - apparently the small climb Max did crapped out very quickly. We met back at a junction, I picked up the survey gear from the previous junction, and we headed off (left at second junction) to check the other end of this slightly-larger passage. Everyone agreed that this was a cracking horizontal level. Very nice walking-sized!
<p>
The previous group (whose identity remains to me as nebulous and vague as their cave descriptions) had apparently concluded that &quot;you'll need bolts and rope to push any of the leads&quot;. Total bollocks. We did find a quite sketchy looking climb overlooking the virgin passage floor, but there were two different crawling ways to bypass it! After this initial reccy we reconvened and distributed survey gear. I was to get to grips with the CHECC disto, entrusted to me by Luke that morning. Rad wanted to do the drawing. I had forgotten to pack any station-marking stuff, but luckily Luke had some nail varnish in his pocket. We reckonned we had an hour and a half to push, and with no bolting necessary, the excitement of potentially hundreds of metres of 3x3m phreatic tube became evident in everyone's voices.
<p>
So, on to the description itself. The phreatic tube trends uphill, with a vadose trench in the bottom taking the water gradually deeper and out of sight and earshot. Where the passage jumps up a dodgy climb, the safer way on is through one of two little holes down and to the left - the leftmost a low crawl, and slightly to the right of that a narrowish slot. After these, a small chamber with boulders on the floor
<p>
Crawl. We managed to shoot the lazer straight through a tiny window, avoiding the need to survey the crooked oxbow crawl round the right. Now in another small chamber, but open both forwards/left up a slope, and vertically/right into the big tube, where we were later able to survey the loop (seems to be a near-oxbow of the phreas, which was undercut to make this 3-way big junction with a fourth crawly way that we had just come through). We progressed forwards up the slope, and the 3x3m tube meanders around for m. The floor of the tube is covered with sandy mud that seems to have a darkened crust. Very easy to follow the path established by the first person. About halfway along Luke dropped his nail-varnish, so we resorted to scratching in the mud on the walls. There is a bit of a climb up before a steep slide down a sandy slope. Take care to avoid falling in the hole at the bottom - it looks like a soft landing because of the pile of sand, but I've no idea how you would get out of that chamber - it looks a bit like the whole tube has a false floor in that area. Anyway, the tube continues, eventually changing in profile to more of a tall 2x5m elipse. The noise of the stream can now be heard again - far below, but I suppose cascading more steeply and so making a louder sound. Eventually we reached a sloping-sided hole in the floor, obviously wet at the bottom, QMc, with the same old tube heading up to the right, QMa, and a bottomless traverse on the opposite side of the hole, QMb. All of these will require either bolting of a traverse across the hole or a spiderman-like grip and balls of steel. I would prefer the bolted traverse option.
<p>
We still had over half an hour to go, so we returned ot one of the side passages we had noticed earlier. Climbing back up that steep sandy slope was interesting - everyone had a different method; running full pelt, desperate scrambling, chimping up the wall, etc. Rad was about to zoom off when I called him back - &quot;You do know I won't be able to do anything from up here, don't you?&quot; he observed. &quot;Yes, but I don't want to die alone!&quot;. Cautiously attempting to disturb the sand as little as possible, I delicately levitated myself to a position of safety.
<p>
It was only a couple of legs into the side passage that it started going crazy. A-leads to the left, A and B-leads to the right, leads below - way too much to do any justice to in the time we had left. Clearly the polite thing to do was to leave it for some lucky bastard next year. There's enough down there for two simultaneous survey groups.
<p>
Derig - I was to go up the big pitch with one bag of rope, Radost to follow with the drill and batteries, then pass it to me to put in the top of the 70m bag at Ulysses. I was so mentally beasted from prusiking with a palpable twang on every bounce, at least until I passed the rub-point, and then He-Manning it past that rebelay, that I completely forgot about Rad's bag until I was about to go past Ulysses. I backtracked and hauled his bag up the little pitch for him, packed it in the top of the rope bag there, and with two heavy bags proceded up the free-climb. I had a bit of a sense of humour failure at the top, and having overheard Max &quot;so how many bags do you have, Rad?&quot; &quot;At the moment, precisely zero!&quot; I foisted the heavier one back onto him, selfishly thinking that it would be better for the first person to travel light and quick. Even one bag on that traverse was troublesome, and so when at the top of the next pitch I heard Rad swearing his way through with two, I decided to redeem myself and took back one of them.
<p>
It was slow progress up the rest of the cave, barely keeping ahead of the deriggers (Luke and Max). At another free-climb I reaslised after &gt;10 minutes of struggling that it was much easier to just throw the bags up and then chimp up after them. At the surface, I debagged and lay looking at the stars for a couple of minutes, before returning to the first pitch to take Rad's bag. He was decidedly less talkative than usual, and had the look of a man who needs a break - &quot;it's just quite a heavy bag for a first trip&quot; - I was inclined to agree. I saw another 3 meteors in the space of 20 seconds before going back to sketch a rudimentary diagram of the entrance traverses and take one bag from Max, and then back again for another. Realistically, it was the easiest bit of the bag carry, but it was hard thinking of Luke and Max doing all that work and not rying to help out.
<p>
The decision to leave all the tackle sacks at the entrance was endorsed unanimously. I poured myself a large Schnapps and followed everyone in double-curry dinner and falling asleep immediately.</pre>
<p>
<br>
<div class="tripdate" id="t2018-07-30z">2018-07-30</div>
<div class="trippeople"><u>Robert Seebacher</u></div>
<div class="triptitle">"Receipt for expo members of VfHO for 2018"</div>
<img src="vfho-receipt.jpg" width=100%><br>
</body> </body>
</html> </html>

75
years/2018/ugcamplist.html Normal file
View File

@ -0,0 +1,75 @@
<html>
<head>
<title>CUCC Austria Expeditions: 2018 Stuff left at underground camp</title>
<link rel="stylesheet" type="text/css" href="../../css/main2.css" />
</head>
<body>
<h1>Stuff left at undergound camp 2018 "littleboy"</h1>
<p>inventory 14/8/2018. We have
the <a href="undergroundcamplist.jpg">scan of the original notes</a>
which is needed as some items are illegible/odd.
<h2>Food</h2>
<ul>
<li>6x soups
<li>2x Smash
<li>2x curries
<li>4x noodles
<li>~20x teabags
<li>~120g custard
<li>~2ts sugar (teaspoons-worth in a little bag)
</ul>
<h2>Cooking</h2>
<ul>
<li>1 full gas 440g
<li>1 half-full gas 440g
<li>2 stoves - Red Hat
<li>2 tins with lids (cooking pans)
<li>4 cups with lids
<li>2 10 litre Daren Drums
<li>1 butterknife (really)
</ul>
<h2>Camping</h2>
<ul>
<li>4 roll mats
<li>1 tent
<li>2 orange survival bags (polythene), one unopened, one a bit grubby
</ul>
<h2>Misc.</h2>
<ul>
<li>Roll of bin bags
<li>9 tea lights (candles)
<li>11 big tea lights
<li>13 cable ties
<li>1 finger of rum
<li>7 re-sealing clips (for bags of food)
<li>lots of lighters
<li>some conservation tape
</ul>
<h2>Survey gear</h2>
<ul>
<li>3x nail varnish
<li>Therion protractor
<li>pencil + notebook
</ul>
<h2>Gear</h2>
<ul>
<li>10 hangers with maillons
<li>3 krabs
<li>7 clowns
<li>~100m of rope
<li>undergound first aid kit (untouched)
</ul>
</body></html>

BIN
years/2018/undergroundcamplist.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 240 KiB

BIN
years/2018/vfho-receipt.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 110 KiB