2004-04-22 19:13:46 +01:00
|
|
|
<html>
|
2002-05-15 18:47:42 +01:00
|
|
|
<head>
|
2018-08-18 12:23:44 +01:00
|
|
|
<title>CUCC Expedition Handbook: Online system overview</title>
|
2018-08-03 21:41:20 +01:00
|
|
|
<link rel="stylesheet" type="text/css" href="../css/main2.css" />
|
2002-05-15 18:47:42 +01:00
|
|
|
</head>
|
|
|
|
|
<body>
|
2018-08-18 12:23:44 +01:00
|
|
|
<h2 id="tophead">CUCC Expedition Handbook - Online systems</h2>
|
|
|
|
|
<h1>Expo Online Systems Overview</h1>
|
2018-08-28 23:03:05 +01:00
|
|
|
<p>The online data and web publishing system (i.e. "the website") is now large and complicated with a lot of aspects.
|
2018-08-03 21:41:20 +01:00
|
|
|
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.
|
2018-06-28 21:03:32 +01:00
|
|
|
|
2018-08-18 12:23:44 +01:00
|
|
|
|
|
|
|
|
<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.
|
2013-06-20 04:06:44 +01:00
|
|
|
|
2018-08-28 23:03:05 +01:00
|
|
|
<p>These pages listed below have been reviewed recently (2018), and a
|
|
|
|
|
fuller list of "How do I..." instruction pages are on <a href="index.html">the handbook opening page</a>.
|
|
|
|
|
|
2013-06-20 04:06:44 +01:00
|
|
|
<ul>
|
2018-07-17 10:59:48 +01:00
|
|
|
<li><a href="uploading.html">Uploading your photos</a></li>
|
2018-07-13 22:55:38 +01:00
|
|
|
<li><a href="logbooks.html">Uploading typed logbooks</a></li>
|
2018-07-17 10:59:48 +01:00
|
|
|
<li><a href="gpxupload.html">Uploading GPS tracks</a></li>
|
2018-08-28 23:03:05 +01:00
|
|
|
<li><a href="survey/newcave.html">Recording a new cave discovery</a></li>
|
|
|
|
|
<li><a href="survey/status.html">Monitoring the status cave survey workflow during and after expo</a></li>
|
|
|
|
|
</ul>
|
|
|
|
|
<p>But the systems Manual is still being actively edited to extract and simplify documentaiton. At the moment
|
|
|
|
|
it is the only documentation we have for:
|
|
|
|
|
<ul>
|
|
|
|
|
<li><a href="manual.html#update">Manual: Creating a new 'year' in the system</a></li>
|
|
|
|
|
<li><a href="manual.html#update">Manual: Updating the cave guidebook descriptions</a></li>
|
|
|
|
|
<li><a href="manual.html#manual">Manual: Expo software and server maintenance manual</a></li>
|
2013-06-20 04:06:44 +01:00
|
|
|
</ul>
|
2018-08-18 12:23:44 +01:00
|
|
|
<h2><a id="update">Updating the online systems - overview</a></h2>
|
|
|
|
|
|
|
|
|
|
<h3>Experts short cut</h3>
|
|
|
|
|
|
|
|
|
|
<p>Short <a href="checkin.htm">command-line instructions</a> for updating the
|
|
|
|
|
data on the server
|
|
|
|
|
(using the <em>expo laptop</em>). This is a memory jog for experts, not beginners.</p>
|
|
|
|
|
|
2018-08-28 23:03:05 +01:00
|
|
|
|
2018-08-18 12:23:44 +01:00
|
|
|
<h3>Autogenerated pages</h3>
|
2018-08-28 23:03:05 +01:00
|
|
|
<p>Some key sections of the online webpages are autogenerated by scripts or by
|
2018-08-18 12:23:44 +01:00
|
|
|
<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
|
|
|
|
|
pages, QM (question mark) lists, expo members list, prospecting pages). All
|
|
|
|
|
autogenerated files say 'This file is autogenerated - do not edit' at
|
|
|
|
|
the top - so check for that before wasting time on changes that will
|
|
|
|
|
just be overwritten</p>
|
2013-06-20 04:06:44 +01:00
|
|
|
|
2018-08-28 23:03:05 +01:00
|
|
|
<h3 id="edithandbook">Editing this handbook and historic expo documentation</h3>
|
|
|
|
|
<p>The primary and recommended way of editing this handbook (and the website generally) is to use
|
|
|
|
|
a laptop which has the <a href="#mercurial">Distributed Version Control System</a> software installed. The
|
|
|
|
|
person editing needs to know how to use this software, and also needs to know how to edit raw HTML files
|
|
|
|
|
using a text editor.
|
2013-06-20 04:06:44 +01:00
|
|
|
|
2018-08-28 23:03:05 +01:00
|
|
|
<p>The <em>Expo laptop</em> has the software installed, so it is best to learn how to do this
|
|
|
|
|
when sitting at that laptop.
|
2017-08-19 00:59:32 +01:00
|
|
|
|
2018-08-18 12:23:44 +01:00
|
|
|
<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
|
2017-08-19 00:59:32 +01:00
|
|
|
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
|
2018-08-18 12:23:44 +01:00
|
|
|
easily.
|
2017-08-19 00:59:32 +01:00
|
|
|
|
2018-08-28 23:03:05 +01:00
|
|
|
<p>The recommended editing workflow is to (a) use the DVCM to synchronise your local laptop copy of the
|
|
|
|
|
website files with that on the server; (b) edit a set of .html files on your laptop so that all links between them are consistent,
|
|
|
|
|
save the files locally, and "commit" them locally;
|
|
|
|
|
(c) "push" the collection of changes to the expo online server as a single action.
|
|
|
|
|
<p>See the <a href="manual.html#manual">Expo data management systems manual</a> for a fuller description of the DVCM
|
|
|
|
|
repositories and how to install and use the software.
|
|
|
|
|
|
|
|
|
|
<h3 id="editthispage">Using "Edit this page"</h3>
|
|
|
|
|
|
|
|
|
|
<p>You can update a single webpage
|
|
|
|
|
online via a browser. This is best used for urgent edits to a single page, e.g.
|
|
|
|
|
if the emergency phone at top-camp has to use a new SIM with a different phone number.
|
|
|
|
|
If you are a logged-on user you will see "Edit this page" on the menu on the left of this page. It appears on
|
|
|
|
|
nearly all pages in this website. If you click on it you will be able to edit the raw HTML of the page - so you need
|
|
|
|
|
to know how to do that.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<p>After doing the page editing and saving your work, you need to ask a nerd to finish the process fairly soon as the "Edit this page"
|
2018-08-18 12:23:44 +01:00
|
|
|
mechanism does not tidy-up after itself properly.
|
|
|
|
|
See <a href="manual.html#editthispage">these instructions for this tidy-up</a>
|
2013-06-20 04:06:44 +01:00
|
|
|
|
2018-06-30 04:03:12 +01:00
|
|
|
|
2013-06-20 04:06:44 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2018-08-18 12:23:44 +01:00
|
|
|
<h3 id="mercurial">DVCS - version control</a></h3>
|
|
|
|
|
<p>We use a distributed revision control system (DVCS) for all the important data.
|
2018-08-28 23:03:05 +01:00
|
|
|
This means that many people can edit and merge their changes with the expo
|
|
|
|
|
server in Cambridge at the same time: inlcuding people still on expo in the Tatty Hut
|
|
|
|
|
and those who have returned to the UK. Also anyone who is up
|
|
|
|
|
to date can take their laptop somewhere and enter data even if they have no internet access,
|
|
|
|
|
and the updates will be merged when they get back to civilization.
|
2015-04-22 16:38:57 +01:00
|
|
|
</p>
|
2018-08-28 23:03:05 +01:00
|
|
|
<p>In principle, survey notes can be typed into a laptop up on the plateau which would
|
|
|
|
|
then get synchronised when it next gets internet access.
|
2018-08-18 12:23:44 +01:00
|
|
|
</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>
|
2015-04-22 16:38:57 +01:00
|
|
|
|
2013-06-20 04:06:44 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-07-18 03:27:28 +01:00
|
|
|
|
2018-08-18 12:23:44 +01:00
|
|
|
<h3 id="troggle">Troggle - what it is</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
|
2018-08-28 23:03:05 +01:00
|
|
|
and publish it on the web.
|
|
|
|
|
<p>Only a small part of troggle's original plan was fully implemented and deployed.
|
|
|
|
|
Many of the things it was intended to replace are still operating as a motley collection written by many different people in
|
|
|
|
|
several languages (but mostly perl and python; we won't talk about the person who likes to use OCamL).
|
|
|
|
|
Today troggle is used for only three things:
|
|
|
|
|
<ol>
|
|
|
|
|
<li>Reformatting all the visible webpages such that they have a coherent style and have a contents list at the top-left
|
|
|
|
|
hand corner. This is particularly true of the handbook you are reading now and the historic records of past expeditions.
|
|
|
|
|
<li>Publishing the "guidebook descriptions" of caves. The user who is creating a new guidebook description
|
|
|
|
|
can do this by filling-in some online forms.
|
|
|
|
|
|
|
|
|
|
<li>Providing a secondary way of editing individual pages of the handbook and historic records pages
|
|
|
|
|
for very quick and urgent changes.
|
|
|
|
|
This is the "Edit this page" capability; see <a href="#editthispage">above for
|
|
|
|
|
how to use it</a> and how to tidy up afterwards.
|
|
|
|
|
</ol>
|
2018-08-18 12:23:44 +01:00
|
|
|
|
2019-02-25 20:54:07 +00:00
|
|
|
<p>See the <a href="troggle-ish.html">notes on troggle</a> page
|
|
|
|
|
for how and why it was developed and what needs to be done.
|
2018-07-16 12:52:49 +01:00
|
|
|
|
2018-06-30 04:03:12 +01:00
|
|
|
|
2017-08-18 23:43:16 +01:00
|
|
|
<hr />
|
2002-05-15 18:47:42 +01:00
|
|
|
</body>
|
2002-05-19 17:48:09 +01:00
|
|
|
</html>
|
|
|
|
|
|
