expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2025-12-08 23:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wallt docm re Upload Form

Browse Source
This commit is contained in:
Philip Sargent
2022-03-19 22:10:27 +00:00
parent 3afb161fb3
commit c83a84ad2d
17 changed files with 161 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
handbook/i/Wolfhohle1983-08-08.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 523 KiB

BIN
handbook/i/scan-upload-files.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 36 KiB

BIN
handbook/i/svx-cave-descript.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 61 KiB

BIN
handbook/i/wallet-chkboxes.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

11
handbook/survey/PLACEHOLDER-COPYTHIS.html
View File

@@ -11,7 +11,16 @@
<h1>Placeholder</h1> <h1>Placeholder</h1>
<p>This is not the page you were hoping for. <p>This is not the page you were hoping for.
<p>This will be replaced with the information you want as soon as someone gets around to writing it. Why not find out how to do this yourself ? <p>This will be replaced with the information you want as soon as someone gets around to writing it.
Why not find out how to do this yourself ?
<p>The instructions for how to edit this page in a browser, or to add your own pages to this handbook are
in our <a href="../computing/hbmanual1.html">Handbook editing manual</a>.
<p>Clearly you want this information, and you will now go out and get it elsewhere, so please take a moment when you are
done to record it here. It will help other people in the same situation as you, and you are clearly THE BEST PERSON to
do this as you care about it.
<hr /> <hr />

54
handbook/survey/cavedescription.html
View File

@@ -2,16 +2,58 @@
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Handbook - survex - Cave Description</title>
<title>Handbook placeholder page</title>
<link rel="stylesheet" type="text/css" href="../../css/main2.css" /> <link rel="stylesheet" type="text/css" href="../../css/main2.css" />
</head> </head>
<body> <body>
<h2 id="tophead">CUCC Expedition Handbook</h2> <h2 id="tophead">CUCC Expedition Handbook - Cave Description</h2>
<h1>Adding Cave Descriptions</h1>
<h2>In the survex file</h2>
<h1>Placeholder</h1> <style>figure {font-weight: bold; font-size: small; font-family: sans-serif;font-variant-caps: small-caps;}</style>
<p>This is not the page you were hoping for. <div class="onleft">
<p>This will be replaced with the information you want as soon as someone gets around to writing it. Why not find out how to do this yourself ? <figure>
<a href="/survexfile/caves-1623/2017-cucc-28/toto_to_crystalcrumble.svx">
<img src="../i/svx-cave-descript.jpg"></a>
<figcaption style="font-variant-caps: small-caps;">
<em>Description of FischGesicht trip on 2018.07.24 (click to open in editor)</em>
</figcaption>
</figure>
</div>
<p>Cave descriptions are written at the end of the survex block - between <var>*begin</var> and
<var>*end</var> statements. Conventionally just after
<a href="qmentry.html">the QMs</a> and before the <var>*end</var> .
<p>The description is written as a single long line of text. In the online editor it is wrapped to fit the window.
<code>
;------------<br />
;Cave description ;(leave commented-out)<br />
; See 2017 description for details of GSH up to the 'p50'.
Briefly, on the way to couldashouldawoulda a 22 m entrance crawl from the
surface leads to a climb down and a junction. Left leads to easy c
rawling passage for a short distance, then another junction where
traversing over a shallow hole and down a stooping-height sandy
passage to a sharp left turn and a sandy, easy 'squeeze' leading to a
straighforward p10.
</code>
[from <a href="/survexfile/caves-1623/2017-cucc-24/couldashouldawoulda_to_bathdodgersbypass.svx"><em>couldashouldawoulda_to_bathdodgersbypass.svx</em></a>]
</p>
<p>You can have several lines of description, as you can see if you follow the link above, but each one must be
prefixed with a semi-colon otherwise the survex software will complain.
<p style="margin:4%">
<em>Technical Note:</em> The syntax for a Cave Description, both the title and the text includes a leading semi-colon.
So it is syntactically a "comment" so far as the survex software is concerned.
<hr />
Return to "<a href="newsurvex.html">Survey handbook - survex format</a>"<br>
Return to "<a href="qmentry.html">QMs (Question Marks)</a>"<br>
Return to "<a href="newwallet.html">New survey wallet</a>"
<hr /> <hr />

9
handbook/survey/caveentry.html
View File

@@ -48,7 +48,9 @@ This page outlines step 6 of the survey production process. Each step is documen
<h3>Guidebook description</h3> <h3>Guidebook description</h3>
<p> <p>
<p>For a simple cave all the description will go into the "New Cave" form as described here. A more complex cave will have separate HTML files for the different sections and subdirectories to put them all in. Here we only describe the process for a simple cave. <p>For a simple cave all the description will go into the "New Cave" form as described here. A more complex cave will
have separate HTML files for the different sections and subdirectories to put them all in. Here we only describe the
process for a simple cave.
<p> <p>
Complementing the passage description in vertical bits is a <a href="newrig.html">Rigging Complementing the passage description in vertical bits is a <a href="newrig.html">Rigging
Guide</a>. Keep notes on this as it is the next step after drawing up the survey. Guide</a>. Keep notes on this as it is the next step after drawing up the survey.
@@ -56,7 +58,10 @@ The rigging guide sections will have been written into the logbook, and the pass
have been written into the survex files, with more lyrical descriptions written into the logbook for each trip. have been written into the survex files, with more lyrical descriptions written into the logbook for each trip.
<p>Write a <b>passage descriptions</b> by copying and extending the descriptions <p>Write a <b>passage descriptions</b> by copying and extending the descriptions
given in all the component .svx files. given in all the component .svx files. You will have seen how these were created in
the <a
href="cavedescription.html">Cave Description"</a> handbook page.
<p>This should be detailed enough to be <p>This should be detailed enough to be
followed by someone in the cave who hasn't been there before, and should followed by someone in the cave who hasn't been there before, and should
include all passage names, lengths of pitches and climbs, compass directions include all passage names, lengths of pitches and climbs, compass directions

18
handbook/survey/newentrancefile.html
View File

@@ -1,6 +1,8 @@
<!DOCTYPE html>
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Handbook placeholder page</title> <title>Handbook placeholder page</title>
<link rel="stylesheet" type="text/css" href="../../css/main2.css" /> <link rel="stylesheet" type="text/css" href="../../css/main2.css" />
</head> </head>
@@ -13,20 +15,6 @@
<hr /> <hr />
<div id="menu">
<ul id="links">
<li><a href="../index.htm">Expedition Handbook</a>
<ul>
<li><a href="../rig/rigit.html">Rigging guide</a></li>
<li><a href="../survey/index.htm">Surveying guide</a></li>
<li><a href="../look4.htm">Prospecting guide</a></li>
<li><a href="../rescue.htm">Rescue guide</a></li>
</ul></li>
<li><a href="../../infodx.htm">Main index</a></li>
<li><a href="../../index.htm">Expo Home</a></li>
<li><a href="https://camcaving.uk">CUCC Home</a></li>
</ul>
</div>
</body> </body>
</html> </html>

19
handbook/survey/newsurvex.html
View File

@@ -120,12 +120,13 @@ traversing over a shallow hole and down a stooping-height sandy
passage to a sharp left turn and a sandy, easy 'squeeze' leading to a passage to a sharp left turn and a sandy, easy 'squeeze' leading to a
straighforward p10. straighforward p10.
</code> </code>
[from <a href="../../"><em>couldashouldawoulda_to_bathdodgersbypass.svx</em></a>] [from <a href="/survexfile/caves-1623/2017-cucc-24/couldashouldawoulda_to_bathdodgersbypass.svx"><em>couldashouldawoulda_to_bathdodgersbypass.svx</em></a>]
</p> </p>
<p> <p>
Note that the description is often written as one long line. Use the word-wrap capability in your editor Note that the description is often written as one long line. Use the word-wrap capability in your editor
to make it easier for yourself. to make it easier for yourself.
</p> See more detail in the <a href="cavedescription.html">Cave Description"</a> handbook page which also describes eventual HTML publication.
<h3><a id="onlinesvx">Using the direct online system</a></h3> <h3><a id="onlinesvx">Using the direct online system</a></h3>
<p>This is where you type up the hand-scrawled notes directly into a a web browser, creating a new online survex file automatically in the right place on the online system. <p>This is where you type up the hand-scrawled notes directly into a a web browser, creating a new online survex file automatically in the right place on the online system.
@@ -159,8 +160,18 @@ below the edit window.
<pre> Error: remove all []s from the text. They are only template guidance. <pre> Error: remove all []s from the text. They are only template guidance.
</pre> below the editing window. </pre> below the editing window.
<br> <br>
- But if you have done all that, then survex will process your new survex file and tell you interesting things about your survey data below the editing window. ('<a href="https://survex.com/docs/manual/cavern.htm">cavern</a>' is the survex engine which we use to process survex files.) - But if you have done all that, then survex will process your new survex file and tell you interesting things about
<p>You may see a number of error messages below the editing window: <em>read them and understand them</em>. If you don't understand them, <em>ask someone</em>. your survey data below the editing window. ('<a href="https://survex.com/docs/manual/cavern.htm">cavern</a>' is the
survex engine which we use to process survex files.)
<p style="margin:4%">
<em>Technical Note:</em> When the survex file is saved, it is being saved to the permanent store on the expo file
server. It is also being automatically registered in the version control system [or will be, if Philip & Wookey get
their act together March 2022]. So don't worry about losing data. A super-nerd can always recover it (not a job for an ordinary nerd though).
<h4>Understanding the messages</h4>
<p>You may see a number of error messages below the editing window: <em>read them and understand them</em>. If you
don't understand them, <em>ask someone</em>.
<p>So using the online system gives you a very, very easy way of syntax-checking your data entry and <p>So using the online system gives you a very, very easy way of syntax-checking your data entry and
typing up your notes. typing up your notes.

53
handbook/survey/newwallet.html
View File

@@ -175,6 +175,16 @@ you unnecessarily.
<p style="margin-left:20px">[ Note to maintainers: do not rename these files even if they have been created with the wrong names. <p style="margin-left:20px">[ Note to maintainers: do not rename these files even if they have been created with the wrong names.
They are permanently referred to by the tunnel/therion/troggle system !] They are permanently referred to by the tunnel/therion/troggle system !]
<div class="onright">
<figure>
<a href="/scanupload/2018:19">
<img src="../t/scan-upload-files.jpg"></a>
<figcaption style="font-variant-caps: small-caps;">
<em>File list in a wallet (click to open form online)</em>
</figcaption>
</figure>
</div>
<h3>Uploading the scanned files to the server</h3> <h3>Uploading the scanned files to the server</h3>
<ul> <ul>
@@ -182,10 +192,41 @@ They are permanently referred to by the tunnel/therion/troggle system !]
</ul> </ul>
<p>Upload the scanned files from any computer with internet access using the <a href="/scanupload/2022:01">Upload Scans</a> form. <p>Upload the scanned files from any computer with internet access using the <a href="/scanupload/2022:01">Upload Scans</a> form.
You will need to login as user 'expo' with the usual {cavy:beery} password. You will need to login as user 'expo' with the usual {cavy:beery} password.
<p>The tickboxes on the form correspond to the tickboxes on <a href="../l/walletindex.html">the paper index sheet</a> <p>The form shows the files already uploaded in the online wallet, and you click on the very large "Choose files" button to open a file
(shown in more detail <a href="/expofiles/documents/surveying/surveyIndex2022.pdf">here</a>). Note that the paper form has 3 boxes for the survex chooser dialog where you can select several files at once to upload.
file: the numbers for the survey legs (data), the numbers for the LRUDs, and the description and QMs. You should only tick the online form
'survex' box when all three have been done. <p>Some of the tickboxes on the lower half of the form correspond to the tickboxes on <a
href="../l/walletindex.html">the paper index sheet</a> (shown in more detail <a
href="/expofiles/documents/surveying/surveyIndex2022.pdf">here</a>). Other tickboxes record whether it is a tiny cave
not worth surveying (no survex, plan or elevation required), a simple pit (no plan required) or a flat grovel (no
elevation required).
<div class="onleft">
<figure>
<a href="../i/wallet-chkboxes.jpg">
<img src="../t/wallet-chkboxes.jpg"></a>
<figcaption style="font-variant-caps: small-caps;">
<em>Checkboxes on an online wallet<br>(click to enlarge)</em>
</figcaption>
</figure>
</div>
You can tick the "Cave description" checkbox when you have written the description in the survex file (see <a
href="cavedescription.html">Cave Description"</a>).
<p>
The QMs are written into the survex file as described in the <a href="qmentry.html">Adding QMs</a> handbook page.
<p>The "Website updated" checkbox is for later when you copy the description text from the survex
file into the Cave Description page of the online cave registration form. This is described in the <a
href="cavedescription.html">Cave Description"</a> page and on Step 6 of this survey process
<a href="caveentry.html">Creating a new cave in the online system</a>.
<p style="margin:4%">
[ Note that the paper form has 3 boxes for the survex
file: the numbers for the survey legs (data), the numbers for the LRUDs, and the description / QMs. The online form only has the QMs and a filename for the survex file. ]
<p>Scanned survey notes are voluminous and so are not kept in the version control system. So for safety, if you upload a file with the same name as one already there, <p>Scanned survey notes are voluminous and so are not kept in the version control system. So for safety, if you upload a file with the same name as one already there,
the upload process will add a random suffix to the filename. You will need to contact a nerd to confirm which one you want to keep. the upload process will add a random suffix to the filename. You will need to contact a nerd to confirm which one you want to keep.
@@ -197,7 +238,7 @@ to your wallet name, e.g. for
<pre> <pre>
/home/expo/expofiles/surveyscans/2018/2018#19/ /home/expo/expofiles/surveyscans/2018/2018#19/
</pre> </pre>
But then please upload them to the wallet on the server. Don't just leave them on the expo laptop. But then please upload them to the wallet on the server using the upload form. Don't just leave them on the expo laptop.
<p><a href="/scanupload/2018:19">This is what that wallet looks like</a> using <p><a href="/scanupload/2018:19">This is what that wallet looks like</a> using
the <a href="/scanupload/2018:19">Upload Scans</a> form. the <a href="/scanupload/2018:19">Upload Scans</a> form.
<p> <p>
@@ -216,7 +257,7 @@ Please <em>only copy files to the server that you created yourself and which liv
<h3 id="runsurvex">Storing your electronic survey .topo files</h3> <h3 id="runsurvex">Storing your electronic survey .topo files</h3>
<p>If you used a PDA instead of making notes on paper, you need to store your .topo files. <p>If you used a PDA instead of making notes on paper, you need to store your .topo files.
Put them in exactly the same place as a scanned survey sketch would go, but also write a paper note and put it in the plastic wallet in the potato hut to prevent someone re-using that wallet number. Put them in exactly the same place as a scanned survey sketch would go, but also write a paper note and put it in the plastic wallet in the potato hut to prevent someone re-using that wallet number.
See the <a href="pdanotes">PDA specific instructions</a> See the <a href="pdanotes.html">PDA specific instructions</a>
<p>If you are using the expo laptop just upload the .topo files using the <a href="/scanupload/2022:01">Upload Scans</a> form and also copy them to an ordinary <em>online</em> wallet <p>If you are using the expo laptop just upload the .topo files using the <a href="/scanupload/2022:01">Upload Scans</a> form and also copy them to an ordinary <em>online</em> wallet
wallet, as there is no physical wallet, wallet, as there is no physical wallet,

3
handbook/survey/onlinewallet.html
View File

@@ -31,7 +31,8 @@
</ol> </ol>
<h2>You need to know this bit</h2> <h2>You need to know this bit</h2>
<p>All this information is in <span style="font-family:monospace">expo.survex.com/expofiles/</span> which is <font color=red><b>not under version control</b></font>, <p>All this information is in <span style="font-family:monospace">expo.survex.com/expofiles/</span> which is <font color=red><b>not under
version control</b></font>,
so the most recent person so the most recent person
to change anything <font color=red><b>can overwrite everyone else's work</b></font>. to change anything <font color=red><b>can overwrite everyone else's work</b></font>.

4
handbook/survey/pdanotes.html
View File

@@ -15,6 +15,10 @@ Why not find out how to do this yourself ?
<p>The instructions for how to edit this page in a browser, or to add your own pages to this handbook are <p>The instructions for how to edit this page in a browser, or to add your own pages to this handbook are
in our <a href="../computing/hbmanual1.html">Handbook editing manual</a>. in our <a href="../computing/hbmanual1.html">Handbook editing manual</a>.
<p>Clearly you want this information, and you will now go out and get it elsewhere, so please take a moment when you are
done to record it here. It will help other people in the same situation as you, and you are clearly THE BEST PERSON to
do this as you care about it.
<hr /> <hr />

28
handbook/survey/qmentry.html
View File

@@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Handbook - Doing a new cave - QMs</title> <title>Handbook - survex - QMs</title>
<link rel="stylesheet" type="text/css" href="../../css/main2.css" /> <link rel="stylesheet" type="text/css" href="../../css/main2.css" />
</head> </head>
<body> <body>
@@ -77,11 +77,29 @@ The format for question mark lists is <br>
<ul> <ul>
<li><a href="qm.html">Discoverer identifier</a>, <li>Year of discovery, <li>Cave identifier, <li>serial number. <li><a href="qm.html">Discoverer identifier</a>, <li>Year of discovery, <li>Cave identifier, <li>serial number.
</ul> </ul>
but today, with the QMs inside the survex files, the identifiers are just QM1, QM2 etc. but today, with the QMs inside the survex files, the identifiers are QM1, QM2 etc.
<p>This format is <a href="qm.html">documented in the original QM conventions</a> page. <p>This format is <a href="qm.html">documented in the original QM conventions</a> page.
<style>figure {font-weight: bold; font-size: small; font-family: sans-serif;font-variant-caps: small-caps;}</style>
<div class="onright">
<figure>
<a href="cavedescription.html">
<img src="../t/svx-cave-descript.jpg"></a>
<figcaption style="font-variant-caps: small-caps;">
<em>Cave description in survex file (click for more)</em>
</figcaption>
</figure>
</div>
<h4>Cave Descriptions</h4>
<p>The description of the passage is written in the same way as you write QMs, but as free text without
formatting. See the single line at the bottom of the figure below and
in more detail on the <a href="cavedescription.html">Cave Description"</a> handbook page.
<h4 id="example">Full QMs example</h4>
<p> <p>
The example below demonstrates correct and effective use of the QM list referring back to earlier elements in the svx file: The example below demonstrates correct and effective use of the QM list referring back to earlier elements in the svx file.
Cave descriptions are done in a similar way, see the <a href="cavedescription.html">Cave Description"</a> handbook page.
<p> <p>
<img src="wob-svx-edit-pic3.jpg" width=900> <img src="wob-svx-edit-pic3.jpg" width=900>
<p> <p>
@@ -99,9 +117,11 @@ development in our online systems. The current status is <a href="../troggle/scr
<h3>Conclusion</h3> <h3>Conclusion</h3>
<p>Survey data recorded in .svx files is incomplete if there is no QM List data and <p>Survey data recorded in .svx files is incomplete if there is no QM List data and
cave description data! cave description data!
<p>Return to "<a href="newsurvex.html">Survey handbook - survex format</a>".</p>
<hr /> <hr />
<p>Return to "<a href="newsurvex.html">Survey handbook - survex format</a>".</p>
</body> </body>
</html> </html>

BIN
handbook/t/Wolfhohle1983-08-08.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 61 KiB

BIN
handbook/t/scan-upload-files.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

BIN
handbook/t/svx-cave-descript.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
handbook/t/wallet-chkboxes.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB