From 393abbfd06deb31cf47a8937b7831ce8e42e2064 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Thu, 28 Jun 2018 18:37:58 +0100 Subject: [PATCH] Making the website manual parts of the handbook more useable --- handbook/index.htm | 19 +++++++++--- handbook/update.htm | 55 ++++++++++++----------------------- handbook/website-history.html | 28 ++++++++++++++++++ survey.html | 30 ++++++++++--------- 4 files changed, 77 insertions(+), 55 deletions(-) create mode 100644 handbook/website-history.html diff --git a/handbook/index.htm b/handbook/index.htm index 7838449bd..12bc8ac44 100644 --- a/handbook/index.htm +++ b/handbook/index.htm @@ -34,13 +34,24 @@
Base camp and History of high camps
-
Prospecting
The printable prospecting guide or new prospecting guide (slow to load) is essential reading before you wander the plateau stumbling across holes of potential interest. Vast amounts of work have been wasted in the past through inadequate recording. It isn't very much extra work, but ensures that your hard work gains some recognition in the future rather than making lots of tedious work and the cursing of your name... There is a separate page with pictures of surface landmarks for taking bearings, and a new guide to getting a GPS fix.
+
Surveying
-
Once the cave starts to get significant (ie. anything which requires getting changed or rigging), it needs good documentation. This is mostly a matter of doing a cave survey, a guidebook description and usually a surface survey. The first time you go to explore a poorly documented question mark, you will realise how important this is, and it also makes for having a pretty survey on your wall to support your bullshit. For 1998, the surveying guide has been split into easily digestible chunks, including pages specifically intended for people who haven't surveyed before. -This is Survey data.Therion protractors in 1:250 and 1:500 scales. Thanks to Martin Budaj for these!
-
Phones
+
Once the cave starts to get significant (ie. anything which requires getting changed or rigging), it needs good documentation. This is mostly a matter of

+ +
+The first time you go to explore a poorly documented question mark ("QM"), you will realise how important this is, and it also makes for having a pretty survey on your wall to support your bullshit. The surveying guide has been split into easily digestible chunks, including pages specifically intended for people who haven't surveyed before. +

+This is how we survey on Expo. +

We use Therion protractors for which we have templates in 1:250 and 1:500 scales. Thanks to Martin Budaj for these!

+ +
EXPO Phones
How to use and update the base camp and top camp mobile phones on expo. (Not your phone.)
Charging
How to charge the 14.4V Makita Drill batteries.
diff --git a/handbook/update.htm b/handbook/update.htm index a5b045e20..594420b4f 100644 --- a/handbook/update.htm +++ b/handbook/update.htm @@ -1,4 +1,3 @@ - CUCC Expedition Handbook: The Website @@ -79,9 +78,12 @@ processes that a maintainer would want to do.

  • Uploading photos
  • Ticking off QMs
  • Maintaining the survey status table
    • -
  • History
  • Automation
    • +Appendices: +

    Getting a username and password

    @@ -148,21 +150,24 @@ below for details on that.

    hg clone http://expo.survex.com/repositories/home/expo/expoweb/ (read-only) +
    +
    expofiles (all the big files and documents)

    Photos, scans (logbooks, drawn-up cave segments) (This was about -60GB of stuff in 2017 which you probably don't actually need locally) To sync +60GB of stuff in 2017 which you probably don't actually need locally).

    To sync the files from the server to local expofiles directory:

    rsync -av expo@expo.survex.com:expofiles /home/expo

    To sync the local expofiles directory back to the server:

    - +

    rsync --dry-run --delete-after -a /home/expo/expofiles expo@expo.survex.com

    +then CHECK that the list of files it produces matches the ones you absolutely intend to delete forever! ONLY THEN do:

    rsync -av /home/expo/expofiles expo@expo.survex.com:

    (do be incredibly careful not to delete piles of stuff then rsync back, or to get the directory level of the command wrong - as it'll all get deleted on the server too, and we may not have backups!). It's absolutely vitalUse rsync --dry-run --delete-after -a first to check what would be deleted. If you are using rsync from a Windows machine you will not get all the files as some filenames are incompatible with Windows: see more detail under Using Mercurial/TortoiseHg in Windows below.

    (We have an issue with rsync not using the appropriate user:group attributes for files pushed back to the server. This may not cause any problems, but watch out for it.)

    - +

    Editing the website

    To edit the website fully, you need a Mercurial client such as TortoiseHg. Some (static text) pages can be edited directly on-line using the 'edit this page link' which you'll see if you are logged into troggle. In general dynamically-generated pages can not be edited in this way, but forms are provided for some page-types like 'caves'.

    @@ -221,7 +226,7 @@ changes are pending) and then "hg commit" in the directory

    Using Mercurial/TortoiseHg in Windows

    -

    Read the instructions for setting up TortoiseHG in Aled's Windows 101. +

    Read the instructions for setting up TortoiseHG in Tortoise-on-Windows.

    In Windows: install Mercurial and TortoiseHg of the relevant flavour from https://tortoisehg.bitbucket.io/ (ignoring antivirus/Windows warnings). This will install a submenu in your Programs menu)

    To start cloning a repository: first create the folders you need for the repositories you are going to use, e.g. D:\CUCC-Expo\loser and D:\CUCC-Expo\expoweb. Then start TortoiseHg Workbench from your Programs menu, click File -> Clone repository, a dialogue box will appear. In the Source box type

    @@ -297,30 +302,23 @@ T/U: Jess 1 hr, Emma 0.5 hr

    Uploading photos and GPS tracks

    -

    Photos are stored in the general file area of the site under Photos are stored in the general file area of the site under
    http://expo.survex.com/expofiles/photos/

    -

    GPS tracks over the surface of the plateau (GPX files from your handheld GPS or phone) are stored in the general file area of the site under GPS tracks over the surface of the plateau (GPX files from your handheld GPS or phone) are stored in the general file area of the site under
    http://expo.survex.com/expofiles/gpslogs/

    -They are each organised by year, and by photographer (walker). Please use directory -names like 2014/YourName (i.e no spaces, CamelCase for names).

    +They are each organised by year, and by photographer (walker).

    -

    They are viewed at They are much more conveniently viewed at
    http://expo.survex.com/photos/
    or
    http://expo.survex.com/gpslogs/
    +because the website scripts create a much friendlier interface

    +The directory names are like this: "2014/YourName/" (i.e no spaces, CamelCase for names). -

    Photos and GPS tracks can be uploaded in 2 basic ways: -

      -
    1. Rsync,scp,sftp as user 'expo' to expo.survex.com, into the directory expofiles/photos/<year>/<PhotographerName>
      2. -
    2. Webdav upload to special dir http://expo.survex.com/expofiles/uploads/<year>/<PhotographerName>
      3. -

    - -

    See Photo/File Upload Instructions for -using webdav/webfolders or winscp from your browser or with other -tools, on various OSes.

    +

    See Photo/GPS/File Upload Instructions for instructions on intalling and using software to do this uploading - for all types of operating system.

    Ticking off QMs

    @@ -333,23 +331,6 @@ tools, on various OSes.

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

    -

    History

    - -

    The CUCC Website was originally created by Andy Waddington in the early 1990s and was hosted by Wookey. The VCS was CVS. The whole site was just static HTML, carefully designed to be RISCOS-compatible (hence the short 10-character filenames) as both Wadders and Wookey were RISCOS people then. Wadders wrote a huge amount of info collecting expo history, photos, cave data etc.

    - -

    Martin Green added the SURVTAB.CSV file to contain tabulated data for many caves around 1999, and a script to generate the index pages from it. Dave Loeffler added scripts and programs to generate the prospecting maps in 2004. The server moved to Mark Shinwell's machine in the early 2000s, and the VCS was updated to subversion.

    - -

    In 2006 Aaron Curtis decided that a more modern set of generated, database-based pages made sense, and so wrote Troggle. This uses Django to generate pages. This reads in all the logbooks and surveys and provides a nice way to access them, and enter new data. It was separate for a while until Martin Green added code to merge the old static pages and new troggle dynamic pages into the same site. Work on Troggle still continues sporadically.

    - -

    After expo 2009 the VCS was updated to hg, because a DVCS makes a great deal of sense for expo (where it goes offline for a month or two and nearly all the year's edits happen).

    - -

    The site was moved to Julian Todd's seagrass server (in 2010), but the change from a 32-bit to 64-bit machine broke the website autogeneration code, -which was only fixed in early 2011, allowing the move to complete. The -data has been split into 3 separate repositories: the website, -troggle, the survey data, the tunnel data. Seagrass was turned off at -the end of 2013, and the site has been hosted by Sam Wenham at the -university since Feb 2014.

    -

    Automation on expo.survex.com

    diff --git a/handbook/website-history.html b/handbook/website-history.html new file mode 100644 index 000000000..39a25f0fa --- /dev/null +++ b/handbook/website-history.html @@ -0,0 +1,28 @@ + + +CUCC Expedition Handbook: Website History + + + +

    CUCC Expedition Handbook

    +

    EXPO WebsiteHistory

    + +

    The CUCC Website was originally created by Andy Waddington in the early 1990s and was hosted by Wookey. The VCS was CVS. The whole site was just static HTML, carefully designed to be RISCOS-compatible (hence the short 10-character filenames) as both Wadders and Wookey were RISCOS people then. Wadders wrote a huge amount of info collecting expo history, photos, cave data etc.

    + +

    Martin Green added the SURVTAB.CSV file to contain tabulated data for many caves around 1999, and a script to generate the index pages from it. Dave Loeffler added scripts and programs to generate the prospecting maps in 2004. The server moved to Mark Shinwell's machine in the early 2000s, and the VCS was updated to subversion.

    + +

    In 2006 Aaron Curtis decided that a more modern set of generated, database-based pages made sense, and so wrote Troggle. This uses Django to generate pages. This reads in all the logbooks and surveys and provides a nice way to access them, and enter new data. It was separate for a while until Martin Green added code to merge the old static pages and new troggle dynamic pages into the same site. Work on Troggle still continues sporadically.

    + +

    After expo 2009 the VCS was updated to hg, because a DVCS makes a great deal of sense for expo (where it goes offline for a month or two and nearly all the year's edits happen).

    + +

    The site was moved to Julian Todd's seagrass server (in 2010), but the change from a 32-bit to 64-bit machine broke the website autogeneration code, +which was only fixed in early 2011, allowing the move to complete. The +data has been split into 3 separate repositories: the website, +troggle, the survey data, the tunnel data. Seagrass was turned off at +the end of 2013, and the site has been hosted by Sam Wenham at the +university since Feb 2014.

    +Return to
    +Website update
    +Website developer information
    + +
    \ No newline at end of file diff --git a/survey.html b/survey.html index 6cc7efe7c..e2cb1cbea 100644 --- a/survey.html +++ b/survey.html @@ -38,21 +38,7 @@ the Expo username and password can download the whole dataset here for the 3d files and here for the Survex files.1

    -

    At the moment survey data is being made available gradually on a -cave-by-cave basis; the first batch of caves are those under active exploration -by CUCC as of summer 2004, namely Steinbrückenhöhle (1623/204), Hauchhöhle (1623/234) and Eislufthöhle (1623/76).

    -

    Drawn-up surveys

    - -

    Final copies of surveys of various vintages are sprinkled throughout the -site, linked from the description pages of the caves they correspond to. Of -current interest are the plans of Steinbrückenhöhle, Hauchhöhle, and Eislufthöhle.

    Working area

    @@ -70,6 +56,22 @@ tar archive compressed with GZIP; on Unix systems this can be decompressed with href="http://www.winzip.org">WinZip or an equivalent tool (such as the freeware WinImp).

    +

    Status

    +

    Survey data is being made available gradually on a +cave-by-cave basis and is now nearly complete - except for recent discoveries. The first batch of caves were those under active exploration +by CUCC as of summer 2004, namely Steinbrückenhöhle (1623/204), Hauchhöhle (1623/234) and Eislufthöhle (1623/76).

    + +

    Drawn-up surveys

    + +

    Final copies of surveys of various vintages are sprinkled throughout the +site, linked from the description pages of the caves they correspond to. Of +current interest are the plans of Steinbrückenhöhle, Hauchhöhle, and Eislufthöhle.