From cba1997180a9e7f3f541690ac0e5bac87a22ab28 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Fri, 3 Feb 2023 22:36:28 +0000 Subject: [PATCH] page rename fix --- handbook/computing/basiclaptop.html | 2 +- handbook/survey/drawup.htm | 4 ++-- handbook/survey/newcave.html | 2 +- handbook/survey/newwallet.html | 14 +++++++------- handbook/survey/onlinewallet.html | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/handbook/computing/basiclaptop.html b/handbook/computing/basiclaptop.html index fc4527557..f58bdace8 100644 --- a/handbook/computing/basiclaptop.html +++ b/handbook/computing/basiclaptop.html @@ -32,7 +32,7 @@ Using the browser, you can logon to the Expo online system ("the website", also Survex | All Survex | Scans | - Upload Scans | + Upload Scans | Drawings | Upload Drawings | Upload Photos | diff --git a/handbook/survey/drawup.htm b/handbook/survey/drawup.htm index 57f62fb33..31711b596 100644 --- a/handbook/survey/drawup.htm +++ b/handbook/survey/drawup.htm @@ -71,14 +71,14 @@ Very detailed instructions for doing this in Tunnel are in Filing your sketches

The files of your scanned and re-scanned sketches should be stored in the same folder as the scanned notes, i.e. (for wallet #19, for expo 2018) you would upload them to folder -2018#19. +2018#19. This is actually stored in: /home/expo/expofiles/surveyscans/2018/2018#19/ but you don't need to know that as the Upload Scan form just uses the wallet name -2018#19 +2018#19 (but this is not where you will put your finished Tunnel or Therion vector files.)

Using tunnel or therion for final survey production

diff --git a/handbook/survey/newcave.html b/handbook/survey/newcave.html index f61d8be1c..196d51352 100644 --- a/handbook/survey/newcave.html +++ b/handbook/survey/newcave.html @@ -68,7 +68,7 @@ actually do these things.
  • Write the full cave description into the correct html files. (This will mean copying the passage descriptions from the survex files.)
  • Update the index tick boxes on paper in the wallets lever-arch file in the potato hut: as your wallet progresses through this process -
  • Update the online record of those tick boxes using the online form, e.g. for wallet 2022#01 +
  • Update the online record of those tick boxes using the online form, e.g. for wallet 2022#01
  • Check the online list of outstanding survey tasks for all the wallets for the current year: 2022.

    This documentation assumes that you have recorded your survey data in diff --git a/handbook/survey/newwallet.html b/handbook/survey/newwallet.html index 308304540..5f0c5939f 100644 --- a/handbook/survey/newwallet.html +++ b/handbook/survey/newwallet.html @@ -75,7 +75,7 @@ and fill in the line (e.g. 2018#22) for your wallet

  • Now, if you have not done it immediately after you left the cave, photograph all the pages of survey notes with your phone. Get one or more of the people also on the trip to do this too. -
  • Now upload the scanned notes using the Upload Scans form. +
  • Now upload the scanned notes using the Upload Scans form. Click on the wallet name to the right of the central name on the form until you are centred on the wallet id of the plastic wallet you have put the notes into. You can use either your own phone or a laptop connected to the potato hut scanner (instructions below). All you need is the 'expo' password. @@ -186,7 +186,7 @@ They are permanently referred to by the tunnel/therion/troggle system !]
    - +
    File list in a wallet (click to open form online) @@ -197,9 +197,9 @@ They are permanently referred to by the tunnel/therion/troggle system !]

    Uploading the scanned files to the server

    -

    Upload the scanned files from any computer with internet access using the Upload Scans form. +

    Upload the scanned files from any computer with internet access using the Upload Scans form. You will need to login as user 'expo' with the usual {cavy:beery} password.

    The form shows the files already uploaded in the online wallet, and you click on the very large "Choose files" button to open a file chooser dialog where you can select several files at once to upload. @@ -248,8 +248,8 @@ to your wallet name, e.g. for /home/expo/expofiles/surveyscans/2018/2018#19/ But then please upload them to the wallet on the server using the upload form. Don't just leave them on the expo laptop. -

    This is what that wallet looks like using -the Upload Scans form. +

    This is what that wallet looks like using +the Upload Scans form.

    If someone made a mistake and you are the nerd who needs to rename a file then be aware that this is much, much easier using @@ -268,7 +268,7 @@ Please only copy files to the server that you created yourself and which liv Put them in exactly the same place as a scanned survey sketch would go, but also write a paper note and put it in the plastic wallet in the potato hut to prevent someone re-using that wallet number. See the PDA specific instructions -

    If you are using the expo laptop just upload the .topo files using the Upload Scans form and also copy them to an ordinary online wallet +

    If you are using the expo laptop just upload the .topo files using the Upload Scans form and also copy them to an ordinary online wallet wallet, as there is no physical wallet, e.g. for 2018#16 it would be: 

    diff --git a/handbook/survey/onlinewallet.html b/handbook/survey/onlinewallet.html
index 84bebe879..aac345a75 100644
--- a/handbook/survey/onlinewallet.html
+++ b/handbook/survey/onlinewallet.html
@@ -62,7 +62,7 @@ or PDF (very hard to re-use elsewhere). Set the scanner at 300 dpi and adjust th
 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) check that the entire online wallet is on the expo server at
-expo.survex.com using the Upload Scans form. 
+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 
@@ -83,7 +83,7 @@ without damange.

    Progress status

    -

    The illustration shows the lower half of the Upload Scans form. +

    The illustration shows the lower half of the Upload Scans form. This is the information about the wallet itself (this is called 'metadata').

    Once you are logged on as user 'expo', you can edit all the data. If you use the right runes for the survex files (as shown in the image), a clickable-list of the survex files will appear on the upper-left which will take you directly to the survex files - which you can edit