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

Upload Scan and wallets documentation

Browse Source
This commit is contained in:
Philip Sargent 2021-05-02 00:49:36 +01:00
parent f1df74a817
commit 5e24865fce
3 changed files with 45 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
handbook/computing/todo.html
View File

@ -45,7 +45,9 @@ If a heading is in italics, then there are hidden items.
<details><summary><!--2020-03-26 psargent-->Wallets and new-cave</summary>
<li><!--2020-03-26 psargent-->Explain how to link a new cave into the other caves in
troggle filesystem</dd>
<li><!--2020-03-26 psargent-->Explain how to add photos with the correct URL format to sub-HTML files attached to New Caves</dd>
<li><!--2020-03-26 psargent-->Explain how to add photos with the correct URL format to sub-HTML files attached to New Caves
</details>
<details><summary><!--2020-04-13 psargent-->svx check</summary>
<li>explain command line to run on newly typed survex file to check for format errors '$cavern xxxx.svx'
@ -55,7 +57,19 @@ If a heading is in italics, then there are hidden items.
<li>Add to user data manual how to upload to expofiles - in the "survey manual"
<li>Add in description of *where* to put the drawings files
</details>
<h3>Wallets re-programming</h3>
<details><summary><!--2021-05-21 psargent-->Things wallets.py might do in future </summary>
<li>- integrate into troggle, remove as a distinct script
<li>- checking the cave number specified matches the folder for the .svx file,
<li>- checking that the *ref: filed in the survex file is the same as the wallet nameS
<li>- detecting whether there is a description or a list of QMs in the survex file,
<li>- accepting a list of .svx files and not just one (a very common thing),
<li>- checking the name of the cave against the cave number,
<li>- checking whether the website page even exists for this cave,
<li>- being more intelligent about .topo files and thus the lack of scan files,
<li>- checking the date is in the recent past etc.
</details>
<h3>Surveys data entry documentation</h3>
<dl>
<dt>Write code to automatically extract ref info about wallets from tunnel xml files

29
handbook/survey/newwallet.html
View File

@ -56,6 +56,12 @@ and fill in the line (e.g. 2018#22) for your wallet
<li>Now, if you have not done it immediately after you left the cave,
photograph all the pages of survey notes with your phone.
Get one or more of the people also on the trip to do this too.
<li>Now upload the scanned notes using the <a href="/scanupload/2021:01">Upload Scans</a> form.
Click on the wallet name to the right of the central name on the form
until you are centred on the wallet id of the plastic wallet you have put the notes into.
You can use either your own phone or a laptop connected to the potato hut scanner (instructions below). All you need is the 'expo' password.
<li>Now you will go on to do the data entry to make a survex file, but you will come back to these instructions when you
need to upload the hand-drawn sketches which you will do on top of the survex printed graphical centrelines.
</ol>
<p>* As people spend longer and longer at top camp, we may establish
@ -86,7 +92,9 @@ the <a href="/survey_scans/">list of all online wallets</a> and have a look at a
in your cave in, e.g. here is the data for <a href="/survexfile/204">cave 204</a>: the wallet identifier is
in the right-most column titles "Scans". If you are doing an entirely new cave, then this won't exist yet but it
will be where your new discovery is eventually published.
<p>As well as following through the links on those pages, have a look at the <a href="/tunneldata/">drawings files page</a> which lists all the scanned notes, plan and elevation scans in the each wallet ("Scans folder" column).
<p>As well as following through the links on those pages, have a look at the
<a href="/tunneldata/">drawings files page</a> which lists all the scanned notes,
plan and elevation scans in the each wallet ("Scans folder" column).
<h3 id="onlinew">Scan the notes into the online wallet</h3>
<style>figure {font-weight: bold; font-size: small; font-family: sans-serif;font-variant-caps: small-caps;}</style>
@ -134,21 +142,22 @@ scanner in the potato hut to make better copies. Scan to JPEG format as .jpg fil
They are permanently referred to by the tunnel/therion/troggle system !]
<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 in Cambridge.
in the file bucket "expofiles" on the expo server machine (formerly in Cambridge, but now in Germany).
<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 2018#19 it is:
<pre>
/home/expo/expofiles/surveyscans/2018/2018#19/
</pre>
and tell someone nerdy when you have finished and they will
ensure that it is copied to the expo server.
but then please also upload them using the <a href="/scanupload/2021:01">Upload Scans</a> form.
<code>
If you want to do this yourself on your own laptop then be aware that
since 2018 this is all more involved because of the enforced security on our new server. First you need a <a href="../computing/basiclaptop.html">minimal laptop setup</a> and then you will need to
learn how to use Filezilla
- as <a href="../computing/uploading.html">documented for uploading your expo photographs</a>. 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 <em>only copy files to the server that you created yourself and which live in your own wallet folder</em>
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
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>.
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 you need a
<a href="../computing/basiclaptop.html">minimal laptop setup</a>
- as <a href="../computing/uploading.html">documented for 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.

15
handbook/survey/onlinewallet.html
View File

@ -24,8 +24,12 @@ anything you like. Typically we have the scanned pages called notes1.jpg, notes2
or PDF (very hard to re-use elsewhere). Set the scanner at 300 dpi and adjust the contrast of the image after scanning
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) upload the entire online wallet to the expo server in Cambridge
<span style="font-family:monospace">expo.survex.com</span>. This is so that these precious files are backed-up as soon as possible. (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>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.
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>.)
<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">
@ -38,7 +42,7 @@ Creating a new cave...</a> for the full list of steps. The <em><span style="font
</ul>
<p>but the <em><span style="font-family:monospace">contents.json</span></em> file has another,completely different function:
it may be the <b>only online record</b> that connects the wallet number to the cave identifier. So if a future cave surveyor deperately needs
it may be the <b>only online record</b> that connects the wallet number to the cave identifier. So if a future cave surveyor desperately needs
to consult the original cave survey, it can be done by, e.g. <br>
<span style="font-family:monospace">
grep -rl "2018-dm-07" expofiles/surveyscans
@ -51,7 +55,8 @@ have a different Austrian Kataster number issued for it in due course).
*ref 2018#06
; the #number is on the clear pocket containing the original notes
</pre>
But sometime in mid-Expo 2015 everyone stopped using the survex template file and so this information was not recorded since then. This will be fixed by hand-editing in due course.
But sometime in mid-Expo 2015 everyone stopped using the survex template file and copied from a friend instead,
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.)
<p>Troggle produces very useful auto-generated reports of the status of the wallets and the survex files
@ -160,7 +165,7 @@ new trip surveys.
<span style="font-family:monospace; size=x-small; background-color: lightgray">walletindex.html</span> in each online wallet subfolder and also a
<span style="font-family:monospace; size=x-small; background-color: lightgray">walletindex.html</span> in the <span style="font-family:monospace; size=x-small; background-color: lightgray">/2018/</span> folder.
<p>This script works fine on Linux (Debian, Xubuntu, etc.) and also now works fine in the <a href="https://www.howtogeek.com/249966/how-to-install-and-use-the-linux-bash-shell-on-windows-10/">Windows 10 bash system</a>.
<p>This python3 script works fine on Linux (Debian, Xubuntu, etc.) and also now works fine in the <a href="https://www.howtogeek.com/249966/how-to-install-and-use-the-linux-bash-shell-on-windows-10/">Windows 10 bash system</a>.
<h3>Maintaining the online wallets</h3>
<p>Ideally the cavers who are scanning their notes and typing in the survey data will also be updating the