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

Photo upload docm updated

Browse Source
This commit is contained in:
Philip Sargent 2022-03-13 16:43:02 +00:00
parent 89d3468837
commit 0feb58a639
3 changed files with 124 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
handbook/computing/upload-simple.html Normal file
View File

@ -0,0 +1,65 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>CUCC Expedition Handbook: Uploading files/photos</title>
<link rel="stylesheet" type="text/css" href="../../css/main2.css" />
</head>
<body>
<h2 id="tophead">CUCC Expedition Handbook</h2>
<h1>Uploading Photos (simple)</h1>
<p>We have an online form you can use from any web browser to upload a load of files
to your folder on the server for the current year of the expedition.
<ul>
<li>Use the <a href="/photoupload/">Upload Photos</a> form
</ul>
You will need to login as user 'expo' with the usual {cavy:beery} password.
<p>This is restricted to upload photos into the server's photo area for just the current year's expedition. There is a sub-form on the
page for you to create a folder if there is not already one with your name on it.
<p>Your own photo folder is named like this: <var>YourName</var>. It is a
<a href="https://www.w3.org/International/questions/qa-personal-names">simplified, anglicized</a> version of your name.
It should have no spaces, accents.
hyphens, apostrophes or underline characters.
When creating a new folder using the form, the form will prevent you using nonalphabetic characters.
<p>(You cannot create sub-folders. All your photos go into the same folder.)
<p>Please, please rename the filenames of the photos intelligently to e.g.
"<var>big-hole-near-path-to-fgh.jpg</var>", or "<var>2018-ad-07-entrance3.jpg</var>"
rather than "<var>DSC31415926.jpg</var>" or whatever your camera app produces.
<p>Please use lower-case for all the filenames of photogrpahs.
<p>Please don't upload lots of near-duplicate photos: cull them first to just the good ones.
<h2>Simple instructions</h2>
<ol>
<li>If you only have a photo or two just email or message them to someone who knows how to do it. <br>
If you are doing more than a few photos, email will be clunky, so do this:
<li>Copy the photo files from your phone to any laptop using a USB cable.<br>
See <a href="#android">phone app</a> if you do not know how to copy files from your phone.
<li>Rename the filenames of the photos to something descriptive (see para above).
<li>After copying your files to a laptop, use the the <a href="/photoupload/">Upload Photos</a> form to upload them.
</ol>
<p><b>Complete beginners</b> can also put all their files into their own folder within the folder
<var>/home/expo/expofiles/uploads/</var> on the <a href="../computer.html"><i>expo laptop</i></a> and
ask a more experienced user to upload them.
<h3>Blog photos</h3>
<p>If you want to use your photos in a blog (see
<a href="uploading.html#blog">Using uploaded photos in blogs</a>) tell an experienced user
which and they will copy a lower-resolution version to the appropriate place.
<p>That's it, you're done.
<hr />
Go back to <a href="../survey/newwallet.html">Creating a new survey wallet</a><br>
Go back to <a href="uploading.html">Uploading Photos (complex)</a>
<hr />
</body>
</html>

57
handbook/computing/uploading.html
View File

@ -6,7 +6,10 @@
</head>
<body>
<h2 id="tophead">CUCC Expedition Handbook</h2>
<h1>Uploading Photos</h1>
<h1>Uploading Photos (complex) </h1>
<h3>Simple upload</h3>
<p>If your needs are simple, then use the <a href="upload-simple.html">simple online form</a> procedure.
<h2>The end-result you are trying to achieve</h2>
What you are trying to do is to get your happy holiday snaps appear <i>properly indexed</i> with all the others from the previous decades of expo history. You can see them all here: <br /> <a
@ -14,38 +17,19 @@ href="http://expo.survex.com/photos/">http://expo.survex.com/photos/</a><br />
which is the end result. But all you have to do is to upload the photos to the right place.
A hidden script does the hard work to make it all look nice after the upload.
<p>If you are a beginner you can use the initial simple method below (using /uploads/ )
<p>If you are a beginner you can use the initial simple method below (see above)
for the photos you have taken of cave entrances for cave survey and prospecting purposes.
<p>If you are looking for how to upload a GPS track, those instructions have <a href="gpxupload.html">been moved to here</a>.
<h3>Names for your photo files and folders</h3>
<p>Please use lower-case for all filenames.
<p>Please
rename the filenames of the photos intelligently to e.g. "big-hole-near-path-to-fgh.jpg", or
"2018-ad-07-entrance3.jpg" rather than "DSC31415926.jpg" or whatever your camera app produces. Please explain by email to an admin/nerd what you have done, where you have put them and how you have renamed files.
<p> Please read the instructions for your folder name and the filenames of the photos in the
<a href="upload-simple.html">simple online form</a> procedure.
<p>Please don't upload lots of near-duplicate photos: cull them first to just the good ones. We don't want any that are out of focus either.
<p>When copying many files put them into a new folder which identifies you personally.
When you copy the files create your own folder with your name like this: <span style="font-family: monospace">/YourName/</span> and put your files into that folder. "YourName" should have no spaces, hyphens or underline characters (CamelCase).
<h2>Simple instructions</h2>
<ol>
<li>If you only have a photo or two just email or message them to someone who knows how to do it. <br>
If you are doing more than a few photos, email will be clunky, so do this:
<li>Copy the photo files from your phone to the <i>expo laptop</i> in the tatty hut using a USB cable.<br> See <a href="#android">phone app</a> if you do not know how to copy files from your phone.
<li>Rename the filenames of the photos to something descriptive (see para above).
<li>After copying your files to the <i>expo laptop</i> into the /uploads/ folder tell a nerd that you have done it.
</ol>
<p><b>Complete beginners</b> should always put all their files into their own folder within the folder <b>/home/expo/expofiles/uploads/</b> on the <a href="../computer.html"><i>expo laptop</i></a> and ask an experienced user to move them to the right place later.
<p>If you want to use your photos in a blog (see below) tell an experienced user which and they will copy a lower-resolution version to the appropriate place.
<p>That's it, you're done.
<h2>Using uploaded photos in blogs</h2>
<h2 id="blog">Using uploaded photos in blogs</h2>
<p>The <a href="https://ukcaving.com/board/index.php?topic=25195.msg310908#msg310908">UK Caving blog</a> requires that
photos in it are actually hosted elsewhere. This needs to be a permanent place so
that the blogs can be read in years to come. Imgur, Flikr or Instagram are OK though not ideal (expo has its own Instagram account) but
@ -78,9 +62,12 @@ Use the year that the photo was taken or the GPStrack logged.</p>
<h3 id="init">Uploading files from the <i>expo laptop</i></h3>
<p>Always learn how to <i>use</i> the system first on the <i>expo laptop</i> before trying to do it with your own machine.
<p>OK the files have been put into the correct place on the laptop by an experienced user and now you need to copy them to the server. Don't worry about deleting them from the <i>expo laptop</i> after copying as we can do that clean-up at the end of expo. In fact <i>don't</i> delete them from /uploads/ on the <i>expo laptop</i>.
<p>OK the files have been put into the correct place on the laptop by an experienced user and now you need to copy them to the
server. Don't worry about deleting them from the <i>expo laptop</i> after copying as we can do that clean-up at the end of expo. In
fact <i>don't</i> delete them from /uploads/ on the <i>expo laptop</i>, moved them to a sub-folder called "already_uploaded" or somesuch in the same folder
<p>The expo server has a big section under 'home/expo/expofiles/' that is <b>not under version control</b>. This is dangerous as there is no backup. If you overwrite some important files with holiday snaps then we are in big trouble.
<p>The expo server has a big section under 'home/expo/expofiles/' that is <b>not under version control</b>. This is dangerous as
there is no backup. If you overwrite some important files with holiday snaps then we are in big trouble.
<p>This is where we store big files that we don't want to keep multiple versions of which is why it is not under verson control.
@ -121,7 +108,9 @@ and then click on the "Connect" button at the bottom of the sub-window.
<h3>Automated magic</h3>
<p>Note that uploading photos does not automatically update the view
at <a href="http://expo.survex.com/photos/">http://expo.survex.com/photos/</a> immediately. An update script needs to be run. This should run automatically once/day around midnight UTC (2017 and earlier) or a couple of minutes after you do the upload to the right place (2018 if Wookey gets this sorted out in time) but may be broken. Prod a web admin if nothing is updated by the next morning..</p>
at <a href="http://expo.survex.com/photos/">http://expo.survex.com/photos/</a> immediately. An update script needs to be run. This
should run automatically once/day around midnight UTC (2017 and earlier) or a couple of minutes after you do the upload to the right
place (2023 maybe.. if Wookey gets this sorted out in time) but may be broken. Prod a web admin to make this happen.</p>
<h2>Expert instructions</h2>
@ -129,6 +118,7 @@ at <a href="http://expo.survex.com/photos/">http://expo.survex.com/photos/</a> i
<h2 id="morecomplex">Using your own laptop</h2>
<p>To use your own laptop on expo, or after you return from expo, you need need to use FTP. So become an <a href="#experienced">experienced user</a> first.
<p>You will need to know the expo password but <em>none of this will work</em> until you have also done the <a href="keyexchange.html">key-pair setup</a> procedure.</p>
@ -137,11 +127,18 @@ at <a href="http://expo.survex.com/photos/">http://expo.survex.com/photos/</a> i
<h2 id="android">Getting photo files from phones</h2>
<p>Phones are set up these daya to share photos via apps such as "Gallery" or "Google Photos" and most people never see the photo files explicitly. However you will need to see them in order to upload them.
<p>Phones are set up these days to share photos via apps such as "Gallery" or "Google Photos" and most people never see the photo
files explicitly. However you will need to see them in order to upload them.
<p>When plugged into a computer using a USB cable most laptops will offer the option to copy files as well as charge the phone. If your phone does this, then answer "yes" when that popup appears. The photos (and probably all your other media) will be copied to the laptop. Where it copies the files depends on your phone and you will have to sit at the laptop to find the folder it has put them into. (Note that some cheap USB cables are "power only" and won't do this with any phone.)
<p>When plugged into a computer using a USB cable most laptops will offer the option to copy files as well as charge the phone. If
your phone does this, then answer "yes" when that popup appears. The photos (and probably all your other media) will be copied to
the laptop. Where it copies the files depends on your phone and you will have to sit at the laptop to find the folder it has put
them into. (Note that some cheap USB cables are "power only" and won't do this with any phone.)
<p>If you use Google Photos or a similar app you can create an online album using the app and share it with your friends. Do this for your caving holiday snaps and cave entrance location photos and share them with an expo nerd who will download them the right place on the server. Be careful that you are sharing the full original resolution of the photos and not some cut-down compressed bastardized "enhanced" version of the photos.
<p>If you use Google Photos or a similar app you can create an online album using the app and share it with your friends. Do this
for your caving holiday snaps and cave entrance location photos and share them with an expo nerd who will download them the right
place on the server. Be careful that you are sharing the full original resolution of the photos and not some cut-down compressed
bastardized "enhanced" version of the photos.
<h2 id="android">Using an FTP app </h2>

45
handbook/survey/newwallet.html
View File

@ -106,16 +106,18 @@ survey books are divided into "Kaninchenh&ouml;hle" (usually referred to as
should also fill in so that people can find your survey again.</p>-->
<h3 id="existing">Check existing online wallets (surveyscans folders)</h3>
<p>As well as looking through the other plastic wallets in this year's lever-arch binder, have a look online at
the <a href="/survey_scans/">list of all online wallets</a> and have a look at all the folders referred to
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="/dwgfiles">drawings files page</a> which lists all the scanned notes,
plan and elevation scans in the each wallet ("Scans folder" column).
<a href="/dwgfiles">drawings files page</a> which lists all the Tunnel and Therion files, and associated with each, the wallets and
their the scanned notes, plan and elevation scans ("Scan files" 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>
<div class="onright">
<figure>
@ -130,7 +132,7 @@ plan and elevation scans in the each wallet ("Scans folder" column).
<p>Each wallet has a corresponding folder in the online system where a record is kept
of what information is in the wallet and where the corresponding survey data is filed:
<pre>
/expofiles/surveyscans/2018/2018#22/
/expofiles/surveyscans/2018/2018#19/
</pre>
@ -148,35 +150,50 @@ icon from the vertical menu of icons which you get by clicking on
</figure>
</div>
<p style="margin-left:20px">[ Normal people should skip this, <br />&nbsp;
<p style="margin-left:20px">[ Normal people should skip this,
but nerds need to look here
for the <a href="onlinewallet.html">online wallet maintenance process</a> ].
to understand the <a href="onlinewallet.html">online wallet maintenance process</a> ].
<p>If your initial backup photos of your notes were poor quality, use the
scanner in the potato hut to make better copies. Scan to JPEG format as .jpg files.
<p>Name the scanned pages "<em>notes-1.jpg</em>, or <em>notes-cavepassagename.jpg</em>" etc. This is important as a script detects whether these files exist
(with names beginning "notes..", "plan.." and "elev..") and if you name them something else it will hassle you unnecessarily.
<p>[ Note to maintainers: do not rename these files even if they have been created with the wrong names.
<p>Name the scanned pages "<em>notes-1.jpg</em>, or <em>notes-cavepassagename.jpg</em>" etc. This is important as a script detects
whether these files exist (with names beginning "notes..", "plan.." and "elev..") and if you name them something else it will hassle
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.
They are permanently referred to by the tunnel/therion/troggle system !]
<h3>Uploading the scanned files to the server</h3>
<ul>
<li>Use the <a href="/scanupload/2022:01">Upload Scans</a> form
</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>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 (formerly in Cambridge, but now in Germany).
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 2018#19 it is:
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:
<pre>
/home/expo/expofiles/surveyscans/2018/2018#19/
</pre>
but then please also upload them using the <a href="/scanupload/2021:01">Upload Scans</a> form.
but then please also upload them to the same wallet on the server. This is what that wallet looks like 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
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>.
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 you need a
<p>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 uploading your expo photographs</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.