diff --git a/handbook/computing/upload-simple.html b/handbook/computing/upload-simple.html new file mode 100644 index 000000000..ea04607d3 --- /dev/null +++ b/handbook/computing/upload-simple.html @@ -0,0 +1,65 @@ + +
+ +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. + +
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. + +
Your own photo folder is named like this: YourName. It is a +simplified, anglicized 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. + +
(You cannot create sub-folders. All your photos go into the same folder.) + +
Please, 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 use lower-case for all the filenames of photogrpahs. + +
Please don't upload lots of near-duplicate photos: cull them first to just the good ones. + +
Complete beginners can also put all their files into their own folder within the folder +/home/expo/expofiles/uploads/ on the expo laptop and +ask a more experienced user to upload them. + +
If you want to use your photos in a blog (see +Using uploaded photos in blogs) tell an experienced user +which and they will copy a lower-resolution version to the appropriate place. + +
That's it, you're done. + +
If your needs are simple, then use the simple online form procedure.
If you are a beginner you can use the initial simple method below (using /uploads/ ) +
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.
If you are looking for how to upload a GPS track, those instructions have been moved to here.
Please use lower-case for all filenames. -
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. +
Please read the instructions for your folder name and the filenames of the photos in the +simple online form procedure.
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. -
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: /YourName/ and put your files into that folder. "YourName" should have no spaces, hyphens or underline characters (CamelCase). -
Complete beginners should always put all their files into their own folder within the folder /home/expo/expofiles/uploads/ on the expo laptop and ask an experienced user to move them to the right place later. - -
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. - -
That's it, you're done. - -
The UK Caving blog 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 @@ -73,14 +57,17 @@ your name is standardised across the website that you should use some capital letters. Absolutely everywhere else you should use only lower-case letters, no spaces, and hyphens (not underlines) when creating filenames, folder names or variable names of any sort.
-Use the year that the photo was taken or the GPStrack logged.
+Use the year that the photo was taken or the GPS track logged.Always learn how to use the system first on the expo laptop before trying to do it with your own machine. -
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 expo laptop after copying as we can do that clean-up at the end of expo. In fact don't delete them from /uploads/ on the expo laptop. +
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 expo laptop after copying as we can do that clean-up at the end of expo. In +fact don't delete them from /uploads/ on the expo laptop, moved them to a sub-folder called "already_uploaded" or somesuch in the same folder -
The expo server has a big section under 'home/expo/expofiles/' that is not under version control. This is dangerous as there is no backup. If you overwrite some important files with holiday snaps then we are in big trouble. +
The expo server has a big section under 'home/expo/expofiles/' that is not under version control. This is dangerous as +there is no backup. If you overwrite some important files with holiday snaps then we are in big trouble.
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.
Note that uploading photos does not automatically update the view -at http://expo.survex.com/photos/ 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..
+at http://expo.survex.com/photos/ 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.To use your own laptop on expo, or after you return from expo, you need need to use FTP. So become an experienced user first.
You will need to know the expo password but none of this will work until you have also done the key-pair setup procedure.
@@ -137,11 +127,18 @@ at http://expo.survex.com/photos/ iPhones 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. +
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. -
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.) +
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.) -
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. +
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.
As well as looking through the other plastic wallets in this year's lever-arch binder, have a look online at the list of all online wallets and have a look at all the folders referred to in your cave in, e.g. here is the data for cave 204: 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.
As well as following through the links on those pages, have a look at the -drawings files page which lists all the scanned notes, -plan and elevation scans in the each wallet ("Scans folder" column). +drawings files page 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).
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:
-/expofiles/surveyscans/2018/2018#22/ +/expofiles/surveyscans/2018/2018#19/@@ -148,35 +150,50 @@ icon from the vertical menu of icons which you get by clicking on
[ Normal people should skip this,
+
[ Normal people should skip this, but nerds need to look here -for the online wallet maintenance process ]. +to understand the online wallet maintenance process ].
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. -
Name the scanned pages "notes-1.jpg, or notes-cavepassagename.jpg" 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. -
[ Note to maintainers: do not rename these files even if they have been created with the wrong names. +
Name the scanned pages "notes-1.jpg, or notes-cavepassagename.jpg" 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. +
[ 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 !] +
Upload the scanned files from any computer with internet access using the Upload Scans form. +You will need to login as user 'expo' with the usual {cavy:beery} password. + + +
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.
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 +2018#19 it was:
/home/expo/expofiles/surveyscans/2018/2018#19/-but then please also upload them using the Upload Scans form. +but then please also upload them to the same wallet on the server. This is what that wallet looks like using +the Upload Scans form. +
If you want to use your own laptop you need a
+ If you want to use your own laptop for complex rearrangements of files in the server's online wallets you need a
minimal laptop setup
-- as documented for uploading your expo photographs.
+- as documented for complex uploading your expo photographs.
If you make a mistake and need to rename a file then be aware that this is much, much easier using
the expo laptop. 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 (expo-relevant instructions here).
+But you will need to learn how to use Filezilla (expo-relevant instructions here)
+to move and rearrange things on the server to match.
Please only copy files to the server that you created yourself and which live in your own wallet folder
-
If you used a PDA instead of making notes on paper, you need to store your .topo files in the right place.