From 7c5181c0f316c6f998b70a7cdbce7d206b83a376 Mon Sep 17 00:00:00 2001 From: Sam Wenham Date: Thu, 11 Jul 2019 15:55:41 +0100 Subject: [PATCH] Yet more folk and logbook fixes --- folk/folk.csv | 8 ++++---- years/2012/logbook.html | 2 +- years/2013/logbook.html | 2 +- years/2015/logbook.html | 6 +++--- years/2016/logbook.html | 8 ++++---- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/folk/folk.csv b/folk/folk.csv index 4b37bce53..c1823650a 100644 --- a/folk/folk.csv +++ b/folk/folk.csv @@ -1,6 +1,6 @@ Name,Lastname,Guest,VfHO member,Mugshot,1976,1977,1978,1979,1980,1981,1982,1983,1984,1985,1986,1987,1988,1989,1990,1991,1992,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018 Hugh Adams,Adams,,,,,,,,,,,,,,,,,,,,,1,,1,,,,,,,,,,,,,,,,,,,,,,,, -Rob Adams,Adams,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,,1,,,,, +Rob Adams (Robert),Adams,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,,1,,,,, Adam Aldridge,Aldridge,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1, Michael Allen,Allen,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,, Craig Anderson,Anderson,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,, @@ -133,7 +133,7 @@ Sean Houlihane,Houlihane,,,,,,,,,,,,,,,,,,,,,,1,,,,1,,,,,,,,,,,,,,,,,,,,, David Howes,Howes,,,l/daveh.htm,,,,,,,,,,,,,,1,1,,1,,,,,,,,,,,,,,,,,,,,,,,,,,, Cat Hulse,Hulse,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,,,,,,1, Rachel Hunter,Hunter,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,, -Balázs Izapy,Izapy,1,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,, +Balázs Izapy,Izapy,1,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,, Martin Jahnke,Jahnke,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,1,,,,,,,,, Kate Janossy,Janossy,,,i/katej.jpg,,,,,,,,,,,,,,,,,,,1,1,,,1,,,,,,,,,,,,,,,,,,,,, Dave Johnson,Johnson,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,, @@ -166,7 +166,7 @@ Gill Lindsey,Lindsey,,,i/gill_lindsey.jpg,,,,,,,,,,,,,,,,1,1,,,,1,,,,,,,,,,,,,,, Dave Loeffler,Loeffler,,1,l/davel.htm,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,1,1,1,1,,,,-1,-1,,,,,,, Jane Lolly,Lolly,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, Glen Long,Long,,,i/glen.jpg,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,, -Pete Lord (Petel),Lord,,,i/petel.jpg,,,,,,,,,,,,,,,,,,1,1,,1,,,,,,,,,,,,,,,,,,,,,,, +Pete Lord,Lord,,,i/petel.jpg,,,,,,,,,,,,,,,,,,1,1,,1,,,,,,,,,,,,,,,,,,,,,,, Fleur Loveridge,Loveridge,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,1,1,1,, Erin Lynch,Lynch,,,i/erin.jpg,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,, Tim Lyons,Lyons,1,,,,,,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, @@ -302,7 +302,7 @@ Hannah Walker,Walker,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,, Ian Walker,Walker,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,1,,,,,,, Julian Walker,Walker,1,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, Nathan Walker,Walker,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,1,, -Stuart Walker,Walker,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,1,,,,,, +Stuart Walker (Stu),Walker,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,1,,,,,, Becky Ward,Ward,,,l/rhrw.htm,,,,,,,-1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, Martin Warren,Warren,1,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, Matt Watson,Watson,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,1,,,, diff --git a/years/2012/logbook.html b/years/2012/logbook.html index 7731a2b87..89ab33e9c 100644 --- a/years/2012/logbook.html +++ b/years/2012/logbook.html @@ -957,7 +957,7 @@ Had an explore, realised the 1978 survey has the wrong angle for the side passag
2012-08-22
-
Olly, Jenny Stuart B, Terry, Annette
+
Olly, Jenny, Stuart B, Terry, Annette
Eishöhle Tourist Trip

Walked down from our bivi to meet the others at the Stogerweg junction. Walked (slowly) to Eishöhle. It was very hot and took hours, eventually got to the Ice Tunnel entrance which had less ice than Olly remembered. The bolts were almost out of reach! All got down and admired the ice.

diff --git a/years/2013/logbook.html b/years/2013/logbook.html index dbe407286..a3df1c397 100644 --- a/years/2013/logbook.html +++ b/years/2013/logbook.html @@ -219,7 +219,7 @@ Julian was patiently waiting to take us down the hill.

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

Becka rigged Caramel Catharsis then showed Chris and Mike the top of diff --git a/years/2015/logbook.html b/years/2015/logbook.html index 15b6b79c8..159b544e4 100644 --- a/years/2015/logbook.html +++ b/years/2015/logbook.html @@ -496,7 +496,7 @@ to wait for our lift down the hill.

2015-07-27
-
Andy, Ben Whetton, Anthony
+
Andy K, Ben Whetton, Anthony
Tunnocks - pushing Kraken

Despite heavy overnight rain, we decided to press on with our planned trip on the basis @@ -639,7 +639,7 @@ endeavours.

2015-07-28
-
Elaine, Michael, Matt
+
Elaine, Michael S, Matt
Balcony - Ice Cock area

Previous trips to the Ice Cock area left two A leads, so two teams went down to push the @@ -738,7 +738,7 @@ that went nowhere.

2015-08-03
-
Michael, Elaine & Elliott
+
Michael S, Elaine & Elliott
Purple Lupin Shaft

After being pressured to start pulling gear out of various places, we decided to polish off the diff --git a/years/2016/logbook.html b/years/2016/logbook.html index 293a07200..bea7072d4 100644 --- a/years/2016/logbook.html +++ b/years/2016/logbook.html @@ -436,7 +436,7 @@ in a trade route rig. So we headed out to rethink.

2016-07-02
-
David, Roshni, Mark (rescuer)
+
David, Roshni, Mark D(rescuer)
264 Balcony - Cathedral Chasm

First 7 hours of the trip went relatively smoothly, despite David forgetting to bring a pencil for surveying. We made our way to Cathedral Chasm, which included getting past a particularly awkward @@ -476,7 +476,7 @@ the end of the day, it was an experience, albeit not a fun one. We live to cave

2016-07-02
-
Mark, George, Nat, Haydon
+
Mark D, George, Nat, Haydon
Balkonhöhle Rescue

At 22:00 David and Roshni's callout went live. We scanned the hill for lights, but saw @@ -810,7 +810,7 @@ the right, finishing in an aven (Rob said this has now crapped out).

2016-07-07 to 10
-
Mark, Anthony, Luke
+
Mark D, Anthony, Luke
Tunnocks Camp

Day 1

Descended lunchtime and sent down at a steady pace. Met up with David, Julian and Becka at @@ -1411,7 +1411,7 @@ to the boulder it was on than it appeared to be.

2016-07-20
-
Anthony, Elliott, David, Mark, Rob
+
Anthony, Elliott, David, Mark D, Rob
Tunnocks derig, Upper Kraken to String Theory

The objective of this trip was to derig at least as far as the top of the flood-prone Procrastination pitch. The