format fixes

This commit is contained in:
Philip Sargent 2023-09-02 19:23:58 +03:00
parent d97c2a732c
commit dd2fda5be8
4 changed files with 2375 additions and 328 deletions

View File

@ -11,18 +11,6 @@
<p>As soon as possible after a trip finishes, a <b>hand-written write-up</b> of the trip is made in the nearest logbook:
the base camp logbook or the top camp logbook.
<ul>
<li>Why the logbook is so important
<li><a href="#type">Typing on the <em>Expo Laptop</em></a>
<li><a href="#another">Typing on another laptop</a>
<li><a href="#format">Formatting</a> a typed logbook entry
</br></br>
<li><a href="computing/logbooks-parsing.html">Importing</a> the logbook into troggle (nerds only) - and error checking
</ul>
<p>Please do NOT use the "Edit this page" capability to edit previous logbooks. The HTML format is not robust enough
(to be honest all this logbook stuff is a bit of a kludge). See the link above "<a href="computing/logbooks-parsing.html">Importing</a>" as any mistake will crash the import parser.
Historic logbooks should only be edited by an expert, and the import process should be tested offline before the edited logbook is uploaded to the server.
<h3 id="why">Why the logbook is important</h3>
@ -45,6 +33,16 @@ and
and then the
<a href="survey/index.htm">Survey Handbook</a>
<ul>
<li>Why the logbook is so important
<li><a href="#type">Typing on the <em>Expo Laptop</em></a>
<li><a href="#another">Typing on another laptop</a>
<li><a href="#format">Formatting</a> a typed logbook entry
<li><a href="computing/logbooks-parsing.html">Importing</a> the logbook into troggle (nerds only) - and error checking
</ul>
<h3>Initial rigging guide</h3>
<p>The logbook is the place where we record the rigging of caves as we discover them. You will manually copy the notes you made underground into the logbook.
<p>Writing up this and the final rigging guide is an important part of the Expo cave exploration process and is documented in <a href="survey/newrig.html">a specific "rigging" section</a> the survey handbook.
@ -52,12 +50,26 @@ and then the
<h4>Type it up</h4>
<p>If you are at basecamp, then it is an excellent idea to
<b>type the text of your logbook trip report</b> instead of writing it by hand - see <a href="#type">below</a>. But still do lots of drawings in the paper logbook.
<p>If you are up on the plateau, just write it up on your phone. OK you can't sketch diagrams really, but you can include photos easily. Just do it as a n email or a pot.
<p>We will have an online form for uploading logbook entries (text only, and HTML links to images) for the 2024 expo at <a href="/logbookedit/">/logbookedit/</a>.
<p>If you are up on the plateau, just write it up on your phone. OK you can't sketch diagrams really, but you can include photos easily. Just do it as an email or a photo.
<p>We now [September 2023] have an online form for uploading logbook entries (text only, and HTML links to images) for the 2024 expo at <a href="/logbookedit/">/logbookedit/</a>.
<h3 =id="type">Typing your trip report - in the UK Caving Blog</h3>
<p>In recent years we have seen an admirable increase in the number of people writing up their trips and experiences on social media and in particular on the UK Caving blog, see <a href="https://ukcaving.com/board/index.php?topic=25249.0">2019 Blog</a>. But please, please also make a handwritten entry in the logbook saying you have done this so that the text and pictures can be transcribed later. It is too easy to lose these: in 2018 there were two blogs in operation and most people didn't know that.
<h3 =id="type">Typing your trip report - using the online form</h3>
<p>If you have online access, then the best way to type up the text for for logbook entry is using the <a href="/logbookedit/">online form</a> (you will need to log in using the usual cavey:beery password for user 'expo').
<p>This will present no problems for newcomers, but old hands may find it a bit perplexing as it seems to be too simple.
<ul>
<li>Enter the date of the trip in ISO format, e.g. 2023-07-30
<li>Write in your name: you are the author of the piece. Use any of the <a href="http://localhost:8000/aliases/2023">troggle-recognised aliases</a> (which are specific to each expo). (On the 2023 expo we had three people called 'Adam', but in other years the name 'Adam' would be unique).
<li>Then write in the name of everyine involved, whether or not they were actually going underground, e.g. "Ash, Mealy, Jono, Flo, Hagrid"
<li>Then where it all happened. If you went caving at all, then use the cave name (Fishface) or cave id (1623-290) as this will be specially recognised and indexed.
<li>Then the title of what you did, e.g. " I drank Beer"
<li>Then the text of your logbook entry. This can be as short or as long as you like, and can containn HTML code if you like. Otherwise, just use a double newline to break paragraphs. (If you have scanned diagrams or photos then you will need to properly know how HTML works and need to contact a nerd to move the image files to the right place.)
<li>If anyone went underground, fill in the Time Underground field in decimal hours, e.g. '11.5' hours.
<li>CLick the big button "Update Logbook Entry"
</ul>
<h3 =id="type">Typing just your trip report (your phone or the <i>Expo Laptop</i>)</h3>
<p>As handwriting can be very bad, please try to type the text, print it and stick it in the logbook, adding any sketches by hand.
This will save someone (probably you) deciphering your handwriting and typing it up later.
@ -175,6 +187,12 @@ or
<code><pre>&lt;div class="trippeople"&gt;&lt;u&gt;Jenny Black&lt;/u&gt;, Olly Betts, <span style="color:red">*4 Hungarian Cavers</span>&lt;/div&gt;
</pre></code>
<h4>Editing logbooks</h4>
<p>Please do NOT use the "Edit this page" capability to edit previous logbooks [this has now, we hope, been disabled]. The HTML format is
not robust enough (to be honest all this logbook stuff is a bit of a kludge). See the link above "<a href="computing/logbooks-parsing.html">
Importing</a>" as any mistake will crash the import parser. [ Historic logbooks should only be edited by an expert, and the import process
should be tested offline before the edited logbook is uploaded to the server.
<p>It is not robust because it all depends on a rather hairy regex - all in one expression - which is of course very bad practice.
<hr />
Go on to <a href="computing/logbooks-parsing.html">Importing logbooks into troggle</a>.
<hr /></body>

View File

@ -749,10 +749,10 @@ Becoming bored of meandering upstream towards nothing at about 11pm we decided t
<br /><br />Found 2012-NS-13, took picture of enstrance - 292 Motte Hohle. Photos were lost, now in R Turnbull folder [Scanned survey notes, but no actual survey existing, so have resurveyed. By Wookey].
<br /><br />2012-NS-02 - needs to be katastered* (surveyed, photoed, tagged).
<br /><br />2010 - 02 - Resurveyed zigzag cave - Wookey drawing. Photos on Wookey's phone/device.
<div class="timeug">T/U: 1.0 hours each</div>
<br /><br />Wookey continued the next day with Phil + Dinny.
<div class="timeug">T/U: 1.0 hours each</div>
<hr />
<div class="tripdate" id="t2022-08-08d">2022-08-08</div>
@ -858,10 +858,14 @@ Small hole in [illegible] (~3m) shows a bit of cave passage not actually [illegi
<br /><br />Both photoed (Wook &amp; Philip) so both Katasterable.
<div class="timeug">T/U: 0.5 hours Dinny, Paul W</div>
<hr />
<div class="tripdate" id="2022_s17b_blog">2022-08-16</div>
<div class="trippeople"><u>Rachel Turnbull</u>, </div>
<br /><br />All "in cave notes" from 2022 survey folder are scanned to either Wook laptop or Luke's. Specifically, surveys 01-44. Where there is a drawn plan or elevation in the folder at this date it is also scanned. Exceptions 32 - Anthony - in folder 31, and 35 - Frank - PDA files in folder.
<div class="trippeople"><u>Rachel Turnbull</u></div>
<div class="triptitle">basecamp - Cave Notes</div>
<br /><br />
[From blog post dated 16th August.]<br>
All "in cave notes" from 2022 survey folder are scanned to either Wook laptop or Luke's. Specifically, surveys 01-44. Where there is a drawn plan or elevation in the folder at this date it is also scanned. Exceptions 32 - Anthony - in folder 31, and 35 - Frank - PDA files in folder.
<hr />
@ -876,7 +880,7 @@ En route back to base camp we stopped at a pharmacy to get some eye drops for me
<br>
So, camp was pretty successful, tying up plenty of leads and leaving some great new ones to go at on future trips, while also proving that camping in FF is a very good option with abundant resources and facilities along with a good CaveLink connection. In the final instalment, hear about what we found at the bottom of the big pitch Luke dropped, which we named Clap My Pitch Up not only in honour of the Prodigy song (which I liked to play as an antidote to the terrible music favoured by the Creche), but also in homage to the great musical traditions of Bad Aussee as observed at the summer festival.</div>
<div class="js-selectToQuoteEnd">&nbsp;</div>
<div class="timeug">T/U: 0.0 hours</div>
<hr />
@ -901,8 +905,6 @@ didn't go as long as expected. After completing the survey we went back down to
Amelia had returned and were bolting the traverse in Happy Butterfly. It sounded like they had a long way to go, so we decided to leave without derigging in case they
couldn't get down Happy Butterfly.
<div class="timeug">T/U: 6 hours</div> <!-- nb: TU should be 6 hours from ECL's personal notes -->
<br /><br />Insert scan for 290 clap my pitch up rigging guide
<div class="timeug">T/U: 0.0 hours</div>
@ -1461,7 +1463,6 @@ After what felt like a very long week at base camp, I was very excited to be goi
<img src="/years/2022/./blogimages/IMG-20220815-WA0007.jpg" data-url="" class="bbImage" data-zoom-target="1" style="" alt="IMG-20220815-WA0007.jpg" title="IMG-20220815-WA0007.jpg" loading="lazy">
</div></div>
<div class="js-selectToQuoteEnd">&nbsp;</div>
<div class="timeug">T/U: 0.0 hours</div>
<hr />
@ -1489,7 +1490,6 @@ Back at camp we made a strong effort to eat as much camp food as possible to red
<br>
With camp packed up, we started the long, muddy slog up Mongol Rally, weighed down with camping kit. We met the first wave of the de-rig team at the top of Mongol Rally and the second wave shortly after, at which point came the very welcome offer of help with bag carrying. We made it out just in time to catch the last light of the day, which was very welcome after two nights underground.</div>
<div class="js-selectToQuoteEnd">&nbsp;</div>
<div class="timeug">T/U: hours</div>
<hr />

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff