From 9593daf39c3efca7e65ce2e04988f47b03cef228 Mon Sep 17 00:00:00 2001 From: "Philip Sargent (muscogee)" Date: Sun, 29 Dec 2019 00:58:36 +0000 Subject: [PATCH] finishing the separation of the New Year page --- handbook/manual.html | 51 ++++++++----------------------------- handbook/onlinesystems.html | 17 +++++-------- 2 files changed, 16 insertions(+), 52 deletions(-) diff --git a/handbook/manual.html b/handbook/manual.html index 662a4aec4..badea8166 100644 --- a/handbook/manual.html +++ b/handbook/manual.html @@ -255,56 +255,25 @@ superseded in 2012).

Updating expo year pages

-

Each year's expo has a documentation index which is in the folder

+

Each year's expo is recorded in the folder

-/expoweb/years +/expoweb/years/ -

so to checkout the 2011 page, for example, you would use

+

which contains a number of files used to manage and record that year's expo. Have a look at expoweb/years/2018/ for a recent well-documented expo (the weather was good). Files are added and edited using the version control system for the expoweb repository.

-

hg clone ssh://expo@expo.survex.com/expoweb/years/2011

+

To create a new 'year' for next year's expo see adding a new year. -

Once you have pushed your changes to the repository you need to update the server's local copies, by ssh into the server and running hg update in the expoweb folder.

- -

Adding a new yearin the Expo online systems

-

There is no script to do this (yet). In the list below everything in expofiles is done by directly overwriting what is on the server. Chnages to expoweb and troggle must be done using the version control system as these are repositories. -

-

Edit folk/folk.csv, adding the new year to the end of the header -line, a new column, with just a comma (blank -cell) for people who weren't there, a 1 for people who were there, and -a -1 for people who were there but didn't go caving. Add new lines for -new people, with the right number of columns.

- -

This proces is tedious and error-prone and ripe for improvement. -Adding a list of people, from the bier book, and their aliases would be -a lot better, but some way to make sure that names match with previous -years would be -good.

Maintaining the survey status table

+

See the documentation on updating the online surveyscans folders using the lever-arch file of plastic wallets. -

There is a table in the survey book which has a list of all the surveys and whether or not they have been drawn up, and some other info.

- -

This is generated by the script tablizebyname-csv.pl from the input file Surveys.csv

+

This below is obsolete: +

diff --git a/handbook/onlinesystems.html b/handbook/onlinesystems.html index 485c68d15..0027dbad1 100644 --- a/handbook/onlinesystems.html +++ b/handbook/onlinesystems.html @@ -28,12 +28,11 @@ fuller list of "How do I..." instruction pages are on the ha
  • Uploading typed logbooks
  • Uploading GPS tracks
  • Recording a new cave discovery
    • -
  • Monitoring the status cave survey workflow during and after expo
    • +
  • Monitoring the status of the cave survey workflow during and after expo
    • -

    But the systems Manual is still being actively edited to extract and simplify documentation. At the moment -it is the only documentation we have for: +

    But the systems Manual is still being actively edited to extract and simplify documentation.

    @@ -89,10 +88,6 @@ mechanism does not tidy-up after itself properly. See these instructions for this tidy-up - - - -

    DVCS - version control

    We use a distributed revision control system (DVCS) for all the important data. This means that many people can edit and merge their changes with the expo @@ -108,9 +103,8 @@ then get synchronised when it next gets internet access. do not get modified, so they are kept as a plain directory of files 'expofiles'. The same goes for holiday photographs and GPS logs.

    - - - +

    In 2019 we had half our version-controlled repositories under mercurial and half under git. +The intention is to move entirely to git before the 2020 expo.

    Troggle - what it is

    @@ -128,6 +122,7 @@ and publish it on the web.
  • expo.survex.com/survey_scans/ - List of all scanned original survey notes.
  • expo.survex.com/survey_scans/2018%252343/ - list of links to scanned notes for wallet #43 during the 2018 expo. +

    [Note that /survey_scans/ is generated by troggle and is not the same thing as /expofiles/surveyscans/ at all.]

    Only a small part of troggle's original plan was fully implemented and deployed. Many of the things it was intended to replace are still operating as a motley collection written by many different people in several languages (but mostly perl and python; we won't talk about the person who likes to use OCamL).