reorder and edit

This commit is contained in:
Philip Sargent 2022-07-06 17:38:30 +03:00
parent 7b7f8b9b2e
commit c16b4380be

View File

@ -24,9 +24,9 @@ var { # to match <code> but inline
</style>
<h2 id="tophead">CUCC Expedition Handbook</h2>
<h1>QMs and leads</h1>
tl;dr - use <em>svx2qm.py</em>. Look at the output at:<br>
<a href="/expofiles/writeups/2019/qms2019.txt">qms2019.txt</a><br>
<a href="/expofiles/writeups/2019/qms2019.csv">qms2019.csv</a><br>
tl;dr - use the troggle reports for each cave, e.g. <br>
<a href="/cave/qms/1623-290">QMs for Fischgesicht</a>
<h2>QMs - the fourfold path</h2>
<img class="onright" src ="../i/qm-image.jpg" />
@ -35,18 +35,22 @@ QMs are only useful if they can be easily scanned by people planning the next pu
<p>There are half a dozen ways we have used to manage QMs:
<ol>
<li><strong>troggle and QMs in survex files</strong> - Since Sam wrote a QM svx parser in 2020 we have had the recent QMs in troggle but the report
to display them was not written until July 2022. Note that this means some duplication for 1623-161 and a few others where the same QM is
in both the survex file and the CSV file - see below.
<li><strong>troggle + perl era CSV</strong> - One of troggle's input parsers imports the
three
<var>qms.csv</var> files and produces reports by cave and individually, e.g. see <a href="/cave/qms/1623-161">the 161 QMs</a>
(slow page), which is <em>old</em> compared with the hand-edited <a href="/1623/161/qmtodo.htm">1623-161</a> page which was derived from it.
<li><strong>Hand-edited lists of QMS</strong> - only exist for 1623-161 <a href="/1623/161/qmtodo.htm">Kaninchenh&ouml;hle</a>
<li><strong>Perl script</strong> - Historically QMs were not in the survex file but typed up in a separate list <var>qms.csv</var> for
each cave system. A perl script turned that into an HTML file for the website. But there appear to be 3 different formats for this. Not currently used.
each cave system. A perl script turned that into an HTML file for the website.
But there are 3 different formats for this. The perl script is not used, but the same three CSV files (caves 161, 204 and 234)
are imported into troggle during initial data load (see above).
<li><strong>Perl + troggle</strong> - One of troggle's input parsers "QM parser" is specifically designed to import the three HTML files
produced from <var>qms.csv</var> and produces reports by cave and individually, e.g. see <a href="/cave/qms/1623-161">the 161 QMs</a>
(slow page), which is <em>old</em> compared with the hand-edited <a href="/1623/161/qmtodo.htm">1623-161</a> page which was derived from it.
<li><strong>troggle and QMs in survex files</strong> - Since Sam wrote this in 2020 we have had the recent QMs in troggle but the report
to display them was not written. This has now (July 2022) been fixed. Note that this means some duplication for 1623-161 and a few others.
<li><strong>Python script</strong> - Phil Withnall's 2019 script <em>svx2qm.py</em> scans all the QMs in a single survex file. See below for how to run it on all survex files.
@ -60,7 +64,7 @@ It has been retired because the mapping software packages it used were terminall
<p>QMs all use <a href="../survey/qm.html">the same QM description conventions</a>.
<h4 id="qms.py">troggle/parsers/qms.py</a></h4>
<p>Troggle currently reports QMs for only three historic caves and also imports all the QMs inside survex files.
<p>Troggle currently reports QMs separately collated for three historic caves and also imports all the QMs inside survex files.
Thus a recent cave such as 1623-264 (Balkh&ouml;hle) will only show QMs imported from the survex files:
<ul>
<li>/cave/qms/&lt;caveslug&gt; e.g. <a href="/cave/qms/1623-264/">/cave/qms/1623-264/</a> works (slow page)
@ -167,8 +171,7 @@ This will work on all survex *.svx files even those which have not yet been run
<h4>troggle/parsers/survex.py</a></h4>
<p>Troggle <em>troggle/parsers/survex.py</em> currently parses and stores all the QMs it finds in survex files. The tables where the data
is put are listed in <a href="datamodel.html">the current data model</a> including structure for ticking them off. These QMs are stored in
the database. But the webpage which displays this data is currently broken, e.g. <a href="/getQMs/1623-204"> /getQMs/1623-204</a>.
is put are listed in <a href="datamodel.html">the current data model</a> including structure for ticking them off.
<h4>troggle archeology</a></h4>