diff --git a/.gitignore b/.gitignore index fba33a18b..74cbab8ac 100644 --- a/.gitignore +++ b/.gitignore @@ -11,8 +11,6 @@ handbook/essentials.gpx desktop.ini report.html dplong.htm -1623/204/qm.html -1623/234/qm.html 1623/258/qm.html 1623/204/atoz.html folk/index.htm diff --git a/1623/204/qm.html b/1623/204/qm.html new file mode 100644 index 000000000..2b7291929 --- /dev/null +++ b/1623/204/qm.html @@ -0,0 +1,731 @@ + + + +
+ + +For question mark list conventions, see here.
+ +Aris | Ariston Series |
Insig | Insignificant Chamber and Bonsai Crawl |
NE | Near End |
NPNG | No Pain No Gain |
Tree | Trunk route from The Colonnade via Treeumphant Passage to Cave Tree Chamber |
WE | White Elephant Series |
Wolp | Wolpertinger Way and 110 A Day level |
PD | Pleasure Dome and pitches below |
Sw | Swings and Roundabouts |
For question mark list conventions, see here.
+For question mark list conventions, see here.
For question mark list conventions, see here.
+For question mark list conventions, see here.
For question mark list conventions, see here.
+For question mark list conventions, see here.
There is a well-established path to the bivouac site at the eponymous stone -bridge, which is the usual base for CUCC's operations on the Schwarzmooskogel -ridge north of the 161 area. This is marked with a scattering of cairns, which +
There is a well-established path to Top Camp (bivouac site at the stone +bridge), which has been the usual base for CUCC's operations on the Schwarzmooskogel +ridge north of the 161 area since about 2001. This is marked with carefully placed chain of cairns, which are augmented at the beginning of each expedition with reflective markers (collected in again at the end of the expo).
@@ -24,7 +24,7 @@ various variants of the path lead past the entrance to Bräuninghöhle (1623/82) and continue northwards to Laser Point 5.Shortly after this is the beginning of a patch of bare limestone slabs, -clearly visible from Top Camp, which marks the highest point of the route. The +clearly visible from Schwarzmoossattel, which marks the highest point of the route. The unmistakable arched entrance of Hauchhöhle marks the end of this section, and from here a slightly confusing broken area dotted with patches of dwarf pine brings one out at the entrance to Steinbrückenhöhle.
diff --git a/handbook/survey/newsurvex.html b/handbook/survey/newsurvex.html index f5ce47a45..a51823286 100644 --- a/handbook/survey/newsurvex.html +++ b/handbook/survey/newsurvex.html @@ -95,7 +95,7 @@ scan it again and then use that scanned image to digitise passage layout into tu worked with an distributed version control system at this point which is why we are only telling them to use the expo laptop.] -QMs are the unexplored leads, they are Question Marks because we don't know where they go to. There is a specific format for recording them in survex files. diff --git a/qm.html b/handbook/survey/qm.html similarity index 80% rename from qm.html rename to handbook/survey/qm.html index 9195cd81e..728692463 100644 --- a/qm.html +++ b/handbook/survey/qm.html @@ -1,23 +1,33 @@ - +
- + +This page is somewhat outdated. For the current 21st century QM methods, +where we store QMs in the survex files, see +
The format for question mark lists is QM identifier, Quality Grade, Area indicator, decription of QM. The QM numbers themselves are in the format -Discoverer identifier, Year of discovery, Cave identifier, serial number. If +Discoverer identifier, Year of discovery, Cave identifier, serial number. + +
[Archaic: If you look at the html, you will find that the nearest survey station (without its "<cavenumber>." prefix) is included in an html comment for almost all -leads.
+leads.]In general, an unpushed QM will have a link from its QM number in the -description to the list, and a link from the list to the relevant point in the +cave description file to the list (generated by a perl script), and a link from the list to the relevant point in the description. If there is no link, it means that I can't yet work out where the QM is in the description, or the description doesn't yet exist :-).
diff --git a/handbook/survey/qmentry.html b/handbook/survey/qmentry.html index 6239d1aeb..1bd59e4b0 100644 --- a/handbook/survey/qmentry.html +++ b/handbook/survey/qmentry.html @@ -71,11 +71,11 @@ Here is an example from the last bit of bipedalpassage.svx in 264. Note that eac
The format for question mark lists is
The QM numbers themselves used to be in the format
This format is documented in the original QM conventions page (which now needs revising).
diff --git a/handbook/troggle/scriptsqms.html b/handbook/troggle/scriptsqms.html
index 82f44a164..7dd4b00c1 100644
--- a/handbook/troggle/scriptsqms.html
+++ b/handbook/troggle/scriptsqms.html
@@ -42,7 +42,7 @@ tl;dr - use svx2qm.py. Look at the output at:
chase QMs. It is a troggle-generated document at expo.survex.com/prospecting_guide/. It is so old that "top camp" in the guide refers to the col camp and not the Stonebridge bivvy. Some updates were done in 2007.
-
QMs all use the same QM description conventions. +
QMs all use the same QM description conventions.
A relic. @@ -55,7 +55,7 @@ Django Admin control panel for manipulating QMs. It is not live as media/js/ is
This is a perl script dating from November 2004.
it takes a hand-edited CSV file name as the program's argument and generates an HTML page listing all the QMs. -
Copies of it live in the three cave file folders in :expoweb:/1623/, in 258/, 234/, and 204/ . These generated html files are live pages in the cave descriptions:
+
Varient copies of it (they are all slightly different) live in the three cave file folders in :expoweb:/1623/, in 258/, 234/, and 204/ . These generated html files are live pages in the cave descriptions:
/1623/258/qm.html
/1623/234/qm.html
/1623/204/qm.html
@@ -136,7 +136,7 @@ This will work on all survex *.svx files even those which have not yet been run
The QMs inside the survex files are parsed by troggle along with all the other information -inside survex files and stored in the database. But the webpages which display this data are rudimentary, e.g. /getQMs/1623-204 or /cave/qms/1623-204. +inside survex files and stored in the database. But the webpages which display this data are very rudimentary and currently useless, e.g. /getQMs/1623-204 or /cave/qms/1623-204. Looking through urls.py and core/view_caves.py we see a lot of code for providing new QM numbers, producing lists of QMs for a given cave and for downloading QM.csv files generated by the database. But none of it appears to be working today (14 May 2020), see below.