diff --git a/handbook/finance.html b/handbook/finance.html index ebb4993c3..252a01e9d 100644 --- a/handbook/finance.html +++ b/handbook/finance.html @@ -92,7 +92,7 @@ After the expedition, the Expo treasurer processes this data to work out who owe
The aim of this summary document is to pass on current knowledge, including between one year and the next year’s expedition, about pitches that have +
The aim of this summary document is to pass on current knowledge, including between one year and the next year's expedition, about pitches that have significant flood hazards. The same info should also appear in each cave description, but sometimes they are out of date.
Last updated July 2016
@@ -20,7 +20,12 @@ significant flood hazards. The same info should also appear in each cave descrip[ We could dream up some fancy scheme for indexing the rigging for every pitch in the system and add that into troggle but frankly we don't think it's worth the effort.] +
If you look in detail at the description of Steinbrückenhöhle you will see rigging topos +
If you look in detail at the description of Steinbrückenhöhle you will see rigging topos inline as pixel images (not vector files) in the passage descriptions. These are stored with the passage HTML files, e.g. in :expoweb:/1623/204/rigging/kiwi.png, whereas the master copy of this rigging diagram is the vector file at diff --git a/handbook/survey/qmentry.html b/handbook/survey/qmentry.html index 2b6af0755..db7a3f129 100644 --- a/handbook/survey/qmentry.html +++ b/handbook/survey/qmentry.html @@ -30,20 +30,20 @@ compared to including QMs only in survey drawings in Tunnel or writing a cave description then putting it on the expo website.
Svx files are a very stable place to store the data long- -term: there is no need to rely on a ‘master file’ of any kind, which can be problematic if not everyone +term: there is no need to rely on a ‘master file' of any kind, which can be problematic if not everyone on expo has the same level of computer literacy, and requires just basic text entry to create and update the data after a trip. -
-So, you’ve got your .svx file started (if entering new data), or located and opened (if updating a +So, you've got your .svx file started (if entering new data), or located and opened (if updating a previously surveyed bit of cave after checking out some QMs again), and it looks a bit like this (visual format will change depending on your preferred text editor):
-If you don’t understand what is in front of you here, then you need to read the survey handbook guide on svx files which will lead you to the survex documentation, or ask +If you don't understand what is in front of you here, then you need to read the survey handbook guide on svx files which will lead you to the survex documentation, or ask someone about basic entry of survey leg and station data into the .svx file format.
Near to the end of the text in the file, you will see a section that looks like this: @@ -107,7 +107,7 @@ If these data are not entered along with the rest of the survey data, it is as i some of the actual passage data you surveyed: information is being lost and someone will have to trawl back through all the survey data at a later time to keep it up-to-date, a very tedious task which is a very inefficient use of time. -
Also if the person reading it hasn’t been to the bit of cave (which is, like, the whole point, then the data has a higher chance of being incorrect. It is not always easy to interpret Tunnel or Therion +
Also if the person reading it hasn't been to the bit of cave (which is, like, the whole point, then the data has a higher chance of being incorrect. It is not always easy to interpret Tunnel or Therion drawings correctly with this sort of thing.
Paul Fox just paid (2018) €70 all the way from Salzburg to London, including the Eurostar, booked only 3 days in advance. In comparison Eurostar want £88 for a seat on the same train from Brussels to London, so the journey across all of Germany was cheaper than free.
+Paul Fox just paid (2018) €70 all the way from Salzburg to London, including the Eurostar, booked only 3 days in advance. +In comparison Eurostar want £ for a seat on the same train from Brussels to London, so the journey across all of Germany was cheaper than free.
The only catch is that you need to check in with a human at Brussels / London as the Eurostar gates can't read DB ticket barcodes.
diff --git a/handbook/troggle/scriptsqms.html b/handbook/troggle/scriptsqms.html index 7dd4b00c1..31b382ec7 100644 --- a/handbook/troggle/scriptsqms.html +++ b/handbook/troggle/scriptsqms.html @@ -72,7 +72,7 @@ C1999-204-09 C Wolp Hole in floor through dangerous boulders vei Fields in 258/qm.csv are:Cave, year, number, Grade, nearest station, description, completion description, found by, completed by
e.g.
-258 2006 27 C 258.gknodel.4 Small passage to E in Germkn”del Sandeep Mavadia and Dave Loeffler
+258 2006 27 C 258.gknodel.4 Small passage to E in Germknödel Sandeep Mavadia and Dave Loeffler
Fields in 264/qm.csv are:
Year, number, Grade, Survey folder ref#, Surveyname, Nearest Station number, Area of the cave, Description, Y if marked on drawn-up survey,
@@ -132,7 +132,7 @@ The 2019 copies are online in /expofiles/:
This will work on all survex *.svx files even those which have not yet been run through the troggle import process.
-
Phil says (13 April 2020): "The generated files are not meant to be served by the webserver, it’s a tool for people to run locally. Someone could modify it to create HTML output (or post-process the CSV output to do the same), but that is work still to be done."
+
Phil says (13 April 2020): "The generated files are not meant to be served by the webserver, it's a tool for people to run locally. Someone could modify it to create HTML output (or post-process the CSV output to do the same), but that is work still to be done."
troggle/parsers/survex.py
The QMs inside the survex files are parsed by troggle along with all the other information
@@ -183,9 +183,9 @@ Subject: Re: svx2qm
Hi Philip,
-Hope you’re well, thanks for getting in touch about this.
+Hope you're well, thanks for getting in touch about this.
-The generated files are not meant to be served by the webserver, it’s a tool for people to run locally.
+The generated files are not meant to be served by the webserver, it's a tool for people to run locally.
Someone could modify it to create HTML output (or post-process the CSV output to do the same),
but that is work still to be done.
@@ -196,21 +196,21 @@ and it should go into the Makefile too at some point.
Feel free to move it wherever; I am not planning on doing any further work on it.
The script itself just expects to be passed some (relative or absolute) paths to SVX files,
-so can be placed wherever, as long as it’s passed appropriate relative paths.
+so can be placed wherever, as long as it's passed appropriate relative paths.
-I haven’t written any other scripts which post-process the data or otherwise format it.
+I haven't written any other scripts which post-process the data or otherwise format it.
I guess it all depends on what questions people are trying to answer using the QM data,
-as to how (and where) best to present it. I’m afraid I don’t have any suggestions there.
+as to how (and where) best to present it. I'm afraid I don't have any suggestions there.
:Rob Watson wrote some documentation about QMs
:http://expo.survex.com/handbook/survey/qmentry.html
:is there anything subtle missing as to how they are used ?
-Nope, I think Rob’s page covers it all. That page also documents the correct QM format
+Nope, I think Rob's page covers it all. That page also documents the correct QM format
which is what svx2qm.py understands. (There were some older or artisanal QM formats
floating around at one point, although I think I reformatted them all so the tool
-would understand them, and so people would hopefully standardise on what Rob’s
+would understand them, and so people would hopefully standardise on what Rob's
documented from then on.)
Philip