Merge branch 'expoweb' of ssh://expo.survex.com/home/expo/expoweb into expoweb

handbook/computing/todo-data.html

@@ -76,7 +76,7 @@ If a heading is in italics, then there are hidden items.
 
     <dt>Add missing images to logbooks</dt>
     <dd><!--2020-04-30 psargent-->
-    2018, 2017, 2009, 2008, 2001 , 2000, 1992, 1989,..2011? List here: <a href="../../pubs.htm">pubs.htm</a> Previous years HTML logbooks are missing images extracted from scanned PDF copies of the logbooks. </dd>
+    2018, 2009, 2008, 2001 , 2000, 1992, 1989,..2011? List here: <a href="../../pubs.htm">pubs.htm</a> Previous years HTML logbooks are missing images extracted from scanned PDF copies of the logbooks. </dd>
     <dt>2018 logbook:</dt>
     <dd><!--2020-05-10 psargent--> RENAME files of photos /2018/BlogPostPhotos/* from .JPG to .jpg as the generated .xml files get confused.
     <dt>2011 logbook:</dt>
@@ -86,6 +86,8 @@ If a heading is in italics, then there are hidden items.
 
     <dt>200? logbook:</dt>
     <dd>Type up "list of GPS locations still to type"</dd>
+    <dt>2017 logbook remaining diagrams?</dt>
+    <dd>DONE 2020-08-01</dd><!--2020-08-01 psargent-->
 </dl>
 <h3>Wallets/Scan fettling</font></h3>
 <dl>

handbook/l/life-wallet.html

@@ -13,10 +13,16 @@ CUCC Expo Handbook: Wallet Process UML Diagrams
 <div class="centre">
 <img alt="wallet process lifecycle diagram" src="../i/life-wallet.jpg"  /></div>
 
-<p>This diagram was created online using the free software at <a href="https://app.creately.com/diagram/4nGSj2FkKGg/edit">https://app.creately.com/</a>
+<p>This "activity" diagram was created online using the free software at <a href="https://app.creately.com/diagram/4nGSj2FkKGg/edit">https://app.creately.com/</a>
 
 <p>
 You can edit your own version to revise this when it becomes outdated.
+
+<p>We also have a "<a href="seq-wallet.html">sequence diagram</a> which shows clearly the sequence of wallet actions in a time-line.
+
+<p>Both "activity" and "sequence" diagrams are part of the UML software specifiction system. We also have a "<a href="trogclass-1.html">class</a>" diagram for troggle.
+That page also defines the "essential", "specification" and "implementation" levels at which troggle is designed and maintained.
+
 <p>
 Statcharts are a standard diagram in the analysis of complex systems. 
 They are  used by the more professional analysts when planning a new software system. They are not quite the same thing as a finite state machine:
@@ -26,8 +32,8 @@ They are  used by the more professional analysts when planning a new software sy
 <li><a href="https://en.wikipedia.org/wiki/UML_state_machine">wikipedia.org/wiki/UML_state_machine</a>
 </ul>
 <p><em>"The Statechart diagram is one of the five UML diagrams used to model the dynamic nature of a system. They define different states of an object during its lifetime and these states are changed by events. Statechart diagrams are useful to model the reactive systems. Reactive systems can be defined as a system that responds to external or internal events.</em>
-<p>They were devised by David Harel, Weizmann Instiutute, in his paper: <a href="https://www.inf.ed.ac.uk/teaching/courses/seoc/2005_2006/resources/statecharts.pdf">STATECHARTS: A VISUAL FORMALISM FOR
-COMPLEX SYSTEMS</a> Science of Computer Programming 8 (1987) 231-274.
+<p>They were devised by David Harel, Weizmann Instiutute, in his paper: <a href="https://www.inf.ed.ac.uk/teaching/courses/seoc/2005_2006/resources/statecharts.pdf">Statecharts: A Visual Formalism For Complex Systems</a> Science of Computer Programming 8 (1987) 231-274.
+Or for a quicker cheat-sheet, see <a href="https://instadeq.com/blog/posts/paper-didnt-read-statecharts-a-visual-formalism-for-complex-systems/">Paper; Didn't Read - Statecharts</a>
 <!--
 Wallet Lifecycle Statechart
 # Philip Sargent 20 May 2020

handbook/l/seq-wallet.html

@@ -21,6 +21,12 @@ CUCC Expo Handbook: Wallet Process UML Diagrams
 <li><a href="https://www.tutorialspoint.com/uml/uml_interaction_diagram.htm">Sequence and Collaboration Diagrams</a>
 <li><a href="https://www.guru99.com/interaction-collaboration-sequence-diagrams-examples.html">Interaction, Collaboration, Sequence Diagrams</a>
 </ul>
+<p>We also have a "<a href="life-wallet.html">activity</a>" lifecycle diagram which shows clearly the states which a wallet can be in during its life.
+
+<p>Both "activity" and "sequence" diagrams are part of the UML software specifiction system. We also have a "<a href="trogclass-1.html">class</a>" diagram for troggle.
+That page also defines the "essential", "specification" and "implementation" levels at which troggle is designed and maintained.
+
+<h3>This diagram</h3>
 <p>This diagram was created online using the free software at <a href="https://www.websequencediagrams.com/">www.websequencediagrams.com/</a>.
 <p>
 You can edit your own version to revise this when it becomes outdated. <br>This is the entire source code that generates the diagram:

handbook/l/trogclass-1.html

@@ -21,8 +21,10 @@
 <p>So <strong>a survex (SVX) file</strong> is dated to a particular day during the expedition and usually has between 1 and 3 people associated with it.
 <p>A <strong>Logbook entry</strong> has several people involved and may relate to a cave. It will be dated to a day during the expedition.
 
+<p>Although the volume of data in troggle is small, the complexity is significantly intricate that "modern" (i.e. from the mid 1990s) system design tools are compact and useful.
+
 <h3>Design Diagrams</h3>
-<p>Analysis of expo and design of troggle is done using three levels:
+<p>Analysis of expo and design of troggle is done using <a href="#cookanddaniels">three levels</a>:
 <style>
 li {padding-left: 0;margin-left: 0;line-height:160%;}
 ul, ol {padding-inline-start: 1em;}
@@ -35,9 +37,13 @@ ul, ol {padding-inline-start: 1em;}
 <p>As anyone reading this has probably been on expo and you might think that we can skip the <strong>real-world level</strong>. Not so: the multiplicities (the number of participants in the association) of the relationships between the different cave survey artefacts can be surprising.
 <p>The <strong>specification level</strong> is where the action is. 
 This is where we decide which aspects of the real world <em>we will ignore</em> and what <em>extra concepts</em> we need to make things work. 
-<p>So we ignore who is resident at top-camp (even though today we record this religiously because of the tax implications for the GastHof at base). We do need to track the in-computer associations between survex files: the *include tree, what directories they live in, what wallet-directory they relate to, and all the individual survex blocks of survey measurements within each survex file.
+<p>So <em>we ignore</em> who is resident at top-camp (even though today we record this religiously because of the tax implications for the GastHof at base). We <em>do</em> need to track the in-computer associations between survex files: the <var>*include</var> tree, what directories they live in, what wallet-directory they relate to, and all the individual survex blocks of survey measurements within each survex file.
+
+<p>We only need <strong>implementation-level</strong> diagrams for tiny, tricky issues. Python is very clear so serves as its own implementation specification. However Django does need some explanation even to a competent python programmer if they have not used it before.
+
+<p>For a fundamental background to system specification the classic work of <a href="http://www.syntropy.co.uk/syntropy/designing-object-systems.pdf">Cook and Daniels</a> (online PDF, 400 pages) cannot easily be improved upon (start reading at page 10, second paragraph).
+
 
-<p>We only need <strong>implementation-level</strong> diagrams for tiny, tricky issues. Python is very clear so serves as its own implementation specification. However Django does need some explanation.
 <h3>Class Diagrams</h3>
 <p>A Class Diagram is one the the basic types of structural diagram (as opposed to behavioral diagrams) used to understand complex systems.
 <ul>
@@ -45,11 +51,16 @@ This is where we decide which aspects of the real world <em>we will ignore</em>
 <li><a href="https://www.tutorialspoint.com/uml/uml_class_diagram.htm">UML - Class Diagram</a>
 </ul>
 <p>
-The purpose of class diagram is to model the static view of an application. 
+The purpose of class diagram is to model the static view of an application: the unchanging structure.
 
+<h3>Other UML Diagrams documenting Expo systems</h3>
+<p>Class diagrams describe structure, but there are useful diagrams that describe <em>behaviour</em> too. Not much of our process is complicated enough to need them though.
+<p>The <a href="life-wallet.html">wallet lifecycle</a> is a "<a href="https://en.wikipedia.org/wiki/Interaction_overview_diagram">interaction</a>" diagram showing the states and transitions between the states for a plastic wallet holding original caving notes and the software equivalent directory. The <a href="seq-wallet">wallet process</a> is a "<a href="https://en.wikipedia.org/wiki/Sequence_diagram">sequence</a>" diagram showing which actors (people) interact with a wallet during its lifecycle: inserting pages from the waterproof notebook, taking the notes and sketches and scanning the, processing the survey data to produce centreline plots etc.
+<p>The hand-drawn sketch title "Packages" on the <a href="../troggle/trogarch.html">troggle architecture</a> page is a UML "deployment" diagram.
+<p>See <a href="https://www.martinfowler.com/tags/uml.html">Fowlers pages on UML</a> for more examples of UML in use.
 
 <h3>Online free class diagram editor</h3>
-<p>This diagram was created online using the YUML free software at <a href="https://yuml.me/mkay2100/edit/Troggle-1">https://yuml.me//</a>.
+<p>The Class diagram on this page was created online using the YUML free software at <a href="https://yuml.me/mkay2100/edit/Troggle-1">https://yuml.me//</a>.
 <p>
 You can edit your own version to revise this when it becomes outdated. <br>This is the entire source code that generates the diagram:
 <pre><code style ="font-size:x-small">
@@ -91,7 +102,47 @@ You can edit your own version to revise this when it becomes outdated. <br>This
 [PersonExpedition{bg:yellowgreen}]
 
 </code></pre>
-
+<h3 id="cookanddaniels">Cook & Daniels - Three Levels</h3>
+<p>From <a href="http://www.syntropy.co.uk/syntropy/designing-object-systems.pdf">Cook and Daniels</a> (online PDF, 400 pages, pp10-11):
+<div style="text-align: left; font-size: smaller; margin-left: 7%; margin-right:15%">
+<p>
+"In this book we present three kinds of object-oriented model. The first kind, which
+we call <em>the essential model</em>, considers the model to be a description of some real or
+imaginary situation, which may or may not contain software. We use the word
+situation rather than system because ‘system’ has so many possible meanings including
+the software we may be trying to build, and rather than world to emphasise that we are
+considering purposeful systems situated in a context rather than trying to describe all of
+some supposedly objective reality. <em>The purpose of building the essential model is to
+understand and establish the facts about this situation.</em> The building blocks which we
+use to build essential models are objects (actually object types) and events (actually
+event types). An essential model is built by drawing annotated diagrams, and
+interpreted as descriptions of sets, functions and sequences with meanings in the
+situation being described.
+<p>
+In the second kind of model, called <em>the specification model</em>, we are concerned with
+specifying software. To create a specification model it is necessary to establish <em>which
+parts of the overall situation will be implemented in software</em>. In some cases this might
+be a large part of the situation, whereas in others it might not be a part at all. The
+activity of specifying exactly what is to be implemented in software is quite different
+from the activity of establishing the facts about the overall situation; however both of
+these activities would conventionally fall under the heading of ‘analysis’. Like
+essential models, specification models deal with objects and events and are built by
+drawing annotated diagrams. They are interpreted as a description of the abstract
+stimulus–response behaviour of the software. The specification model describes
+software at a high level of abstraction, and in particular says nothing about internal
+sequencing or concurrency. An important part of building a specification model is the
+allocation among object types of responsibility for aspects of software behaviour.
+<p>
+The third kind of model, <em>the implementation model</em>, is concerned with establishing
+patterns of control flow within the software. In this model we take into account the
+fact that computer programs have a limited number of well-defined flows of control,
+which execute at a finite speed. The building blocks for implementation models are
+objects and messages. Object interactions are described as messages sent from one
+object to another, and the implementation model describes message sequencing and
+concurrency control. Annotated diagrams are used again, although in the 
+implementation model our repertoire of diagrams is richer than for the other kinds of
+model."
+</div>
 <hr />
 </body>
 </html>

handbook/survey/caveentry.html

@@ -54,6 +54,12 @@ This page outlines step 6 of the survey production process. Each step is documen
     fields filled in. You can then fill out the form for your new cave using that as an example to follow. But of course be
     very careful not to actually chenge anything on the form you have open for editing.
   </p>
+  <h3>New Cave Number</h3>
+  <p>For a totally new cave you will be using a temporary number such as 2017-CUCC-24 or 2018-dm-07, not an Austrian official-issued Kataster number. But you may have been surveying a new passage in an established cave in which case you will need to find out if it has recently been issued with a Kataster number.
+  <p>The list in the "<a href="/caves">Caves</a>" page (the menu item "Caves" in the vertical menu in the top-left of the page you are reading now)
+  shows all the caves which have been already "created" within the online system. You can see a slightly-more updated list in the  
+  <!-- replace this with a link to a page with an IFRAME so that the UTF-8 is done right -->
+  <a href="../../noinfo/cave-number-index">Cave Number Index</a> which includes caves which are in the process of being registered but may not have been "created" using either of the two methods described here.
   <h3>New Cave form</h3>
   <p>The links to follow to open up the "New Cave" form or the "Edit Cave" forms are 
     somewhat obscure. <!--We should change this! --> 
@@ -95,6 +101,7 @@ The username is "expo" and the password is the usual "{cavey}:{beery}" one.
   So a new entrance has to be assigned to an existing cave (which is in the drop-down), and edited correctly later once troggle has
   fully
   absorbed the existence of your new cave.
+  <p>Also until <em>both</em> a cave and an entrance have been created in the troggle system, neither will appear in the various reports.
 
   <h3>Detailed walk-through of an example</h3>
   <p>TO BE DONE - in a separate page</p>

handbook/survey/newsurvex.html

@@ -31,9 +31,18 @@ This page outlines step 3 of the survey production process. Each step is documen
     So you do not need to have installed survex on your laptop at this point.
 </p>
 
+<h4 >Two ways to type in survex data</h3>
+<ul>
+<li>Either you can create a new file and use a text-editor on the <em>expo laptop</em>, as described immediately below,
+<li>Or you can use the online system using a web browser from any computer anywhere. This is much, much easier. To do this you need to
+be somewhat confident of the name (the surveytripid) you will be using. Instructions are 
+<a href="#onlinesvx">at the bottom of  this page</a>. <br>[This capability has been broken for many years. It is now fully restored in 2020.]
+</ul>
+
 <h3 id="survexformat">Typing in the survey data in survex format</h3>
 
 
+
 <p>The survey data typed up must include all the notes, including station details and passage
 names. Make a backup copy to another machine or USB stick as soon as you have typed it in. 
 
@@ -106,6 +115,68 @@ straighforward p10.
     to make it easier for yourself.
 </p>
 
+<h3><a id="onlinesvx">Using the direct online system</a></h3>
+<p>Having confirmed the right name to use for your cave, including whether it is in area 1623 or 1626, e.g. 
+<pre>
+caves-1623/2050-cucc-01/easybimble.svx
+</pre>
+open a web browser on the equivalent page 
+<pre>
+http://expo.suvex.com/survexfile/caves-{area}/{cave}/{surveytripid}.svx
+</pre>
+e.g.
+<pre>
+<a href="http://expo.suvex.com/survexfile/caves-1623/2050-CUCC-01/easybimble.svx">http://expo.suvex.com/survexfile/caves-1623/2050-CUCC-01/easybimble.svx</a>
+</pre>
+and a suvex-file editing page will open, pre-populated with an example template 
+for survex data, most of which you will delete and replace. Edit this template and type in your own data.
+<p>You can save your work by pressing the "Save this edited svx file" button, but it
+will refuse to save until you have hand-edited out all the template material in [square brackets].
+<p>As you edit it, you can
+press the "Differences between edited and saved versions of this file" and the differences which
+comprise your recent typing will be listed below the edit window.
+<p>Before you finish typing, use the third button "Run 'cavern' on this file".
+<br>
+- If you haven't yet removed all the [square brackets] stuff, nothing will happen except a message 
+<pre>  SAVE FILE FIRST</pre> 
+below the edit window.
+<br>
+- If you try to save before editing out the [square brackets] stuff then you wil get a message 
+<pre>  Error: remove all []s from the text. They are only template guidance.
+</pre> below the editing window.
+<br>
+- But if you have done all that, then survex will process your new survex file and tell you interesting things about your survey data below the editing window. ('<a href="https://survex.com/docs/manual/cavern.htm">cavern</a>' is the survex engine which we use to process survex files.) 
+<p>You may see a number of error messages below the editing window: <em>read them and understand them</em>. If you don't understand them, <em>ask someone</em>.
+
+<p>So using the online system gives you a very, very easy way of syntax-checking your data entry and 
+typing up your notes.
+
+<p>The output you get from 'cavern' will look like this (yes this really does take less than 0.01s):
+<pre>
+    LOGMESSAGES
+    Survey contains 21 survey stations, joined by 23 legs.
+    There are 3 loops.
+    Total length of survey legs =  305.80m ( 305.79m adjusted)
+    Total plan length of survey legs =  253.09m
+    Total vertical length of survey legs =  125.24m
+    Vertical range = 44.74m (from galactica.1 at 0.35m to galactica.20 at -44.39m)
+    North-South range = 99.31m (from galactica.19 at 28.14m to galactica.12 at -71.17m)
+    East-West range = 53.27m (from galactica.1 at 1.12m to galactica.9 at -52.15m)
+       3 1-nodes.
+      13 2-nodes.
+       3 3-nodes.
+       2 4-nodes.
+    CPU time used  0.00s
+</pre>
+<h4>Folders and subfolders</h4>
+<p>If you have a complex cave like 204 or 161 with many separate exploration zones then you can put subfolder names in the
+URL bar e.g. 
+<pre>
+<a href="http://expo.suvex.com/survexfile/caves-1623/2050-CUCC-01/murderalley/killerclimb/easybimble.svx">http://expo.suvex.com/survexfile/caves-1623/2050-CUCC-01/murderalley/killerclimb/easybimble.svx</a>
+</pre>
+and the intermediate directories will be created on the server if they don't already exist. This is in addition to 
+the directory name which is also the name of your new cave being created automatically.
+
 <hr />
 <p>Back to the previous page in this sequence 
     <a href="newwallet.html">Creating a new survey wallet</a>.

handbook/survey/newwallet.html

@@ -80,6 +80,14 @@ survey books are divided into "Kaninchenhöhle" (usually referred to as
 "notKH survey book"). There should be an index page at the front, which you
 should also fill in so that people can find your survey again.</p>-->
 
+<h3 id="existing">Check existing online wallets (surveyscans folders)</h3>
+<p>As well as looking through the other plastic wallets in this year's lever-arch binder, have a look online at 
+the <a href="/survey_scans/">list of all online wallets</a> and have a look at all the folders referred to
+in your cave in, e.g. here is the data for <a href="/survexfile/204">cave 204</a>: the wallet identifier is 
+in the right-most column titles "Scans". If you are doing an entirely new cave, then this won't exist yet but it
+will be where your new discovery is eventually published.
+<p>As well as following through the links on those pages, have a look at the <a href="/tunneldata/">drawings files page</a> which lists all the scanned notes, plan and elevation scans in the each wallet ("Scans folder" column). 
+
 <h3 id="onlinew">Scan the notes into the online wallet</h3>
 <style>figure {font-weight: bold; font-size: small; font-family: sans-serif;font-variant-caps: small-caps;}</style>
 <div  class="onright">

handbook/troggle/trogarch.html

@@ -55,7 +55,7 @@ See the <a href="https://docs.djangoproject.com/en/3.0/misc/design-philosophies/
 <h3>Troggle parsers and input files</h3>
 <div class="onright">
 <figure>
-<a href="https://djangobook.com/mdj2-django-structure/"><img src="mtv_drawing2.jpg"></a>
+<a href="https://djangobook.com/mdj2-django-structure/"><img src="../i/mtv_drawing2.jpg"></a>
 <br><figcaption>Django server and webpage (client)</figcaption>
 </figure>
 </div>

years/2017/logbook.html

@@ -8,7 +8,9 @@
 
 <body id="logbk">
 <h1>CUCC Expo Logbook 2017</h1>
-
+<p>
+<h2>See also: <a href="ukcaving/index.html">UK CAVING ILLUSTRATED BLOG</a> </h3>
+<p>
 <hr />
 <div class="tripdate" id="t2017-07-18a">2017-07-18 - 2017-07-20</div>
 <div class="trippeople"><u>Chris Densham</u>, Elliott Smith, Katey Bender</div>
@@ -170,8 +172,13 @@ pitches with horizontal continuations over them. Surveyed.</p>
 
 <p><img src="logbkimg4.jpeg" title="Rigging guide Sloppy Seconds 1, First pitch (in HiltaPlenty, Balkonhoehle)" alt="Rigging guide Sloppy Seconds 1 in HiltaPlenty, Balkonhoehle"></p>
 <p><img src="logbkimg5.jpeg" title="Rigging guide Sloppy Seconds 1, Second Pitch (in HiltaPlenty, Balkonhoehle)" alt="Rigging guide Sloppy Seconds 1 in HiltaPlenty, Balkonhoehle"></p>
+
+<p><img src="ss1+2.jpg" title="Rigging guide Sloppy Seconds pitches 1 and 2 (in HiltaPlenty, Balkonhoehle)" alt="Rigging guide Sloppy Seconds pitches 1 and 2 (in HiltaPlenty, Balkonhoehle)"></p>
+
+
 <div class="timeug">9 hrs</div>
 
+
 <hr />
 <div class="tripdate" id="t2017-07-20a">2017-07-20</div>
 <div class="trippeople"><u>Nathan W</u>, Adam A, Katey B</div>
@@ -815,13 +822,12 @@ to come and sit at a pitch head while I bolt for over <strike>3 hours</strike>
 enthusiasm for caving yet needing an excuse to stay at the Stone
 Bridge, I saw a golden opportunity to utilise the Brendan Cave Cinema
 System<sup>TM</sup>.</p>
-<p><img src="logbkimg.jpeg" alt="Diagram of Brendan Cave Cinema System"></p>
 <p>This device had
 previously been tested with great success in Balkonh&ouml;hle with Corin.
 We were able to watch the whole of Skyfall before ASH had finished
 rigging his pitch. 
 </p>
-<p><img src="logbkimg.jpeg" alt="Diagram of Brendan Cave Cinema System in action at The Beast"></p>
+<p><img src="skyfall.jpg" alt="Diagram of Brendan Cave Cinema System in action at The Beast"></p>
 <p>Adam and I found
 a comfortable spot next to a window through which we could see/hear
 George rigging. I told George he would have to scream at least three
@@ -835,7 +841,7 @@ corner). George and I met at the pitch head to catch up. He had
 rigged to the bottom… it crapped out. But the good news was it
 ended next to another pitch [later termed ‘Not the Beast’] which
 had been rigged previously…</p>
-<p><img src="logbkimg.jpeg" alt="Diagram of The Beast and Not The Beast"></p>
+<p><img src="beast2017-08-02.jpg" alt="Diagram of The Beast and Not The Beast"></p>
 <div class="timeug">10 hrs</div>
 
 <hr />
@@ -989,7 +995,7 @@ looking over the lead, Rachel and I sat in the bothy and put on extra
 layers while Becka bolted the main pitch [named Snake Pit] down to
 the water. 
 </p>
-<p><img src="logbkimg.jpeg" alt="Rigging Topo"></p>
+<p><img src="ugcamp-2017-07-31.jpg" alt="Rigging Topo"></p>
 <p>The water came
 from a large ~15m aven just upstream of the pitch. The majority of
 the water went down a low passage, along ~50m of vadose rift with
@@ -997,13 +1003,13 @@ frequent pools and free climbs with flaky sharp limestone. The main
 route comes up and left of the water into a rift canyon with pools
 and a short 2m climb. Eventually a pitch head (P6) comes up marking
 the start of a series of three short pitches.</p>
-<p><img src="logbkimg.jpeg" alt="Rigging Topo"></p>
+<p><img src="p6-2017-07-31.jpg" alt="Rigging Topo"></p>
 <p>Ended at the
 second pitch, uneventful back to camp. Up early on the 1<sup>st</sup>,
 headed back to the front with the remaining drill batteries. Third
 pitch becomes tighter and leads to a fourth pitch. 
 </p>
-<p><img src="logbkimg.jpeg" alt="Rigging Topo"></p>
+<p><img src="4th-2017-07-31.jpg" alt="Rigging Topo"></p>
 <p>Unfortunately,
 here we ran out of drill battery so had to turn back, both to camp
 and then out to the surface. A brief lunch of noodles fuelled Rachel
@@ -1040,7 +1046,7 @@ front. For expedience I started bolting - a short traverse then
 partially down a small pitch. As the rift at the base was small, we
 progressed at part height before descending the second part further
 along.</p>
-<p><img src="logbkimg.jpeg" alt="Rigging topo"></p>
+<p><img src="2017-08-02-20m-rope.jpg" alt="Rigging topo"></p>
 <p>Then the rift
 degenerated into small and catchy passage. After initially trying to
 go for a ‘look-see’ in case of another pitch, I returned and
@@ -1083,7 +1089,8 @@ rebelay ~2m down shaft. I descended to the end of the rope (22m + 9m
 continues underneath ledge turning back on itself (limit of 2016
 exploration). Further 4m downclimb and the passage very soon gets too
 tight/filled in. ascending passage on the left ends similarly. DEAD.</p>
-<p><img src="logbkimg.jpeg" alt="Rigging topo and survey sketch"></p>
+
+<p><img src="p30-ish.jpg" alt="Rigging topo and survey sketch"></p>
 <p><i>Pete’s hole:
 </i>wriggle down a slot and climb down ~2m. Very short crawl
 immediately ends in tiny chamber with draft emerging from under large
@@ -1225,7 +1232,8 @@ pitches. The snow plugs were the smallest ever seen, according to
 Becka. 
 </p>
 <div class="timeug">2 hrs</div>
-<p><img src="logbkimg.jpeg" alt="Rigging topos for GSH"></p>
+
+<p><img src="gsh-rg.jpg" alt="Rigging topos for GSH"></p>
 
 <hr />
 <div class="tripdate" id="t2017-08-02e">2017-08-02</div>
@@ -1287,7 +1295,7 @@ above Procrastination with plenty of time to spare. All went very
 smoothly until the entrance pitch, where we had to pass Ruairidh,
 Aidan, Fleur and Pete on their way down. Got to the surface just in
 time to get rained on on the walk back to Top Camp.</p>
-<p><img src="logbkimg.jpeg" alt="Rigging Topo Lower Snakebite and Beckoning Silence"></p>
+<p><img src="snakebite.jpg" alt="Rigging Topo Lower Snakebite and Beckoning Silence"></p>
 <div class="timeug">29 hrs</div>
 
 <hr />
@@ -1305,6 +1313,10 @@ section to snowslope, 40m. Tagged. [Adam and Corin returned to this
 the next day and crapped it out).</p>
 <p>#2 and 3: three
 big holes and pit, see survey notes. [WALLET?]</p>
+<p>[Editors note: Adam managed to mislay all the notes of this trip,
+including the numbers of the tags made and left in the caves;
+ and the notes were not found on the 2018 or 2019 expos despite looking for them.
+ They never went near a wallet apparently.]
 
 <hr />
 <div class="tripdate" id="t2017-08-06d">2017-08-06</div>
@@ -1436,7 +1448,7 @@ way choked after two climbs down. But the other way led to a drafting
 tube - yay, we had refound the wind! More dodgy natural rigging saw
 us at the end of the rope staring down a two metre wide steep
 phreatic ramp. Game on!</p>
-<p><img src="logbkimg.jpeg" alt="Rigging topos for Second Wind"></p>
+<p><img src="two-hole-horror.jpg" alt="Rigging topos for Second Wind"></p>
 <div class="timeug">14 hrs</div>
 
 <hr />
@@ -1464,7 +1476,7 @@ rope and gear as we could manage, making it out at 11pm. Had some
 final excitement as thunderstorm broke while I was on the entrance
 shaft and got a soaking. But out to amazing lightning show and lots
 of thunder.</p>
-<p><img src="logbkimg1.jpeg" alt="Rigging topo for Second Hand"></p>
+<p><img src="second-hand.jpg" alt="Rigging topo for Second Hand"></p>
 <div class="timeug">13 hrs</div>
 
 <hr />
@@ -1528,7 +1540,8 @@ eventually gained the surface.</p>
 <p><i>Note from
 Alice: </i>the bottom of the pitch series led to a shelf that I was
 unable to reach. The cross section below shows the rigging at the
-time. <img src="logbkimg.jpeg" alt=""></p>
+time. 
+<p><img src="rebelay-shelf.jpg" alt=""></p>
 <div class="timeug">7 hrs</div>
 
 <hr />
@@ -1585,7 +1598,7 @@ cylinder and large selection of oatso’s and soups. Fairly
 frustrated, we braved the not-very-wet entrance. 
 </p>
 <div class="timeug">10hrs</div>
-<p><img src="logbkimg.jpeg" alt="Sketvch survey of Loser Lido sump below Grike of the Earth"></p>
+<p><img src="sump.jpg" alt="Sketvch survey of Loser Lido sump below Grike of the Earth"></p>
 
 <hr />
 <div class="tripdate" id="t2017-08-07g">2017-08-07</div>