From 1d3d0616343578802312c00420895d7fc3e79c50 Mon Sep 17 00:00:00 2001 From: "Philip Sargent (muscogee)" Date: Thu, 20 Feb 2020 15:25:34 +0000 Subject: [PATCH] Fixing logbook parsing glitches --- folk/folk.csv | 2 +- years/1991/log.htm | 6 +++--- years/1995/log.htm | 23 ++++++++++++----------- years/2007/logbook.html | 16 ++++++---------- years/2013/logbook.html | 26 +++++++++++++++----------- years/2014/logbook.html | 17 ++++++++++------- 6 files changed, 47 insertions(+), 43 deletions(-) diff --git a/folk/folk.csv b/folk/folk.csv index 629d63f6a..dff78c2b7 100644 --- a/folk/folk.csv +++ b/folk/folk.csv @@ -67,7 +67,7 @@ Spencer Davey,Davey,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,, Andrew Davidson,Davidson,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,, Nicky Davies,Davies,,,l/nicky.htm,,,1,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, Anthony Day (Dour),Day,,,l/ajday.htm,,,,,,,,,,,,,,,,,,1,1,1,1,1,,1,1,1,1,1,1,1,,1,,1,,1,1,1,1,1,1,,1,, -Julia Day (nee Bradshaw),Day,1,,i/juliab.jpg,,,,,,,,,,,,,,,,,,,,,,,,1,1,1,1,1,-1,1,,1,,1,,-1,-1,-1,-1,-1,-1,,1,, +Julia Day (Julia Bradshaw),Day,1,,i/juliab.jpg,,,,,,,,,,,,,,,,,,,,,,,,1,1,1,1,1,-1,1,,1,,1,,-1,-1,-1,-1,-1,-1,,1,, Edvin Deadman,Deadman,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,1,,1,,,,,,,,, Chris Densham,Densham,,,i/chrisd.jpg,,,,,,,,,,,,1,1,1,,,,,,,1,1,,,,,,,,,,,,,1,,,1,1,1,1,1,1,, Brian Derby,Derby,,,i/bderby.jpg,,,,,,,,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, diff --git a/years/1991/log.htm b/years/1991/log.htm index 505105731..55dfdaa8b 100644 --- a/years/1991/log.htm +++ b/years/1991/log.htm @@ -1,7 +1,7 @@ - + - + 1991: Logbook @@ -509,7 +509,7 @@ manage to avoid it happening again ! Next trip
-16/7/91 | Kaninchenhole - Pushing-surveying trip down Burble|

Andrew, Julian S, Mark M. +16/7/91 | Kaninchenhole - Pushing-surveying trip down Burble| Andrew, Julian S, Mark M.

Had a luverly time scrambling around in a maze of passageways leading off diff --git a/years/1995/log.htm b/years/1995/log.htm index ff37a5b46..208042fda 100644 --- a/years/1995/log.htm +++ b/years/1995/log.htm @@ -1,7 +1,7 @@ - + - + 1995: Logbook @@ -712,7 +712,7 @@ Next trips: Piss Pot /

-1995-07-23 | Journey to Austria | Wook & Andy +1995-07-23 | Journey to Austria | Wook & Andy

Pretty straightforward journey. Got 6pm ferry on Saturday ie not 4.30 in the morning as usual. This means you get empty roads all the way till next @@ -816,7 +816,7 @@ Dunc & eventually ignoring rubs altogether - quality rigging.

-23/7/95 | 161 - France - Black Suspender | JulianH, Dave C +23/7/95 | 161 - France - Black Suspender | JulianH, Dave C, Andrew Atkinson

Holes in floor of Algeria Dave (other), Kate
Rift in floor nr Hobnob passage AndyA, Steve
@@ -908,7 +908,7 @@ go and have another look some time. Scout 9 Dave 8 Kate 8 -AndyA 10 1/2 +Andrew Atkinson 10 1/2 Steve 9 @@ -919,7 +919,7 @@ Next trips: Regurgitation /

-26/7/95 | 161 - France | AndyA, JulianH, Wookey +26/7/95 | 161 - France | Andrew Atkinson, JulianH, Wookey

2 days after the first trip to Death's Door II / Stairway to Hell it was clear that we were imagining the appalling level of squalor that lay beyond @@ -1041,8 +1041,9 @@ caving. Hooray!

Previous trip / Next trip - in 1999 ? -

26/7/95 | 161 - France, surveying Regurgitation | Dave C, Anthony, Goulash +
26/7/95 | 161 - France, surveying Regurgitation | Dave C, Anthony +
Goulash

Kate was slack again! She farmed off some of her surveying to the "mugs" prepared to do it for her. Abseiled to Mississippi, Anthony forgot the rope for the pitch into regurgitation & so prussiked to Algeria. Spent @@ -1060,7 +1061,7 @@ cave. Discovery of Triassic Park (same day) / Next Regurgitation trip (1996) -

1995-07-25 | 161 - Entrance a | Wook & AndyA +
1995-07-25 | 161 - Entrance a | Wook & Andrew Atkinson

Trundled down, intending to go to check out QM above Bungalow. Got sidetracked: @@ -1096,7 +1097,7 @@ but hard to get a clean rock throw.

Next Trip -

1995-07-27 | 161 - Surveying Triassic Park & Photos | Wookey, Anthony, Duncan,
AndyA, Scout, Steve +
1995-07-27 | 161 - Surveying Triassic Park & Photos | Wookey, Anthony, Duncan,
Andrew Atkinson, Scout, Steve

Trundled down to survey all the new stuff & photo it. Andy, Scout & Steve did photos, the rest surveyed. Tedious but effective. Just did @@ -1249,7 +1250,7 @@ Grade 1 in logbook will have to do for now!

T/U 10.5hrs

-1995-07-31 | 161 - Go to find new entrance | Wook & Andy +1995-07-31 | 161 - Go to find new entrance | Wook & Andrew Atkinson

The plan was to prod a few of the QMs down T.P, especially on the R.H side, to see if any popped out of the hill. @@ -1322,7 +1323,7 @@ hour, thus getting to T.C. just before dark.

-1995-08-01 | 161 - More 161d & triassic | Andy, wook, Steve +1995-08-01 | 161 - More 161d & triassic | Andrew Atkinson, wook, Steve

Took Steve in to show him route/entrance & intending to survey another km on end of t.p. [Arranged that team Algeria derig (Anthony, Kate, Duncan) diff --git a/years/2007/logbook.html b/years/2007/logbook.html index a97cc4fa7..c1abad4c8 100644 --- a/years/2007/logbook.html +++ b/years/2007/logbook.html @@ -1,6 +1,7 @@ + - + 2007 Expo Logbook @@ -17,6 +18,8 @@ some of the high level horizontal stuff and the top of the main Gaffered pitch.

+

rigging diagram

+
T/U 5 hours
@@ -48,16 +51,9 @@ basecamp in warm hut after having shower :)

-
2007-07-10
-
-
204e - New Rigging Guide
- -

rigging diagram

- -
2007-07-10
-
+
Julia Bradshaw
Base Camp - Germknodel

Makes 8 large/12 small or 4 superlarge plate sized

@@ -690,7 +686,7 @@ completely ran out of juice so we headed out.

2007-07-19
-
Julia Bradshaw and Dour
+
Julia Bradshaw, Dour
Surface Prospecting - Useful Walkies

Thought I'd make myself useful by re-tagging and photoing some diff --git a/years/2013/logbook.html b/years/2013/logbook.html index a3df1c397..dc36ef5ac 100644 --- a/years/2013/logbook.html +++ b/years/2013/logbook.html @@ -1,8 +1,7 @@ - - + - + 2013 Expo Logbook @@ -17,6 +16,11 @@

--end of fragment--> + +
2013-07-23
OllyB, Jenny
@@ -219,7 +223,7 @@ Julian was patiently waiting to take us down the hill.

2013-07-28
-
Chris, Mike, Becka
+
Chris D, Mike, Becka
258 Rigging

Becka rigged Caramel Catharsis then showed Chris and Mike the top of @@ -242,7 +246,7 @@ out to help Holly, Anthony + martin with top camp bivvy fettling.

2013-07-30
-
Chris, Becka
+
Chris D, Becka
258 Rigging

Chris finished Holly's rigging off String Theory from yesterday then @@ -257,7 +261,7 @@ decent rigging guides before Expo next year.

2013-07-31
-
Chris, Becka, Holly, Mike
+
Chris D, Becka, Holly, Mike
258 Rigging and AT LAST some pushing

Chris + Becka headed in early. becka finished rigging @@ -389,7 +393,7 @@ Determination is required for further trips and so it's name is born ->

2013-08-02
-
Holly, Chris, Anthony
+
Holly, Chris D, Anthony
258 Pushing Determination

Lured by tales of an ongoing spacious pitch series, I found myself heading off to Holly’s @@ -468,7 +472,7 @@ group leaving the entrance and slogged out with fat tacklesacks.

2013-08-04
-
Chris, Becka, Matt
+
Chris D, Becka, Matt
Tunnocks – Procrastination – bolting the climb ‘Bring on the Clowns’

Becka started bolting across the traverse from 31/7 to reach aven, then Chris took over @@ -495,7 +499,7 @@ later Becka appeared looking rather wide-eyed but extremely clean.

2013-08-06
-
Chris, Anthony
+
Chris D, Anthony
258 Tunnocks – The Number of the Beast

Dour + Chris took in over 100m rope to see what they could do with the pitch at the top @@ -759,7 +763,7 @@ wider.

2013-08-03
-
Becka, Matt, Chris, Holly
+
Becka, Matt, Chris D, Holly
Ants In Pants

After a hot, heavy carry in the morning I rehydrated than headed off to 2012-NS-01 and @@ -1070,7 +1074,7 @@ too small. Again Stuart drew a survey while we photoed + GPS-ed.

2013-08-11
-
Matt, Alex, Chris
+
Matt, Alex, Chris D
Surface Prospecting - Drafty hole area

Callout book entry only.

diff --git a/years/2014/logbook.html b/years/2014/logbook.html index aa2364aaf..b352fdf45 100644 --- a/years/2014/logbook.html +++ b/years/2014/logbook.html @@ -1,8 +1,7 @@ - - + - + 2014 Expo Logbook @@ -17,6 +16,10 @@
--end of fragment--> + +
2014-07-14
Anthony, Jess
@@ -165,7 +168,7 @@
2014-07-29
-
Becka, Mike, Andrea, Nat, Katey
+
Becka, Mike Futrell, Andrea, Nat, Katey
Prospecting ~NE of Tunnocks

A pleasant day ambling in the sunshine trying to hit Mike's main goal areas. We found surprisingly little given the 5-person comb but we refound CUCC-2005-05 which seemed promising unless the air in it is just circulation from the fractured bowl beneath the entrance. Mike, Andrea + Katey surveyed it whilst Nat bolted the right hand pitch to a bridge before running out of rope (we only had 11m + 12m; the only other rope at Top Camp was 200m!) + good rock. This should be returned to + checked out properly.

@@ -227,7 +230,7 @@
2014-07-30
-
Michael, Katey, Mike, & Andrea Futrell
+
Michael, Katey, Mike Futrell, & Andrea Futrell
258 - Tunnocks - Sightseeing and C lead at the top of String Theory (09-44C)

The Futrells wanted a sightseeing trip where they could take photographs without being pressured to go fast, and us others wanted an easier trip. Also given to us was the choices of a C-lead at the top of String Theory (09-44C). Took the standard roure to ST (Entrance -> Caramel Catharsis -> Pleasure Series -> ST). C-lead was along a rift out the top of the scree slope at the top of ST heading West. Floor of boulder choke, after ~20m the floor falls out. There is a ga wide enough to fit a person, an 11m tope allowed descent to a second level of boulder choke floor. A third and final level of boulder choke floor was reached by another ~6m pitch. Both ends of the rift choked up at each level. The lowest level was at ~45° angle, any step sent a cascade of rocks down. @@ -410,7 +413,7 @@ Route finding through Knossos/Star Wars/Tower Blocks proved to be a bit more tri

2014-08-05
-
Katey, Holly, Noel, Mike, Andrea
+
Katey, Holly, Noel, Mike Futrell, Andrea
2005-05 Balcony Höhle

Noel, Mike and Andrea had set off nice and early to go look at some of our leads from the day before, including a traverse that wanted bolting. Using a drill tends to go more easily when the drill has a bit, though, so when Noel came back to get one Holly and I came along to the cave. Noel added a backup bolt to the top Y-hang then I descended first to fettle the rigging. After lots of waiting for people to descend to avoid bouldery death we set off to rig the traverse. While Noel was discovering a chasm too wide to traverse across Holly and I were looking at the parallel shaft we'd found, and we made a sound connection between the two (unsurprising, as Noel described around the corner of the pitch as a rift). We decided to leave that traverse alone for the time being and as Noel derigged I took everyone else to Liar's bakery, the ?B, for Mike and Andrea to poke around in. Holly, Noel, and I then went to traverse the parallel shaft Holly and I had visited instead. Traversing over one pitch led to a second hole in the floor, giving the area the name Pit Pot. Traversing over the second pit landed on a rubble-covered ledge with a small window leading to a nice big pitch! Rocks fell for ~3 sec, so we estimated the depth of the shaft at 60m. We surveyed to the window -a whopping 13m - and headed out. Mike and Andrea had had rather more success, surveying 109.13m ending in a (dry) ~40m pitch. There are still plenty of leads to go back to, not too bad!

@@ -460,7 +463,7 @@ Route finding through Knossos/Star Wars/Tower Blocks proved to be a bit more tri
2014-08-06
-
Becka, Neil, Mike
+
Becka, Neil, Mike Futrell
258 Tunnocks - Champagne on Ice - connection trip to Arctic Angle

Back on down to continue our previous survey down the pitches that Joe, Fleur + Pete had rigged yesterday. The horizontal passage looked an excellent lead with a good draft (+ a single pair of footsteps in + out - bad boy, Joe!). We soon surveyed to a traverse which Neil rigged over a big drop + ... footsteps the other side ... so we only got ~4m of unsurveyed passage to get the connection! We tied in the survey then ran off to work out where we were (luckily I'd packed Julian's mini-survey of the Straight Choice area). Mike took a few shots of pretties + then we checked out the leads, admiring the scary traverse + climb that Andrew had done on the only trip that had been there before, when we'd done a long rig - survey - derig trip at the end of Expo. There were no horizontal leads to do + we were nearly out of rigging gear so we decided to go for the QMA at the S end of Arctic Angle with a p6. Neil soon rigged this + excitedly reported that it looked good... + we'd already noticed the strong draft so we whooped our way down to discover a maze of attractive walking passage - lots of phreatic, some formations, really lovely - looking passage, whoo hoo!