diff --git a/handbook/datamgt.html b/handbook/datamgt.html index 3201d9fba..2f4133f90 100644 --- a/handbook/datamgt.html +++ b/handbook/datamgt.html @@ -22,6 +22,8 @@ data. Aside from the data collection requirements of the game itself, setting up expedition) of cave exploration often involves collection of personal information ranging from dates available to medical information to the desire to purchase an expedition t-shirt.

+ + If an expedition will only happen once, low-tech methods are usually adequate to record information. Any events that need to be recorded can go in a logbook. Survey notes must be turned into finished cave sketches, without undue concern for the future expansion of those sketches. @@ -49,8 +51,10 @@ or even useful recipes for locally available food. The more of this information wishes to keep, the more valuable an effective and user-friendly system of data management. -

From " -Troggle: a novel system for cave exploration information management", by Aaron Curtis, CUCC. +

From "Troggle: +a novel system for cave exploration information management", by Aaron Curtis (2006) and +updated as "Troggle: +a revised system for cave data management" in 2020.

diff --git a/handbook/troggle/mtv_drawing2.jpg b/handbook/i/mtv_drawing2.jpg similarity index 100% rename from handbook/troggle/mtv_drawing2.jpg rename to handbook/i/mtv_drawing2.jpg diff --git a/handbook/troggle/qm-image.jpg b/handbook/i/qm-image.jpg similarity index 100% rename from handbook/troggle/qm-image.jpg rename to handbook/i/qm-image.jpg diff --git a/handbook/survey/index.htm b/handbook/survey/index.htm index a05b169d4..9d2dbea0f 100644 --- a/handbook/survey/index.htm +++ b/handbook/survey/index.htm @@ -62,7 +62,7 @@ detailed topics.

  • More resources on surveying
    • -
  • History of cave data archiving here (broken links).
    • +
  • History of CUCC cave data archiving.
  • More obscure methods: -Troggle status - Systems status and upgrade progress
    Troggle server configuration - how to get troggle running on a new machine (incoimplete!)
    Troggle and django - Upgrading to later django versions
    Troggle unit tests - test suite for programmers
    diff --git a/handbook/troggle/trogregistr.html b/handbook/troggle/trogregistr.html index a4ef005af..85fed1140 100644 --- a/handbook/troggle/trogregistr.html +++ b/handbook/troggle/trogregistr.html @@ -26,7 +26,8 @@

    The second, the django administration user, is part of the core django Users/Groups system'django.contrib.auth'.

    Why this is how it is

    -

    The original design of Troggle envisaged that expo cavers would have their own individual logins and manage their own accounts, which is what 'django-registration' is designed for. It easily handles the hundreds of accounts which would be necessary. (See "Troggle: a novel system for cave exploration information management", by Aaron Curtis) +

    The original design of Troggle envisaged that expo cavers would have their own individual logins and manage their own accounts, which is what 'django-registration' is designed for. It easily handles the hundreds of accounts which would be necessary. (See " +Troggle: a revised system for cave data management")

    The django administrator account is built-in by default and created when the database is initiated. diff --git a/handbook/troggle/trogsimpler.html b/handbook/troggle/trogsimpler.html index 958c65a2f..1ec0775e1 100644 --- a/handbook/troggle/trogsimpler.html +++ b/handbook/troggle/trogsimpler.html @@ -52,7 +52,7 @@ for displaying a table of members by expedition year, but what if you wanted to logbook about a certain cave in a certain expedition year? Theoretically, all of the necessary information to produce that list has been recorded in the logbook, but there is no way to access it because there is no connection between the person's name in folk.csv and the entries he wrote in the logbook". -[Adrian Curtis] +[Aaron Curtis]

    And for ensuring survey data does not get lost we need to coordinate people, trips, survex blocks, survex files, drawing files (several formats), QMs, wallet-progress pages, rigging guides, entrance photos, GPS tracks, kataster boundaries, scans of sketches, scans of underground notes, and dates for all those - Philip Sargent] @@ -119,10 +119,11 @@ exist

    [This vastly underestimates the number of things that troggle does for us. -See "Troggle: a novel system for -cave exploration information management". And a VM is not required to run and debug troggle. +See " +Troggle: a revised system for cave data management".] And a VM is not required to run and debug troggle. Sam has produced a docker variant which he uses extensively. -

    Troggle today has 8,200 lines of python (including comments and blank lines), plus 600 in imagekit and 200 in flatpages. 2,200 of those are in the parsers. Django itself has a lot more, including integration with TinyMCE in-browser HTML editor. ] +

    Troggle today has 6,400 non-comment lines of python and 2,500 non-comment lines of django HTML template code. Plus there is the integration with the in-browser HTML editor in JavaScript. Half of the python is in the parsers which will not change whatever we do. Django itself is much, much bigger and includes all the security middleware necessary in the web today. +

    But maintaining the code with the regular Django updates is a heavy job.]

    How much work would this actually take: