diff --git a/handbook/l/life-wallet.html b/handbook/l/life-wallet.html index 54bd97238..7f1e68ff2 100644 --- a/handbook/l/life-wallet.html +++ b/handbook/l/life-wallet.html @@ -20,6 +20,7 @@ You can edit your own version to revise this when it becomes outdated.

We also have a "sequence diagram which shows clearly the sequence of wallet actions in a time-line. +

[UPDATE: The bit in the lower left corner is out of date. We don't use wallets.py or svx-ref.sh any more. Those capabilities are now built into troggle itself (since July 2022).]

Both "activity" and "sequence" diagrams are part of the UML software specifiction system. We also have a "class" diagram for troggle. That page also defines the "essential", "specification" and "implementation" levels at which troggle is designed and maintained. diff --git a/handbook/survey/newwallet.html b/handbook/survey/newwallet.html index 107f98ddc..eda6964b8 100644 --- a/handbook/survey/newwallet.html +++ b/handbook/survey/newwallet.html @@ -177,9 +177,9 @@ to understand the online wallet maintenance process<

If your initial backup photos of your notes were poor quality, use the scanner in the potato hut to make better copies. Scan to JPEG format as .jpg files. -

Name the scanned pages "notes-1.jpg, or notes-cavepassagename.jpg" etc. This is important as a script detects -whether these files exist (with names beginning "notes..", "plan.." and "elev..") and if you name them something else it will hassle -you unnecessarily. +

Name the scanned pages "notes-cavepassagename.jpg" etc., (or notes-1.jpg if you must, but self-describing filenames +are much better). This is important as a script detects whether these files exist (with names beginning "notes..", "plan.." and "elev..") +and if you name them something else it will hassle you unnecessarily. (Or you can use this format cavepassagename-notes.jpg if you like.)

[ Note to maintainers: do not rename these files even if they have been created with the wrong names. They are permanently referred to by the tunnel/therion/troggle system !] diff --git a/handbook/survey/onlinewallet.html b/handbook/survey/onlinewallet.html index 734344bdb..84bebe879 100644 --- a/handbook/survey/onlinewallet.html +++ b/handbook/survey/onlinewallet.html @@ -27,7 +27,7 @@

  1. The scans of the survey notebook pages are the ultimate original raw survey data and completely irreplaceable.
  2. The other files in the wallet are part of the process of producing a survey of the cave as a whole. -
  3. Individual to-do lists are produced automatically for each caver, each cave, and each year. These +
  4. Individual online to-do lists are produced automatically for each caver, each cave, and each year. These have a colour-coded table showing what survey processing tasks they haven't finished yet.
@@ -54,7 +54,9 @@ to change anything can overwrite everyone else's workThe scanned images

These are simply the scanned images (or digital photographs) of each page of the original survey notes. They should be named notesXXX.jpg where "XXX" can be -anything you like. Typically we have the scanned pages called notes1.jpg, notes2.jpg, notes3.jpg. +anything you like. In the past we have had scanned pages called notes1.jpg, notes2.jpg, notes3.jpg; but don't +do this, instead give descriptive names, e.g. notes-twentyseconddropdronesurvey.jpg or whatever, +but do put "notes-.." at the beginning or "..-notes" at the end of the filename (or "plan-.." or "elev-.." as appropriate).

It is important that you use use the .jpg (JPEG) file format, and definitely not PNG (very voluminous) 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 @@ -82,7 +84,7 @@ without damange.

Progress status

The illustration shows the lower half of the Upload Scans form. -This is the information about the wallet itself. +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 there online too. @@ -119,7 +121,7 @@ will find and list all the wallets which contain survey data for cave 1623-264. 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.) +(Note that many old .svx files were processed with an older version of survex which did not support this feature and so a comment was used instead.)

Much more detail - more than you want

Troggle produces very useful auto-generated reports of the status of the wallets and the survex files @@ -159,7 +161,7 @@ These troggle reports are invaluable for finding data entry errors or other mist

(where the "json file updated" step only refers to the initial editing of the json file to ensure that it has the right people, date and cave identifier and name). -

A fully-populated and complete contents.json file +

A fully-populated and complete contents.json file (this is the 'metadata') looks like this:

 			{
@@ -217,8 +219,8 @@ as soon as you upload a new scan for a new year.
 
 
 

Maintaining the online wallets

-

Ideally the cavers who are scanning their notes and typing in the survey data will also be updating the -contents.json data in their wallet using the tick-boxes on the upload form. In your dreams. +

Ideally the cavers who are scanning their notes and typing in the survey data will also be updating the 'metadata' (in the +contents.json file) using the tick-boxes on the upload form. In your dreams.

The first difficulty when editing the data for a newly-created wallet is finding out which cave the wallet describes. diff --git a/handbook/troggle/trogstatus.html b/handbook/troggle/trogstatus.html index ff44f144d..e37532495 100644 --- a/handbook/troggle/trogstatus.html +++ b/handbook/troggle/trogstatus.html @@ -45,7 +45,11 @@ and possible migration from Django.

We should not need to anything until we move from django 3.2 LTS to 4.2 LTS before April 2024.

July 2022

-

Wookey at last, after much effort, got the loser repository converted from mercurial to git, with much tidying and history-reconfabulation. He says this will need to be done again, but it was good enough for the 2022 Expo. Also the troggle code was changed: survex files edited on a webpage now automatically commit to git with no user involvement. +

Wookey at last, after much effort, got the loser repository converted from mercurial to git, with much tidying and +history-reconfabulation. He says this will need to be done again, but it was good enough for the 2022 Expo. Also the troggle code was +changed: survex files edited on a webpage now automatically commit to git with no user involvement. +

Just before expo, we finished integrating the formerly-separate 'wallets' script. +So now the progress of scanning and tunneling survey data can be managed more easily. And it works on the data back to 1999 too.


git logo Return to: