expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2024-11-22 07:11:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

::expoweb:: replaced by :expoweb: to indicate a repo

Browse Source
This commit is contained in:
Philip Sargent 2020-04-11 17:46:18 +01:00
parent a68be50432
commit 1991ecb6d3
17 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
folk/README
View File

@ -17,7 +17,7 @@ by making it happen in make-folklist.py
Troggle scans the blurb and looks for everything between <body> and <hr
to find the text of the blurb
(see ::troggle::/parsers/people.py)
(see :troggle:/parsers/people.py)
All the blurb files have to be .htm - ,html is not recognised by people.py
and trying to fix this breaks something else (weirdly, not fuly investigated).

2
handbook/computing/folkupdate.html
View File

@ -13,7 +13,7 @@
<h3 id="import">The folk list</a></h3>
<p>This is part of the <a href="newyear.html">"new expo year"</a> preparations.
The folk.csv file is stored on the server under version control in the ::expoweb:: repository in
The folk.csv file is stored on the server under version control in the :expoweb: repository in
<code>expoweb/folk/folk.csv</code>
<p>Before expo starts the folk.csv file is updated.

2
handbook/computing/manual.html
View File

@ -97,7 +97,7 @@ Appendices:
<p>This password is all you need to log in to troggle and to use the troggle control panel (very few people need to do this). But if you want to update webpages (a much more common requirement) or to edit the software itself (very rare), then
you will also need to get a login (register a key with the server). See <a href="keyexchange.html">key-pair setup</a> for details.
<p>Pushing cave data to the ::loser:: and ::drawings:: repositories also needs a key. So cavers entering their cave survey data have to use a machine on which this already set up. These machines are
<p>Pushing cave data to the :loser: and :drawings: repositories also needs a key. So cavers entering their cave survey data have to use a machine on which this already set up. These machines are
the <i>expo laptop</i> and the laptop '<i>aziraphale</i>' which live in the potato hut during expo. If you want to use your own laptop then
see <a href="#yourownlaptop">below</a>.

2
handbook/computing/winlaptop.html
View File

@ -55,7 +55,7 @@ The links you are most likely to come across are that what looks like
and that
<span style="font-family:monospace; size=x-small; background-color: lightgray">expoweb/essentials.gpx</span>
is a link to the file <span style="font-family:monospace; size=x-small; background-color: lightgray">/home/expo/expofiles/gpslogs/essentials/essentials2019.gpx</span>
<p>But that example is in the <span style="font-family:monospace; size=x-small; background-color: lightgray">::expoweb::</span> repository, so you won't be using sFTP to download it. Instead you will be using the version control software which handles it without problems. But we use it as an example of what to look out for when using sFTP.
<p>But that example is in the <span style="font-family:monospace; size=x-small; background-color: lightgray">:expoweb:</span> repository, so you won't be using sFTP to download it. Instead you will be using the version control software which handles it without problems. But we use it as an example of what to look out for when using sFTP.
<p>
<img src="fzlink.jpg" align="right">

2
handbook/computing/x-todo.html
View File

@ -26,7 +26,7 @@
<p><span style="text-decoration: line-through;">Edit this page by clicking on the big blue button. It uses the same "Edit this page" function that you may have used before.</span> <em>But that is not working yet. Please do not try as that will currently delete all the Javascript that makes the hide/reveal functions work.</em>
<p>Edit this page using the pull/edit/commit/push version control mechanism.
<h3>Taken from file on ::expoweb::/TODO </h3>
<h3>Taken from file on :expoweb:/TODO </h3>
<dl><!--2020-03-29 psargent-->
<dt>Add missing images to logbooks</dt>
<dd>

1
handbook/computing/yourlaptop.html
View File

@ -66,6 +66,7 @@ but all the recommended software here is open source (and please don't install p
<li>python packages you will want to install: [<em>not yet documented</em>]
<li><a href="https://github.com/patrickbwarren/qgis3-survex-import">qgis3-survex-import</a> - plugin to import/export survex .3d files</li>
<li><a href="http://www.thomas-holder.de/projects/inkscape-speleo/extensions/">inkscape-speleo</a> - plugin to import/export survex, therion and pockettopo files to the drawing package inkscape.
<li><a href="https://imagemagick.org/script/">Imagemagick convert</a> for re-scaling photographs and scanned images and converting from PDF to JPG. (NB you may need to fix this <a href="https://stackoverflow.com/questions/52998331/imagemagick-security-policy-pdf-blocking-conversion">security issue</a>)
</ul>
<p>Nearly all our Austrian surveys have beeen produced using Tunnel (or were hand-drawn) but many smaller caves and some areas of SMKsystem are done with Therion because Therion does elevations and Tunnel doesn't.</p>

4
handbook/essentials.html
View File

@ -116,11 +116,11 @@ devise new routes to reach them.
<p>
To regenerate the <i>most recent version</i> which contains the cave entrances discovered during expo
you will need to ask someone who is competent in logging into the server and running scripts.
<p>The data is in the version control system repository ::loser:: in
<p>The data is in the version control system repository :loser: in
<pre>
loser/gpx/
</pre>
and is generated from the survex data by a script. It is best to do this on a laptop which has the entire ::loser::
and is generated from the survex data by a script. It is best to do this on a laptop which has the entire :loser:
repo downloaded onto it (e.g. the <i>expo laptop</i>) rather than on the server itself as the server can run out of memory doing this.
<p>The most recent track data will have been uploaded by an expoer into e.g.

4
handbook/gpxupload.html
View File

@ -86,7 +86,7 @@ to something recognisable such as 'top-camp-to-toilet-grike.gpx' (all lower case
GPX data is stored in two places.
<ul>
<li>initially in <em>expofiles/gpslogs/...</em>
<li>some key selected tracks are later stored in the cave survey repository <em>::loser::</em>
<li>some key selected tracks are later stored in the cave survey repository <em>:loser:</em>
</ul>
<p>
GPS tracks are voluminous and we also get a lot of repetition
@ -114,7 +114,7 @@ If you have edited GPS tracks and waypoints with no extraneous data
then, after agreeing this with other people as to its qualityand appropriateness,
it will go into the <a href="http://expo.survex.com/repositories/home/expo/loser/graph/">Loser DVCS repository</a>
in folder <em>/gpx/&lt;year&gt;/</em> e.g. <br>
<em>::loser::/2018/stone-bridge-to-fischgesicht_aday-2018-07-12.gpx</em><br>
<em>:loser:/2018/stone-bridge-to-fischgesicht_aday-2018-07-12.gpx</em><br>
<p>Note the naming convention for this file created by Anthony Day on July 12th 2018.
Everything in any repository is always named using lower-case letters.
<hr />

16
handbook/survey/newcavefile.html
View File

@ -10,10 +10,10 @@
<h2 id="tophead">CUCC Expedition Handbook</h2>
<h1>Cave data file</h1>
<p>These files live in <span style="font-family: monospace">::expoweb::/cave_data/</span>
<p>These files live in <span style="font-family: monospace">:expoweb:/cave_data/</span>
<p>The example full format below is of a very simple cave with hardly any fields filled in. The most vital field is
<code>&lt;url&gt;augstb/4.htm&lt;/url&gt; </code>
at the bottom as this shows that this file is <code>::expoweb::/cave_data/augstb/4.htm</code>
at the bottom as this shows that this file is <code>:expoweb:/cave_data/augstb/4.htm</code>
<!-- it would be nice to find something that colourises this in HTML -->
<pre><code>&lt;!-- Only put one cave in this file --&gt;
@ -68,15 +68,15 @@ the form and the file format however.
<p>When you fill in the online form you creating a file just like the one above: troggle takes the input data from the form and creates the file. Troggle also stores the cave information in it's live memory when you use the form method.
<p>If instead of using the form you create the file by hand and upload it to the server you will also need find a nerd to run the cave import procedure before troggle "knows" that the cave exists.
<h3>Cave entrances</h3>
<p>There is <a href="newentrancefile.html">an exactly analogous file</a> for cave entrances except that those files live in <span style="font-family: monospace">::expoweb::/entrance_data/</span>
<p>There is <a href="newentrancefile.html">an exactly analogous file</a> for cave entrances except that those files live in <span style="font-family: monospace">:expoweb:/entrance_data/</span>
<h2>File layout</h2>
<p>The caves in our site are stored as XML files in the directory <tt>::expoweb::/cave_data</tt> and in
files named <tt>::expoweb::/cave_data/{area}-{cavenumber}</tt>. Entrances are correspondingly
in <tt>::expoweb::/entrance_data</tt> files, with the same naming convention, except that if
there is more than one entrance they have a,b,c suffixes, e.g. <tt>::expoweb::/<b>entrance</b>_data/{area}-{cavenumber}b</tt>
<p>The caves in our site are stored as XML files in the directory <tt>:expoweb:/cave_data</tt> and in
files named <tt>:expoweb:/cave_data/{area}-{cavenumber}</tt>. Entrances are correspondingly
in <tt>:expoweb:/entrance_data</tt> files, with the same naming convention, except that if
there is more than one entrance they have a,b,c suffixes, e.g. <tt>:expoweb:/<b>entrance</b>_data/{area}-{cavenumber}b</tt>
<p></p>Any <em>associated files</em>, usually photos and surveys, are
stored under the area names <tt>::expoweb::/1623/{cavenumber}</tt> or <tt>::expoweb::/1626/{cavenumber}</tt>
stored under the area names <tt>:expoweb:/1623/{cavenumber}</tt> or <tt>:expoweb:/1626/{cavenumber}</tt>
Note that this is a different naming convention: caves and entrances have the {area} as <em>
part of the file name
</em>

6
handbook/survey/newsurvex.html
View File

@ -47,7 +47,7 @@ example:
/home/expo/loser/caves-1623/264/mongolrally.svx
</pre>
and tell someone nerdy when you have finished and they will
ensure that it is <em>saved, committed, </em>and<em> pushed</em> appropriately to the ::loser:: repo.
ensure that it is <em>saved, committed, </em>and<em> pushed</em> appropriately to the :loser: repo.
<p>If you have several parts of the cave surveyed on one trip, create several distinct .svx files.
<ul>
<li><a href="../../documents/survex-guide.pdf">How to create a survex file</a> - PDF - Brendan;s guide.
@ -69,8 +69,8 @@ scan it again and then use that scanned image to digitise passage layout into tu
<li><a href="../survexhiustory96.htm">History of Survex (1996)</a></li>
</ul>
<p>[Nerds: survex cave data belongs in the repository ::loser:: so e.g.
::loser::/caves-1623/264/mongolrally.svx". We are assuming that normal users have never
<p>[Nerds: survex cave data belongs in the repository :loser: so e.g.
:loser:/caves-1623/264/mongolrally.svx". We are assuming that normal users have never
worked with an distributed version control system at this point which is why we are only
telling them to use the <em>expo laptop</em>.]

4
handbook/survey/onlinewallet.html
View File

@ -223,7 +223,7 @@ to see what overwriting you will do.
<p>The python script does more than just re-format the <span style="font-family:monospace; size=x-small; background-color: lightgray">contents.json</span> data into
different formats. It also
<ul>
<li>checks whether the .svx files listed are actually present <br>in the <a href="http://expo.survex.com/repositories/home/expo">::loser::</a> repository
<li>checks whether the .svx files listed are actually present <br>in the <a href="http://expo.survex.com/repositories/home/expo">:loser:</a> repository
<li>checks for the presence of notesXXX.jpg, planXXX.jpg and elevXXX.jpg files
<li>checks for the presence of XXXnotes.jpg, XXXplan.jpg and XXXelev.jpg files
<li>creates a template <span style="font-family:monospace; size=x-small; background-color: lightgray">contents.json</span> in any wallet which does not have one.
@ -252,7 +252,7 @@ Old notes, being turned into real documentation...
For prospecting and surface surveying it is not clear whether the default folder
for the url link should be repo ::loser:: surface/1623/allplateau.svx
for the url link should be repo :loser: surface/1623/allplateau.svx
When there are more than one .svx file there seems to be no way of recording the list
in contents.json so it is impossible to tell what was done on that trip or whether

2
handbook/troggle/trogmanual.html
View File

@ -19,7 +19,7 @@
<li><a href="otherscripts.html">Other scripts</a> - photos, folk, wallets - not integral parts of troggle.
<li><a href="trogarch.html">Troggle and database</a> architecture: how it all fits together
<li><a href="trogdesign.html">Design decisions</a>: e.g. new systems for <a href="menudesign.html">website menus</a>
<li><a href="trogdocm.html">Maintain troggle</a> itself. The code is public on repository <a href="http://expo.survex.com/repositories/">::troggle::</a>
<li><a href="trogdocm.html">Maintain troggle</a> itself. The code is public on repository <a href="http://expo.survex.com/repositories/">:troggle:</a>
<li><a href="trognotes.html">Uncategorised notes</a> and past speculations
</ul>

2
handbook/troggle/trognotes.html
View File

@ -18,7 +18,7 @@
<ul>
<li>Annual tasks: preparing for next year, finishing last year (troggle & scripts)
<li>Architectural documentation of how it all fits together & list of active scripts
<li>How to edit and maintain troggle itself. The code is public on repository <a href="http://expo.survex.com/repositories/">::troggle::</a>
<li>How to edit and maintain troggle itself. The code is public on repository <a href="http://expo.survex.com/repositories/">:troggle:</a>
</ul>
<p>This page is mostly an index to other records of what troggle is and what plans have been made - but never implemented - to improve it.

2
svxvalid.html
View File

@ -18,7 +18,7 @@ because the actual updated data is pulled in through the iframe -->
<iframe name="erriframe" width="90%" height="45%"
src="svx-refs.err.html" frameborder="1" ></iframe>
<p>These validation concerns are generated by scripts check-svx.sh, check-refs.sh, check-refs.awk in the ::loser:: repository.
<p>These validation concerns are generated by scripts check-svx.sh, check-refs.sh, check-refs.awk in the :loser: repository.
See <a href="handbook/troggle/otherscripts.html">handbook "other scripts"</a> for further documentaiotn.
<p>These scripts and checks could all be done as internal troggle-generated pages as the data used
is (mostly) present in the tables after importing the wallet images and the survex files.

2
xmlvalid.html
View File

@ -17,7 +17,7 @@ Please edit these drawings files to correct this:</p>
<iframe name="erriframe" width="90%" height="15%"
src="xml-refs.err.html" frameborder="1" ></iframe>
<p>These validation issues are generated by script check-xml.sh in the ::drawings:: repository.
<p>These validation issues are generated by script check-xml.sh in the :drawings: repository.
See <a href="handbook/troggle/otherscripts.html">handbook "other scripts"</a> for further documentation.
</p>

2
years/2018/index.html
View File

@ -24,7 +24,7 @@ Link to last year: <a href="../2017/">2017</a>
<ul>
<li><a href="logbook.html">2018 Logbook</a></li>
<li><a href="../../../expofiles/writeups/2018/calloutbook/">2018 call-out book</a></li>
<li><a href="../../../expofiles/surveyscans/2018/index.html">Progress list of 2018 surveying</a></li>
<li><a href="../../../expofiles/surveyscans/2018/">Progress list of 2018 surveying</a></li>
</ul>
<h3>Post-Expo Completion</h3>
<ul>

2
years/2020/index.html
View File

@ -30,7 +30,7 @@ PDF docs:
On expo website:
<ul>
<li><a href="../../../expofiles/surveyscans/2019/index.html">2019 surveying progress</a></li>
<li><a href="../../../expofiles/surveyscans/2019/">2019 surveying progress</a></li>
<li><a href="../2019/topcamplist.html">Stuff left at top camp 2019</a></li>
<li><a href="../2019/basecamplist.html">Stuff left at base camp 2019</a></li>
<li><a href="../2019/ugcamplist.html">Stuff left at Littleboy camp 2019</a></li>