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

Scan uploading docum

Browse Source
This commit is contained in:
Philip Sargent 2022-03-19 18:03:24 +00:00
parent 731109b137
commit d509ac4340
9 changed files with 130 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 54 KiB

19
handbook/survey/PLACEHOLDER-COPYTHIS.html Normal file
View File

@ -0,0 +1,19 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Handbook placeholder page</title>
<link rel="stylesheet" type="text/css" href="../../css/main2.css" />
</head>
<body>
<h2 id="tophead">CUCC Expedition Handbook</h2>
<h1>Placeholder</h1>
<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 ?
<hr />
</body>
</html>

18
handbook/survey/cavedescription.html
View File

@ -1,6 +1,8 @@
<!DOCTYPE html>
<html>
<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>
<link rel="stylesheet" type="text/css" href="../../css/main2.css" />
</head>
@ -13,20 +15,6 @@
<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>
</html>

2
handbook/survey/drawup.htm
View File

@ -28,7 +28,7 @@ This page outlines step 4 of the survey production process. Each step is documen
<h3>Drawing up your survey</h3
<p>The original notes and sketches will be filed in a clearly marked
wallet - see <a href="/newwallet.html">"Starting a new wallet"</a>
wallet - see <a href="newwallet.html">"Starting a new wallet"</a>
- don't take them out until you are ready to scan them, and put them
away again as soon as you have finished. They may never be referred to again,
but ultimately they are the most valuable record of your survey and are kept

8
handbook/survey/newcave.html
View File

@ -51,7 +51,7 @@ actually do these things.
<li>Scan the notes (see <a href="newwallet.html#onlinew">"new wallet"</a> for the filenames to use and <a href="newwallet.html#scan">how to use the scanner</a>)
<li>Type in survey data (in the right place in the file system) in survex format.<br />
(This includes passage descriptions and open leads known as QMs: Question Marks).
<li>Run survex to create a centre-line printout
<li>Run survex to create a centre-line printout (online in a browser or on your computer)
<li>Transcribe your sketches onto centre-line paper
<li>Scan your centre-lined sketches
<li>Use tunnel to digitise your centre-line sketches
@ -59,7 +59,7 @@ actually do these things.
<p>and either later or at the same time, you will be doing these other tasks
<ul>
<li>Upload your <a href="../computing/gpxupload.html">GPS track</a> to the cave and file photos of the entrance
<li>Create a new folder in the file system for the wallet data
<li>Create a new folder in the file system for the wallet data (automatic when using the Upload form)
<li>Create a new folder in the file system for the survex data
<li>Create a "new cave entry" for the guidebook description
<li>Write the <b>full cave description</b> into the correct html files. <br />
@ -87,6 +87,8 @@ New cave process
│ ├── PDA additional notes
│ └── How to use the scanner
├── 2 Creating a new survey wallet
│ ├── New cave data sheet
│ └── Maintaining the online wallets
├── 3 Creating a new survex file
│ ├── How to create a survex file - PDF - Brendan's guide
│ ├── From muddy book to survex plot
@ -114,7 +116,7 @@ New cave process
│
Back in the UK</textarea></code>
<p>Now go the the next page in this sequence <a href="newwallet.html">Starting a new wallet"</a>.
<p>Now go the the next page [2] in this sequence <a href="newwallet.html">Creating a new survey wallet"</a>.
<hr />
</body>

48
handbook/survey/newwallet.html
View File

@ -87,6 +87,18 @@ You can use either your own phone or a laptop connected to the potato hut scanne
a wallet file at top camp
too, with pre-allocated numbers.
<style>figure {font-weight: bold; font-size: small; font-family: sans-serif;font-variant-caps: small-caps;}</style>
<div class="onright">
<figure>
<a href="../i/qm-image.jpg">
<img width=85% src="../i/qm-image.jpg"></a>
<figcaption style="font-variant-caps: small-caps;">
<em>Original notes (click to enlarge)</em>
</figcaption>
</figure>
</div>
<h3>The original notes</h3>
<p>The original notes and sketches should be filed in the clearly marked
wallet. Rip them out of the notebook, don't take them caving again and <em>don't leave them lying around to
be "G&ouml;ssered"!</em></p>
@ -124,7 +136,7 @@ their the scanned notes, plan and elevation scans ("Scan files" column).
<a href="../l/life-wallet.html">
<img src="../t/life-wallet.jpg"></a>
<figcaption style="font-variant-caps: small-caps;">
<em>The things you do with a wallet</em>
<em>The things you do with a wallet (click to enlarge)</em>
</figcaption>
</figure>
</div>
@ -145,7 +157,7 @@ icon from the vertical menu of icons which you get by clicking on
<a href="../l/seq-wallet.html">
<img src="../t/seq-wallet.jpg"></a>
<figcaption style="font-variant-caps: small-caps;">
<em>Interactions with survex files</em>
<em>Interactions with survex files <br>(click to enlarge)</em>
</figcaption>
</figure>
</div>
@ -170,35 +182,43 @@ They are permanently referred to by the tunnel/therion/troggle system !]
</ul>
<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.
<p>The tickboxes on 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>). 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 and QMs. You should only tick the online form
'survex' box when all three have been done.
<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.
<p>Scanned survey notes are voluminous and so are not kept in the version control system. Instead it is all kept
in the file bucket "expofiles" on the expo server machine.
<p>You will be using the expo laptop to do the scanning
and you will put all the scan files in the folder for your wallet, e.g. for
<a href="/survey_scans/2018%252319/">2018#19</a> it was:
and you will need to put the scanned files somewhere before you upload them. So to avoid confusion, put them in the folder corresponding
to your wallet name, e.g. for
<a href="/survey_scans/2018%252319/">2018#19</a> put them in:
<pre>
/home/expo/expofiles/surveyscans/2018/2018#19/
</pre>
but then please also upload them to the same wallet on the server. This is what that wallet looks like using
But then please upload them to the wallet on the server. Don't just leave them on the expo laptop.
<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.
<p>
<code>
If you make a mistake and need to rename a file then be aware that this is much, much easier using
the <em>expo laptop</em>. The correct folder
If someone made a mistake and you are the nerd who needs to rename a file then be aware that this is much, much easier using
the <em>expo laptop</em>, but first, you should read the <a href="onlinewallet.html">online wallet maintainers' notes</a>
<br><br>The correct folder
on the expo server is the same as that on the expo laptop - because we set up the expo laptop to be like that.
But you will need to learn how to use Filezilla <a href="../computing/uploading.html#init">(expo-relevant instructions here)</a>
to move and rearrange things on the server to match.
Please <em>only copy files to the server that you created yourself and which live in your own wallet folder</em>
<p>If you want to use your own laptop for complex rearrangements of files in the server's online wallets you need a
<br><br>If you want to use your own laptop for complex rearrangements of files in the server's online wallets you need a
<a href="../computing/basiclaptop.html">minimal laptop setup</a>
- as <a href="../computing/uploading.html">documented for complex uploading your expo photographs</a>.
</code>
<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 in the right place.
<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.
See the <a href="pdanotes">PDA specific instructions</a>
<p>If you using the expo laptop just upload the .topo files in 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,
e.g. for 2018#16 it would be:
<pre>
@ -212,6 +232,8 @@ to a friendly nerd (not necessarily on expo) who will upload them in the right p
<hr />
<p>Back to the previous page in this sequence
<a href="newcave.html">Creating a new cave in the online system</a>.
<br />Take a side trip to the <a href="onlinewallet.html">online wallet maintainers' notes</a>.
<br />Now go the the next page in this sequence <a href="newsurvex.html">Starting a new survex file"</a>.

68
handbook/survey/onlinewallet.html
View File

@ -8,9 +8,21 @@
<body>
<h2 id="tophead">CUCC Expedition Handbook</h2>
<h1>Maintaining the online wallets</h1>
<p>If you are a newcomer to the system, read the <a href="newcave.html#onlinew">beginners introduction to online wallets</a> first.
<p>If you are a newcomer to the system, read the <a href="newwallet.html#onlinew">beginner's introduction to online wallets</a> first.
<h3>Why we have online wallets</h3>
<style>figure {font-weight: bold; font-size: small; font-family: sans-serif;font-variant-caps: small-caps;}</style>
<div class="onright">
<figure>
<a href="../i/qm-image.jpg">
<img src="../i/qm-image.jpg"></a>
<figcaption style="font-variant-caps: small-caps;">
<em>Original notes</em>
</figcaption>
</figure>
</div>
<h2>Why we have online wallets</h2>
<p>There are three quite different reasons:
<ol>
<li>The scans of the survey notebook pages are the ultimate original raw survey data and completely irreplaceable.
@ -18,7 +30,20 @@
<li>Individual to-do lists are produced automatically for each caver listing what survey processing tasks they haven't finished yet.
</ol>
<h3>The scanned pages</h3>
<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>,
so the most recent person
to change anything <font color=red><b>can overwrite everyone else's work</b></font>.
<h2>What's in the online wallet</h2>
<ul>
<li>The <a href="#scans">scanned images</a> of survey notes
<li><a href="#status">Progress status</a> of drawing up the survey
<li>Links to <a href="#derived">derived data</a>: survex files, survey drawings
</ul>
<h3 id="scans">The scanned images</h3>
<p>These are simply the scanned images (or digital photographs) of each page of the original survey notes.
They should be named <em><span style="font-family:monospace">notesXXX.jpg</span></em> where "XXX" can be
anything you like. Typically we have the scanned pages called notes1.jpg, notes2.jpg, notes3.jpg.
@ -27,15 +52,45 @@ or PDF (very hard to re-use elsewhere). Set the scanner at 300 dpi and adjust th
by using photo-editing software to enhance the writing. Also please crop each image to just the area containing
the survey data.
<p>As soon as the notes have been scanned you should (a) copy them to a USB stick or email them to someone, (b) check that the entire online wallet is on the expo server at
<span style="font-family:monospace">expo.survex.com</span> using the <a href="/scanupload/2021:01">Upload Scans</a> form.
<span style="font-family:monospace">expo.survex.com</span> using the <a href="/scanupload/2019:01">Upload Scans</a> form.
This is so that these precious files are backed-up as soon as possible.
<p>(If you want to move things around, then assuming you have done the
<a href="../computing/keyexchange.html">key-pair procedure</a>, do the upload by <a href="../uploading.html">sFTP</a>
as you do for photos, but to the directory described in the <a href="newwallet.html">introduction to online wallets</a>.)
<p>The <em><span style="font-family:monospace">notesXXX.jpg</span></em> files need to be at moderately high resolution but the plan and
elevation files are usually fine at 200 dpi. So if the caver has scanned these at high resolution you can reduce the size of these files
without damange.
<div class="onright">
<figure>
<a href="../i/scan-upload.jpg">
<img src="../t/scan-upload.jpg"></a>
<figcaption style="font-variant-caps: small-caps;">
<em>Wallet data on Scan Upload (click to enlarge)</em>
</figcaption>
</figure>
</div>
<h3 id="status">Progress status</h3>
<p>The illustration shows the lower half of the <a href="/scanupload/2019:01">Upload Scans</a> form.
This is the information about the wallet itself.
<p>Once you are logged on as user 'expo', you can edit all the data. If you use the right runes for the survex files (as shown in the image),
a clickable-list of the survex files will appear on the upper-left which will take you directly to the survex files - which you can edit
there online too.
<p>There is only one absolutely required field: the date. Unless you specify a date the form will not save your data and the "Submit changes"
button won't work.
<h3 id="derived">Links to derived data</h3>
<p>These links are not actually in the wallet, they are in the survex files, Tunnel files and Therion files.
The links are simply <b>the name of the wallet</b>, e.g. <var>2019#01</var>. So once a wallet has been used, i.e. once you have typed up the first
survex file, you should not rename it or move the contents (unless you can find and change all the files referring to it).
<h2>How this all actually works</h2>
<h3>The other files and online index <span style="font-family:monospace; size=x-small; background-color: lightgray">contents.json</span></h3>
<p>All the other files are part of the multi-step process of producing the cave survey - see <a href="newcave.html">
Creating a new cave...</a> for the full list of steps. The <em><span style="font-family:monospace">notesXXX.jpg</span></em> files need to be at moderately high resolution but the plan and elevation files are usually fine at 200 dpi. So if the caver has scanned these at high resolution you can reduce the size of these files without damange.
Creating a new cave...</a> for the full list of steps.
<p>We keep an index of how many of those steps have been completed in two places:
<ul>
@ -61,9 +116,10 @@ But sometime in mid-Expo 2015 everyone stopped using the survex template file an
and so this information was not properly recorded. This will be fixed by hand-editing in due course.
(Note that many old .svx files were processed with an older version of survex which did not suppport this feature and so a comment was used instead.)
<h2>Much more detail - more than you want</h2>
<p>Troggle produces very useful auto-generated reports of the status of the wallets and the survex files
<ul>
<li><a href="http://expo.survex.com/survey_scans/">List of all wallets</a> and the survex files produced from them (incomplete due to poor data entry especially since 2015)
<li><a href="http://expo.survex.com/survey_scans/">List of all wallets</a> [SLOW to load] and the survex files produced from them (incomplete due to poor data entry especially since 2015)
<li><a href="http://expo.survex.com/expedition/2018">List of all trips and survex files</a> (scroll down to the bottom of the page) in any one year - includes a link to the logbook fragment for the relevant day
<li><a href="http://expo.survex.com/personexpedition/MichaelSargent/2018">List of trips and surveys</a> by a particular person in a particular year (nothing to do with wallets but added here for completeness).
</ul>

11
handbook/survey/pdanotes.html
View File

@ -1,5 +1,8 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Survey Handbook</title>
<link rel="stylesheet" type="text/css" href="../../css/main2.css" />
</head>
@ -9,15 +12,11 @@
<p>This is where you learn how to use a PDA with the CUCC expo survey process instead of using pencil and notebook.
<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>.
<hr />
<ul id="links">
<li><a href="../index.htm">Expedition Handbook</a>
<li><a href="newcave.html">Registering a new cave process</a>
<li><a href="index.htm">Expo Survey Handbook</a>
</ul>
</body>
</html>

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB