diff --git a/handbook/computing/todo.html b/handbook/computing/todo.html
index e483dc6bd..b8029d415 100644
--- a/handbook/computing/todo.html
+++ b/handbook/computing/todo.html
@@ -45,7 +45,9 @@ If a heading is in italics, then there are hidden items.
Wallets and new-cave
svx check
* As people spend longer and longer at top camp, we may establish @@ -86,7 +92,9 @@ the list of all online wallets and have a look at a in your cave in, e.g. here is the data for cave 204: 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. -
As well as following through the links on those pages, have a look at the drawings files page which lists all the scanned notes, plan and elevation scans in the each wallet ("Scans folder" column). +
As well as following through the links on those pages, have a look at the +drawings files page which lists all the scanned notes, +plan and elevation scans in the each wallet ("Scans folder" column).
Scanned survey notes are voluminous and so are not kept in the version control system. Instead it is all kept -in the file bucket "expofiles" on the expo server in Cambridge. +in the file bucket "expofiles" on the expo server machine (formerly in Cambridge, but now in Germany).
You will be using the expo laptop to do the scanning and you will put all the scan files in the folder for your wallet, e.g. for 2018#19 it is:
/home/expo/expofiles/surveyscans/2018/2018#19/-and tell someone nerdy when you have finished and they will -ensure that it is copied to the expo server. +but then please also upload them using the Upload Scans form.
-If you want to do this yourself on your own laptop then be aware that
-since 2018 this is all more involved because of the enforced security on our new server. First you need a minimal laptop setup and then you will need to
-learn how to use Filezilla
-- as documented for uploading your expo photographs. The correct folder
-on the expo server is the same as that on the expo laptop- because we set up the expo laptop to be like that.
-But only copy files to the server that you created yourself and which live in your own wallet folder
+If you make a mistake and need to rename a file then be aware that this is much, much easier using
+the expo laptop. The correct folder
+on the expo server is the same as that on the expo laptop - because we set up the expo laptop to be like that.
+But you will need to learn how to use Filezilla (expo-relevant instructions here).
+Please only copy files to the server that you created yourself and which live in your own wallet folder
+If you want to use your own laptop you need a
+minimal laptop setup
+- as documented for uploading your expo photographs.
If you used a PDA instead of making notes on paper, you need to store your .topo files in the right place. diff --git a/handbook/survey/onlinewallet.html b/handbook/survey/onlinewallet.html index 3fbba5eb6..da1594c61 100644 --- a/handbook/survey/onlinewallet.html +++ b/handbook/survey/onlinewallet.html @@ -24,8 +24,12 @@ anything you like. Typically we have the scanned pages called notes1.jpg, notes2 or PDF (very hard to re-use elsewhere). Set the scanner at 300 dpi and adjust the contrast of the image after scanning by using photo-editing software to enhance the writing. Also please crop each image to just the area containing the survey data. -
As soon as the notes have been scanned you should (a) copy them to a USB stick or email them to someone, (b) upload the entire online wallet to the expo server in Cambridge -expo.survex.com. This is so that these precious files are backed-up as soon as possible. (Assuming you have done the key-pair procedure, do the upload by sFTP as you do for photos, but to the directory described in the introduction to online wallets.) +
As soon as the notes have been scanned you should (a) copy them to a USB stick or email them to someone, (b) check that the entire online wallet is on the expo server at +expo.survex.com using the Upload Scans form. +This is so that these precious files are backed-up as soon as possible. +
(If you want to move things around, then assuming you have done the +key-pair procedure, do the upload by sFTP +as you do for photos, but to the directory described in the introduction to online wallets.)
All the other files are part of the multi-step process of producing the cave survey - see
@@ -38,7 +42,7 @@ Creating a new cave... for the full list of steps. The contents.json file has another,completely different function:
-it may be the only online record that connects the wallet number to the cave identifier. So if a future cave surveyor deperately needs
+it may be the only online record that connects the wallet number to the cave identifier. So if a future cave surveyor desperately needs
to consult the original cave survey, it can be done by, e.g. Troggle produces very useful auto-generated reports of the status of the wallets and the survex files
@@ -160,7 +165,7 @@ new trip surveys.
walletindex.html in each online wallet subfolder and also a
walletindex.html in the /2018/ folder.
- This script works fine on Linux (Debian, Xubuntu, etc.) and also now works fine in the Windows 10 bash system.
+ This python3 script works fine on Linux (Debian, Xubuntu, etc.) and also now works fine in the Windows 10 bash system.
Ideally the cavers who are scanning their notes and typing in the survey data will also be updating the
grep -rl "2018-dm-07" expofiles/surveyscans
@@ -51,7 +55,8 @@ have a different Austrian Kataster number issued for it in due course).
*ref 2018#06
; the #number is on the clear pocket containing the original notes
-But sometime in mid-Expo 2015 everyone stopped using the survex template file and so this information was not recorded since then. This will be fixed by hand-editing in due course.
+But sometime in mid-Expo 2015 everyone stopped using the survex template file and copied from a friend instead,
+and so this information was not properly recorded. This will be fixed by hand-editing in due course.
(Note that many old .svx files were processed with an older version of survex which did not suppport this feature and so a comment was used instead.)
Maintaining the online wallets