From 4be83487796128b725ed0923c59095891bc07805 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@klebos.com>
Date: Thu, 24 Mar 2022 22:37:14 +0000
Subject: [PATCH] updated logbook parsing docm
---
handbook/computing/logbooks-parsing.html | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/handbook/computing/logbooks-parsing.html b/handbook/computing/logbooks-parsing.html
index 82b3b70d3..78ea6927e 100644
--- a/handbook/computing/logbooks-parsing.html
+++ b/handbook/computing/logbooks-parsing.html
@@ -5,7 +5,7 @@
<title>CUCC Expedition Handbook: Logbook import</title>
<link rel="stylesheet" type="text/css" href="../../css/main2.css" />
</head>
-<body><style>body { background: #fff url(/images/style/bg-system.png) repeat-x 0 0 }</style>>
+<body><style>body { background: #fff url(/images/style/bg-system.png) repeat-x 0 0 }</style>
<h2 id="tophead">CUCC Expedition Handbook</h2>
<h1>Logbooks Import</h1>
@@ -21,8 +21,8 @@
<p>The nerd needs to do this:
<ol>
-<li>Look at the list of pre-existing old import errors at </br> <a href="http://expo.survex.com/admin/core/dataissue/">http://expo.survex.com/admin/core/dataissue/</a> </br>
-The nerd will have to login to the troggle management console to do this, not just the usual troggle login.
+<li>Look at the list of pre-existing old import errors at <a href="/dataissues">Data Issues</a> </br>
+
<li>You need to get the list of people on expo sorted out first. </br>
This is documented in the <a href="folkupdate.html">Folk Update</a> process.
<li>Log in to the expo server and run the update script (see below for details)
@@ -35,10 +35,9 @@ This is documented in the <a href="folkupdate.html">Folk Update</a> process.
<p>The procedure is like this. It will be familiar to you because
you will have already done most of this for the <a href="folkupdate.html">Folk Update</a> process.
-<pre><code>ssh {youruserid}@expo.survex.com
-cd ~expo
+<pre><code>ssh expo@expo.survex.com
cd troggle
-sudo python databaseReset.py logbooks
+python databaseReset.py logbooks
</code></pre>
<p>It will produce a list of errors like these below, starting with the most recent logbook which will be the one for the expo you are working on.
@@ -58,6 +57,13 @@ Calculating GetPersonExpeditionNameLookup for 2017
<p>Errors are usually misplaced or duplicated <hr /> tags, names which are not specific enough to be recognised by the parser (though it tries hard) such as "everyone" or "et al." or are simply missing, or a bit of description which has been put into the names section such as "Goulash Regurgitation".
+<p>When you have sorted out the logbooks formatting and it is no longer complaining,
+you will need to do a full database reset as this will have trashed the online database and none of the troggle webpages will be working:
+<pre><code>ssh expo@expo.survex.com
+cd troggle
+python databaseReset.py reset
+</code></pre>
+which takes between 300s and 15 minutes on the server.
<h3 id="history">The logbooks format</h3>
<p>This is documented on the <a href="../logbooks.html#format">logbook user-documentation page</a> as even expoers who can do nothing else technical can at least write up their logbook entries.
@@ -66,6 +72,7 @@ Calculating GetPersonExpeditionNameLookup for 2017
<p>The formatting was largely freeform, with a bit of markup ('===' around header, bars separating date, <place> - <description>, and who) which allows the troggle import script to read it correctly. The underlines show who wrote the entry. There is also a format for time-underground info so it can be automagically tabulated.</p>
+<!--
<p>So the format should be:</p>
<code>
@@ -75,6 +82,7 @@ Calculating GetPersonExpeditionNameLookup for 2017
</br>
T/U: Jess 1 hr, Emma 0.5 hr
</code>
+-->
<p>
<a href="../logbooks.html">Back to Logbooks for Cavers</a> documentation.
<hr />