From e31194648b4a06cffaeb3a0dc7d76af5e4f33fa6 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Sat, 10 Dec 2022 14:23:08 +0000 Subject: [PATCH] laptops docum corrections --- handbook/computing/logbooks-parsing.html | 5 +++++ handbook/computing/repos.html | 6 ++++-- handbook/survey/cavedescription.html | 6 +++--- handbook/survey/newrig.html | 2 +- handbook/troggle/serverconfig.html | 2 +- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/handbook/computing/logbooks-parsing.html b/handbook/computing/logbooks-parsing.html index 78ea6927e..4ef191cb5 100644 --- a/handbook/computing/logbooks-parsing.html +++ b/handbook/computing/logbooks-parsing.html @@ -19,6 +19,11 @@

The nerd needs to login to the expo server using their own userid, not the 'expo' userid. The nerd also needs to be in the group that is allowed to do 'sudo'. +

Ideal situation

+

Ideally this would all be done on a stand-alone laptop to get the bugs in the logbook parsing sorted out before we upload the corrected file to the server. Unfortunately this requires a full troggle software development laptop as the parser is built into troggle. The expo laptop in the potato hut is not set up to do this (yet - 2022). +

However, the expo laptop (or any 'bulk update' laptop) is configured to allow an authorized user to log in to the server itself and to run the import process directly on the server. + +

Current situation

The nerd needs to do this:

  1. Look at the list of pre-existing old import errors at Data Issues
    diff --git a/handbook/computing/repos.html b/handbook/computing/repos.html index 1a24f6a17..ad3340287 100644 --- a/handbook/computing/repos.html +++ b/handbook/computing/repos.html @@ -27,6 +27,8 @@ expo.survex.com:
  2. :expoweb: - the website pages, handbook, generation scripts (git)
  3. :troggle: - the database/software part of the survey data management system
    - see notes on troggle for further explanations
    4. +

    If you want to use your own laptop to interact directly with the repos then a basic laptop or a survey laptop is not enough: you need an + expo bulk update laptop.

    From the command line, to clone a repo, you will do this git clone ssh://expo@expo.survex.com/home/expo/loser @@ -69,8 +71,8 @@ cave data surveying tasks.

    NOTE: when using git to path to a repository, always use user 'expo' as the login user (ssh://expo@...) even though within git you will be identified by your own ssh key name. This is because file permissions on the server require this.

    So cavers wanting to do sophisticated management of their cave survey data (i.e. not just simple -uploads) will have to use a machine on which they key is already set up. The expo laptop lives in the potato hut during expo and it is sometimes joined by the laptop 'aziraphale'. These are both loaned machines running Linux. If you want to use your own laptop then -see the basic laptop setup. +uploads) will have to use a machine on which they key is already set up. The expo laptop lives in the potato hut during expo and it is sometimes joined by the laptop 'aziraphale'. These are both loaned machines running Linux. If you want to use your own laptop then a basic laptop or a survey laptop is not enough: you need a + bulk update laptop.

    diff --git a/handbook/survey/cavedescription.html b/handbook/survey/cavedescription.html index b605e7d2a..0002b5e47 100644 --- a/handbook/survey/cavedescription.html +++ b/handbook/survey/cavedescription.html @@ -84,12 +84,12 @@ Just separate the paragraphs with <P> codes and it will work. (You don't n Technical Note: The information in the cave registration form is saved to the server as a file, which is committed to the version control system automatically, as well as being registered in the online database used by the website publication software. If you are a nerd with a -basic expo laptop, you can edit the file directly. +bulk update laptop, you can edit the file directly. For Fischgesicht (originally 2017-CUCC-28 and now 1623/290), this is in the :expoweb: repo, in /cave_data/1623-290.html, but you will have to manage the git commit process yourself. -

    Fischgesicht currently (pre-2022 expo) has 25 survex files (listed here -now, or here in future). You could do a useful job by +

    Fischgesicht currently (pre-2023 expo) has 25 survex files (listed as 2017-cucc-28, 290 + or 290 survexfile ). You could do a useful job by checking all those survex files to see if the cave description in them has already been copied into the cave registration form "Underground description" text box. diff --git a/handbook/survey/newrig.html b/handbook/survey/newrig.html index 624ea6fc8..a308dc4b0 100644 --- a/handbook/survey/newrig.html +++ b/handbook/survey/newrig.html @@ -103,7 +103,7 @@ tell a nerd on expo that it is there. Or, if you are confident with Filezilla, c

    If you draw up the topo after expo is over, then email them to a nerd who will upload them into the right place. -

    If you have your own machine configured as a expo basic laptop then you can use +

    If you have your own machine configured as a expo bulk update laptop then you can use Filezilla to upload the topo files directly to the server.

    This may be a change from how you used to do it

    diff --git a/handbook/troggle/serverconfig.html b/handbook/troggle/serverconfig.html index 54159138f..cc4d6d81f 100644 --- a/handbook/troggle/serverconfig.html +++ b/handbook/troggle/serverconfig.html @@ -15,7 +15,7 @@

    This is the folder structure of the repo :expoweb: which is also the root of the website. Note that the webserver (apache) presents many more apparent folders, such as expofiles, than there are folders because that's what it and troggle do.

    In the list below only the handbook folder has been expanded. The years folder includes -42 subfolders from 1976 to 2019. +42 subfolders from 1976 to 2022.