Add new lines for new people, with the right number of columns. -
This process is tedious and error-prone and ripe for improvement especially as expo proceeds and youhave many more names to add. Adding a list of people from the bier book and their aliases (the name in brackets) would be a lot better, but some way to make sure that names match with previous years would be good. +
This process is tedious and error-prone and ripe for improvement especially as expo proceeds and you have many more names to add. Adding a list of people from the bier book and their aliases (the name in brackets) would be a lot better, but some way to make sure that names match with previous years would be good.
Contrary to what you might expect we find that it is much more reliable to edit this using a text editor rather than a spreadsheet program. @@ -33,23 +33,19 @@ Contrary to what you might expect we find that it is much more reliable to edit
The nerd needs to do this:
This is how you login and run the script:
ssh expo@expo.survex.com
-cd folk
+cd expoweb/folk
+chmod +w index.htm
python ../scripts/make-folklist.py <folk.csv >index.htm
If there are no errors, you will just see this on your ssh session: - -
- -
And you will see the result online at http://expo.survex.com/folk/. +
If there are no errors, you will just see the prompt reappear in your ssh session +and you will see the result online at http://expo.survex.com/folk/.
It is recommended that the nerd does this locally on their own laptop first. It does not need to be an expo laptop, even a Windows 10 laptop is fine if the script is run in a WSL terminal. The only software you need to install is the default python package.
Then once created, you can edit it the same way that you edit a pre-existing page.
You link your new page into the handbook by editing another page in which you want to create a link. For example if you have created a new page describing your wonderful new sleeping bag/hammock technique, then you might want to add a link in to Expo Personal Gear List. Unfortunately the "create link" icon (a picture of 3 links of a chain) is disabled in the on-line editor so you would have to click on the HTML icon and insert the link by editing the HTML directly. +
You link your new page into the handbook by editing another page in which you want to create a link. For example if you have created a new page describing your wonderful new sleeping bag/hammock technique, then you might want to add a link in to Expo Personal Gear List. Unfortunately the "create link" icon (a picture of 3 links of a chain) is disabled in the on-line editor so you would have to click on the HTML icon and insert the link by editing the HTML directly using an <a href="filename"> tag.
'Edit This Page' edits the file served on the web but it does not update the file in the version control diff --git a/handbook/computing/manual.html b/handbook/computing/manual.html index 6bd5f84ef..862c90551 100644 --- a/handbook/computing/manual.html +++ b/handbook/computing/manual.html @@ -53,10 +53,10 @@ processes that a maintainer would want to do.
We use a distributed revision control system (git, and formerly mercurial) for all the important data. (Note that we just use git: not GitHub, not GitLab, just git.) This means that many people can edit and merge their changes with the expo -server in Cambridge at the same time: including people still on expo in the Tatty Hut +server in Cambridge at the same time: inlcuding people still on expo in the Tatty Hut and those who have returned to the UK. Also anyone who is up to date can take their laptop somewhere and enter data even if they have no internet access, -and the updates can be merged when they get back to civilization. +and the updates will be merged when they get back to civilization.
In principle, survey notes can be typed into a laptop up on the plateau which would then get synchronised when it next gets internet access. @@ -65,9 +65,8 @@ then get synchronised when it next gets internet access. do not get modified, so they are kept as a plain directory of files 'expofiles'. The same goes for holiday photographs and GPS logs.
-From 2012-2019 we used mercurial (aka 'hg'), but completed the move to git -before the 2020 expo.
- +In 2019 we had half our version-controlled repositories under mercurial and half under git. +The intention is to move entirely to git before the 2020 expo.
The site has been split into four parts:
We have migrated three of these to git but loser is still mercurial for a few more days. +
We have migrated two of these to git but the other two still use mercurial.
The cave data and online publishing system (aka "the website") is now large and complicated. @@ -15,6 +22,7 @@ This page is the overview. The online systems manuals are split into these secti
We have an Overview Presentation (many parts out of date) +
We have an Overview Presentation (2015: many parts out of date) on how the cave data, handbook and public website are constructed and managed. It contains material which will be merged into these online manuals. diff --git a/handbook/computing/qstart-git.html b/handbook/computing/qstart-git.html index eb3b4b727..2dbca1bdd 100644 --- a/handbook/computing/qstart-git.html +++ b/handbook/computing/qstart-git.html @@ -22,7 +22,7 @@ have key-pair setup already set up before any of
Open a terminal in a new directory, e.g. /tmp/experiments/ in which you want to create the repo. It will automatically create a folder with the repo name e.g.'troggle' in that directory.
The repositories are browseable at http://expo.survex.com/repositories/
-git commit (you can specify filenames to be specific)
-The first time you do this on a Windows machine it will probably not work as it does not recognise the server key exchange. +
The first time you do this on a Windows machineit will probably not work as it does not recognise the server key echnage. Fix this by running putty (downloading it from https://www.chiark.greenend.org.uk/~sgtatham/putty/), and connecting to the server 'expo@expo.survex.com' (on port 22). Confirm that this is the right server. If you succeed in getting a shell prompt then ssh connection are working and git should be able to clone the repo, and send changes back.
diff --git a/handbook/computing/regular.html b/handbook/computing/regular.html index 51521af15..94effa551 100644 --- a/handbook/computing/regular.html +++ b/handbook/computing/regular.html @@ -9,24 +9,32 @@This page is a checklist who are helping the survey data reduction process during and after expo. +
This page is a checklist who are helping the survey data reduction process during and after expo. +
All of these things should be checked every week for a couple of months after expo, and then every couple of months. Then again when preparing for the new expo in May. +
A user-editable online to-do list for data management is now part of the expo online systems. Review this regularly to see what needs doing, and please *delete* jobs that have been done.
Run dos2unix to convert any uploaded Windows text files to the format expected by our software. e.g. -
cd expofiles/surveyscans
+2020#00
+ The #00 wallet directory (e.g. /2020/2020#00/ ) contains orphan files that have been found on the expo laptop in odd places, or have been scanned from bits of notebook found inside other documents. Keep an eye on it and re-file the contents as you discover what they are.
+
EOL
+Run dos2unix to convert any uploaded Windows text files to the format expected by our software. e.g.
cd expofiles/surveyscans
find . -not -type d -exec file "{}" ";" | grep CRLF >crlf.txt
-`awk -F: '// {print "dos2unix \"" $1 "\""}' crlf.txt`
-
-Also a good idea to run on all of expofiles once every few years as many GPX
+`awk -F: '// {print "dos2unix \"" $1 "\""}' crlf.txt`
Also a good idea to run on all of expofiles once every few years as many GPX exports +from phones are a bit variable in how they do EOL characters.
During prep. for the new expo the folklist will be updated with all the new people expected, but after expo the mugshots and blurb text for the new people will need to be added. See folkupdate for the procedure. +
Click twice on a sub-heading to reveal the individual to-do items. Click again to hide.
+If a heading is in italics, then there are hidden items.
+
Click on the main "How this works" heading to toggle reveal/hide everything. +
Printing this page uses a much smaller font. Complain to the nerd list if you don't like this behaviour. + +
Edit this page by clicking on the big blue button. It uses the same "Edit this page" function that you may have used before. Just be careful not to touch the code at the top of the page. + +
We are working on a more capable and easier-to-use system which will mimic how GitHub Issues do this sort of thing. + + +
To see the "handbook updating" and "troggle/system" to-do lists, go to the other TO-DO list + +
+import other 258 files: + pawpaw + notthebeast +To draw up!!! + +258/whatwouldyourmothersay.svx needs drawing up from notes in 2016#27 (we missed it out) ++
264/doublescoop from notes in 2016#34
+nothingtosee3: 264/wallet 2017#52 needs printing out and drawing up
+
+dogendseries: 2017#42 notesplan
+
+Need to find the snow symbol
+How to make the jar file work again (and then update all copies in svn)
+
+nothingtosee --> imported
+sloppyseconds2 --> imported
+naturecalls --> imported
+
+created 264post2017b
+created sloppysecondspart
+
+Sync 2016#19 snowhole back to expo computer (as well as whole of 2017)
+
+Rescan notes for 2017#50 (cropped)
+
+queries:
+2017#12. 264/nothingtosee ULSA distoX. Length calibration -0.05 ('tape too long'). Is that right?
+2017#15 not_the_best elevation drawn, but not beastsideleads? Plans for bth
+
+======================
+To get the files here:
+rsync -av expo@expo.survex.com:expofiles/surveyscans/2017/ /home/julian/data/expodata/expofiles/surveyscans/2017/
+To copy a rendered survey up:
+scp /home/julian/data/expodata/tunneldata/2017-09-28incomplete1.png expo@expo.survex.com:expofiles/surveys/
+======================
+
+tunnocks high level
+not_the_beast 2017#15
+rigormortis 2017#43
+
++mastercave 2017#16 drawnin +gryke of the earth 2017#17 +loserlido 2017#44 +snakecharmer 2017#06 +slackerstidyup 2017#05 background +raisinhell 2017#04 +therestherub 2017#02 drawn +snakecharmer2 2017#31 +snakecharmer3 2017#32 +hipsterreturn 2017#35 +lowersnakebite 2017#40 +beckoningsilence 2017#41 drawnin +bahama 2017#45 ++
+the_mendips 2017#18 !!!Missing folder!!! no drawing +mysterious_schlag 2017#19 is a pitch in cathedralchasm +pointless_dig 2017#20 +naturecalls 2017#47 not tied in from bottom of Ash's pitch in cathedral chasm bit (have faked it) ++
+sloppyseconds1 2017#01 +galactica 2017#03 +sloppyseconds2 2017#07 +sloppyseconds 2017#42 dogendseries +secondhand 2017#49 + +missing bit 2017#52 +nothingtosee 2017#12 +nothing2see ??? lost wallet #24 centreline typed +nothingtosee3 2017#52 recovered + +hilti_nts_bones_pitch 2017#21 -linked in now +hilti_nts_near_bats 2017#22 -linked in now +hilti_nts_near_start 2017#23 + +nothingtosee 2017#39 ++
+prospecting 2017#08 +prospecting 2017#09 +prospecting 2017#10 +prospecting 2017#11 +prospecting 2017#24 !!! not nothing2see as documented +watermelon 2017#28 +kitten-helicopter 2017#33 +prospecting 2017#34 ++
+fishface 2017#38 +fishface 2017#46 +windytube 2017#37 +icytube 2017#48 +fgh 2017#50 +blitzen 2017#53 + ++
+gsh entrance 2017#25 +gsh 2017#26 +coulda 2017#27 +gsh 2017#29 +riftpiece 2017#30 ++
+gardeningshoots 2017#13 +thirdentrance 2017#14 +badforecast 2017#51 ++
Click on a sub-heading to reveal the individual to-do items. Click again to hide.
+
Click twice on a sub-heading to reveal the individual to-do items. Click again to hide.
If a heading is in italics, then there are hidden items.
Click on the main "How this works" heading to toggle reveal/hide everything.
Printing this page uses a much smaller font. Complain to the nerd list if you don't like this behaviour.
Edit this page by clicking on the big blue button. It uses the same "Edit this page" function that you may have used before. Just be careful not to touch the code at the top and bottom of the page. -
We are working on a more capable and easier-to-use system (see x-todo.html) which will mimic how GitHub Issues do this sort of thing. +
We are working on a more capable and easier-to-use system which will mimic how GitHub Issues do this sort of thing. +
To see the "data maintenance" and "survey data-entry" to-do lists, go to the other TO-DO list
-tightyorkshireman - -person size phreatic tube, left passage emerges at pitch head, right passage becomes too tight. - -rabbitwarrens -Sandy crabwalk turning into a tube parallel to main passage connecting to ein und zwanzig - -noserock2 -Pitch dropped round the corner from the pitch in noserock. Lots of -break-down and pitch ended in a choked chamber floor. - -northhole -;Small grotty hole in the floor of eis koek aven, which connects through to the nearby large hole down to a circular ice floor. - -northhole2 -; continuing north from northhole, there is a series of freeclimbable avens going upward, the final survey station is at an awkward but not impassable squeeze. A handline would be very helpful in coming back down. There are also two connections to the frozen north, one is a tube at head height and the other is a small crawl at the start of the choss slope leading to the first aven climb. - -icecockLC1 -;linking icecock aven to the ice pit in north hole. - -icecock3 -;small sandy floored tube connecting the icecock bypass to the northhole passage - -gosserwager2 -linking the bottom of the pitch (name?) to the rift above gosser wager and the pitch down to it, continuing to a boulder choke. - -gosserwager3 -Rift passage heading South, with a 15m pitch at head. Clean walls, rubble floor. Leads to short down climb before more rift and another pitch series. - -frozennorth -climb up between wall and block, aided by two bolts, to enter ice lake -chamber. Ahead is a large aven with snow slope entering. Just before -this is a small passage on the right. Climb up into this and follow -ice inlet until breaks out into large aven and trench area at station -12. To the south is/was unexplored, but later connected to rest of -cave. To left is small sanding tube to view into same trench system. - -frozennorth4 -left juction in frozennorth where there are sandy crawls, comes out on -a precarious ledge above a big hole. Traversing around this leads to a -medium sized sandy crawl sloping downwards to a huge chamber with a -pitch suspected to be the north end of lead 93B from the start of -expo2015 in turtlehead. - -frozennorth3: -A rift passage that loops round and links 2 chambers, with possible leads at the end at station 5. - -darkartsiv: -continuing A lead at south end of dark arts, went in then surveyed out but didn't make it all the way to connect up the surveys. - -cathedralLC2: -Linking avalancheexperience to cathedralchasm without having to use the dodgy data in chamber90b survey - -cathedralchasm: -really fucking huge chamber with many good leads. turns out it was already surveyed as chamber90b be Julian. - -catherdralchasm2 -Coming fdrom Cathedral Kazam a wet traverse across a pitch David -dropped a setter down. Passage continues to chamber with a loop coming -off to the left up and emerging at top of chamber en route. from -cahmber a rift goes off up right with main passgae continueing -straight. Also a small lead to left leads round to two small 5m pitchs -containg crystal formations. A traverse continues on with another -pitch. Taking the main route from the chamber a sandy passage leads -past three bat skeletons before becoming a crawl, eventually reaching -a junction. the larger passge to the left links back to the passge -near trident junction/ gear dump. This bypass is now the recommended -wat to reach cathedral kazam. - -bipedal: -heading south out of amalgamation you arrive at a large long hole in the floor. Partial completion of traverse over hole, plus exploratin of two small side leads. Left over small rock bridge ends in blind pot. Right hand small passage soon becomes too tight. - -bipedalpassage5 -short pitch down to large aven chamber with vedose rift in floorway. - -hiltigalactica -After dropping initial pitch (Deep Space 9) approx 25m in hilt-a-plenty. -Long rocky chamber from bottom of pitch to next unexplored pitch. -Slope near end up left ends after short distance. Small side passage near -start on right continues to small sandy chamber with several leads. -From here archway leads onto bouldery ledge in side of very large chamber -to be explored. - --
-Cave: Balcony (Far Side to Deep Balcony) - -Trident is a four way junction- take the left fork to an alcove on the left with an obscure mud floored crawl. This is followed for 10m, improving to walking height. Follow past two bat skeletons then right turn to another bat; continue ~20m. A mud floored junction, turn right to the head of a traverse then pitch after 10m. Straight on would have led you to a noteworthy drippy pitch (Kathedral Chasm). - -----Honeycomb---- -The traverse to pitch is the beginning of Honeycomb (50m of pitches). This swings to a window, following the rope to a ledge 10m above the floor. From here there's a narrow popcorn-lined climb to the head of a 7m pitch. At the bottom, climb the slope and follow obvious continuation (draught) to the head of 12m pitch. This pitch lands at the top of Hangman (p30), on account of the huge hanging boulder. (The near side of the boulder descends to the way on to the top of Mongol Rally, whereas the far side of the boulder is rigged to swing into a window half way down, Myopia. This is a passage heading north, traversing around a large pit, leading to another pitch which could be traversed around, ?a.) - -----Nature Calls---- -At the bottom, follow the traverse round to a mudslope. At the top of the mudslope there is an awkward crawl for 10m, soon improves to walking. Follow this passage for 30m. There's a p5, follow the rope to the head of the Mongol Rally (p200). - -----Mongol Rally and Little Boy---- -Descending this rope lands into a roomy boulder chamber. Walking down the slope between boulders (distinguished path in the mud), leads to a blind pit and big aven. A right turn takes you to stooping height passage, for 50m to the head of Little Boy pitch (20m). There is a significant draught here; follow this. The camp is currently at the base of the pitch (August 2018). - -----Water collection---- -There are three exits to the chamber. -1. a short crawl -2. a climb down on the far side. -Both lead to the same place and draught. - -Leave on the far side of the chamber, via a climb down and turn right, climbing down a boulder into pleasent walking passage, very straight and heading north. The floor is soft wet mud. After ~100m a stream trench enters on the right, followed round a corner into a drippy aven. Collect water here, scoop (mug) advisable. - - - - -(Currently unconnected from Grand Prix) - -----One direction---- -A little further on from the right turn towards the water cllection, is a muddy ledge on the left hand side (1m from ground). Low crawl continues for 100m in straight line, over three puddles. Stal, but largely unnoteworthy. Ends at the Tsection into clean washed tall rift with sounds of water. Downhill leads to promising a lead, in clean washed rock, sketchy c6, requires rope, heads into rifty stuff. Uphill, includes split (meander) to scoopy loopy junction. - -----Scoopy Loopy---- -Scoop it until you loop it. Junction has small a lead on right hand wall, to sound of wet rift. Obvious way on cuts left, walking passage heading upwards until low crawl into breakdown chamber. A climb on the right links into Grand Prix. - -----Nothing to do with you traverse---- (ntdwyt) -The passage towards the water collection is followed, beyond the turning for water. This leads to a pitch down (Indy Rally) or a traverse left. The traverse left goes ~10m, before muddy walking passage ~30m until it chokes. - -----Little boy beneath the boulders---- -A short 2m climb through a boulder choke leads to break down chamber directly below grand prix. Qmc at station 8, p10, probably drops level with station 6 (lbbeneaththeboulders). - -----Little boy bolt climbs---- -From the grand prix, left from little boy beneath the boulders is a large hanging boulder. Traverse along massive choked boulder on left hand side of grand prix. Not derigged. Climbs up steep mud slope into rift that shortly forks (station 4). P15 qmc down from here, leads probably to lbbeneaththeboulders. Sketchy rift climb qmc from here, dispute about seeing a human sized passage beyond here. - -+