From f16439f3bad21233a37e41df17ee20a9ca9f88db Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Tue, 26 Oct 2021 18:07:03 +0300 Subject: [PATCH] caves-tabular script documn tidy --- handbook/troggle/scriptscurrent.html | 4 ++-- handbook/troggle/serverconfig.html | 6 +++--- scripts/caves-tabular.html | 3 ++- scripts/summarizecave.sh | 1 + 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/handbook/troggle/scriptscurrent.html b/handbook/troggle/scriptscurrent.html index 54dc17aab..d25ff9fd6 100644 --- a/handbook/troggle/scriptscurrent.html +++ b/handbook/troggle/scriptscurrent.html @@ -62,7 +62,7 @@ See the entire page devoted to the various

Currently the intermediate data it works from has to be hand-generated so a proper parsing script needs to be written.

caves-tabular.html

-

This webpage caves-tabular.html uses a page-specifc JavaScript file TableSort.js which allows the user to resort the table of all the cave data by any of the columns by clicking on it [by Radost]. The exact source of the data in the table is undocumented, but presumably from cavern .3d file export at an unknown date. +

This webpage caves-tabular.html uses a page-specifc JavaScript file TableSort.js which allows the user to resort the table of all the cave data by any of the columns by clicking on it [by Radost]. The exact source of the data in the table is undocumented, but presumably from cavern .3d file export at an unknown date. This may be that generated by summarizecave.sh . @@ -100,7 +100,7 @@ The design of these files is intended to confine all changes year to year to the

This runs "cavern" (a commandline tool installed as part of survex) to produce a text (or HTML) report of the key statistics from the master svx file for a cave (the one that includes all the svx files for the individual passages). - It is unclear who uses this or for what, though it appears that it could be useful. + It is unclear who uses this or for what. It may be the script that generates the input data used by caves-tabular.html

make_essentials.sh GPS

In :expoweb:/noinfo/ diff --git a/handbook/troggle/serverconfig.html b/handbook/troggle/serverconfig.html index 60682f25d..51b4688a0 100644 --- a/handbook/troggle/serverconfig.html +++ b/handbook/troggle/serverconfig.html @@ -54,7 +54,7 @@ expoweb (repo)

CSS and JavaScript

-

The expoweb repo contains all the HTML files and basic CSS files. The troggle repo contains the HTML templates, CSS and some javscript for the troggle report pages generated dynamically. There are also javascript packages installed directly on the operating system which are used by some expoweb pages: CaveScript for showing 3D views of cave centreline data and openlayers for geographic mapping integration. These javascript packages are only documented in the configuration instructions, see below. +

The expoweb repo contains all the HTML files and basic CSS files. The troggle repo contains the HTML templates, CSS and some javscript for the troggle report pages generated dynamically. There are also javascript packages installed directly on the operating system which are used by some expoweb pages: CaveScript for showing 3D views of cave centreline data, CodeMirror for syntax-colouring survex files and openlayers for geographic mapping integration. These javascript packages are only documented in the configuration instructions, see below.

Server configuration: software

@@ -351,8 +351,8 @@ expofiles

cron

The server runs it's hourly, daily and weekly scripts using the anacron system. In ~expo/config/cron/ on the server, there are expo.hourly -and expo.daily scripts and these are launched at the appropriate times by -the server root from /etc/crontab. +and expo.daily scripts and these are (or should be) launched at the appropriate times by +the server root from /etc/crontab. This is not obviously working on the server at present.

Search: xapian

Installed independently of troggle simply with apt install xapian-omega and diff --git a/scripts/caves-tabular.html b/scripts/caves-tabular.html index c0853317d..1b8ac84fc 100644 --- a/scripts/caves-tabular.html +++ b/scripts/caves-tabular.html @@ -7,7 +7,8 @@ + survex. It may come fomr a hand-edited copy of the output from + expoweb/scripts/summarizecave.sh --> diff --git a/scripts/summarizecave.sh b/scripts/summarizecave.sh index 95053a317..0ab2850ed 100644 --- a/scripts/summarizecave.sh +++ b/scripts/summarizecave.sh @@ -1,4 +1,5 @@ #get .3d file contents using survex parser +# Is this in any way related to the data incaves-tabular.html by Radost ?? >&2 echo "Processing: $1" summary=$(cavern "./$1/$1.svx" -o "./$1/$1.3d")