From 7d9ec8009a7f7327f6bb373ea60acce5ba54ca86 Mon Sep 17 00:00:00 2001 From: julian Date: Sat, 24 Jan 2009 15:01:59 +0100 Subject: [PATCH] [svn r8221] merge the trip table to have surveys by date --- troggle/expo/models.py | 28 ++++++ troggle/expo/models_survex.py | 12 +++ troggle/media/css/main2.css | 11 +++ troggle/parsers/cavetab.py | 18 ++++ troggle/parsers/logbooks.py | 16 +-- troggle/templates/index.html | 21 +++- troggle/templates/personexpedition.html | 64 +++++++----- troggle/templates/survexblock.html | 8 +- years/1996/log.htm | 125 ++++++++++++------------ 9 files changed, 201 insertions(+), 102 deletions(-) diff --git a/troggle/expo/models.py b/troggle/expo/models.py index ee3179b32..b8885ea7f 100644 --- a/troggle/expo/models.py +++ b/troggle/expo/models.py @@ -86,6 +86,34 @@ class PersonExpedition(models.Model): is_guest = models.BooleanField(default=False) nickname = models.CharField(max_length=100,blank=True,null=True) + def GetPersonroles(self): + res = [ ] + for personrole in self.personrole_set.order_by('survex_block'): + if res and res[-1]['survexpath'] == personrole.survex_block.survexpath: + res[-1]['roles'] += ", " + str(personrole.role) + else: + res.append({'date':personrole.survex_block.date, 'survexpath':personrole.survex_block.survexpath, 'roles':str(personrole.role)}) + print res + return res + + def GetPersonChronology(self): + res = { } + for persontrip in self.persontrip_set.all(): + a = res.setdefault(persontrip.date, { }) + a.setdefault("persontrips", [ ]).append(persontrip) + for personrole in self.personrole_set.all(): + a = res.setdefault(personrole.survex_block.date, { }) + b = a.setdefault("personroles", { }) + survexpath = personrole.survex_block.survexpath + + if b.get(survexpath): + b[survexpath] += ", " + str(personrole.role) + else: + b[survexpath] = str(personrole.role) +# needs converting dict into list + return sorted(res.items()) + + # deprecated def GetPossibleNameForms(self): res = [ ] diff --git a/troggle/expo/models_survex.py b/troggle/expo/models_survex.py index 4b65357b8..1a7251ff4 100644 --- a/troggle/expo/models_survex.py +++ b/troggle/expo/models_survex.py @@ -27,6 +27,9 @@ class SurvexBlock(models.Model): end_file = models.CharField(max_length=200, blank=True, null=True) end_char = models.IntegerField(blank=True, null=True) + class Meta: + ordering = ('date', 'survexpath') + def __unicode__(self): return unicode(self.name) @@ -37,6 +40,15 @@ class SurvexBlock(models.Model): fin.close() return res + def GetPersonroles(self): + res = [ ] + for personrole in self.personrole_set.order_by('personexpedition'): + if res and res[-1]['person'] == personrole.personexpedition.person: + res[-1]['roles'] += ", " + str(personrole.role) + else: + res.append({'person':personrole.personexpedition.person, 'expeditionyear':personrole.personexpedition.expedition.year, 'roles':str(personrole.role)}) + print res + return res class PersonRole(models.Model): diff --git a/troggle/media/css/main2.css b/troggle/media/css/main2.css index fa9d3c29f..b07c65c52 100644 --- a/troggle/media/css/main2.css +++ b/troggle/media/css/main2.css @@ -142,6 +142,17 @@ p.indent margin-left:10px; } +table.survexcontibutions td.date +{ width:90px; } +table.survexcontibutions td.roles +{ width:100px; background-color:#feeeed; } +table.survexcontibutions td.survexblock +{ width:260px; background-color:#feeeed; } +table.survexcontibutions td.trip +{ width:190px; } +table.survexcontibutions td.place +{ width:140px; } + #expoHeader { width:100%; position:relative; diff --git a/troggle/parsers/cavetab.py b/troggle/parsers/cavetab.py index 25a9d81fe..7f3146a5c 100644 --- a/troggle/parsers/cavetab.py +++ b/troggle/parsers/cavetab.py @@ -262,3 +262,21 @@ for line in caveReader : newCaveAndEntrance = models.CaveAndEntrance(cave = newCave, entrance = newEntrance, entrance_letter = entrance_letter) newCaveAndEntrance.save() + + +# lookup function modelled on GetPersonExpeditionNameLookup +Gcavelookup = None +def GetCaveLookup(): + global Gcavelookup + if Gcavelookup: + return Gcavelookup + Gcavelookup = {"NONEPLACEHOLDER":None} + for cave in models.Cave.objects.all(): + Gcavelookup[cave.official_name.lower()] = cave + if cave.kataster_number: + Gcavelookup[cave.kataster_number] = cave + if cave.unofficial_number: + Gcavelookup[cave.unofficial_number] = cave + return Gcavelookup + + \ No newline at end of file diff --git a/troggle/parsers/logbooks.py b/troggle/parsers/logbooks.py index 3de28d768..9ad1962ec 100644 --- a/troggle/parsers/logbooks.py +++ b/troggle/parsers/logbooks.py @@ -4,6 +4,7 @@ import troggle.settings as settings import troggle.expo.models as models from troggle.parsers.people import GetPersonExpeditionNameLookup +from troggle.parsers.cavetab import GetCaveLookup import csv import re @@ -64,13 +65,14 @@ def GetTripCave(place): #need to be fuzzier about matching h def EnterLogIntoDbase(date, place, title, text, trippeople, expedition, logtime_underground): trippersons, author = GetTripPersons(trippeople, expedition, logtime_underground) - tripCave = GetTripCave(place) +# tripCave = GetTripCave(place) lbo = models.LogbookEntry(date=date, place=place, title=title[:50], text=text, author=author, expedition=expedition) - if tripCave: - lbo.cave=tripCave + lbo.cave=GetCaveLookup().get(place) + print "pppp", place, lbo.cave + lbo.save() - print "ttt", date, place + #print "ttt", date, place for tripperson, time_underground in trippersons: pto = models.PersonTrip(person_expedition = tripperson, place=place, date=date, time_underground=time_underground, logbook_entry=lbo, is_logbook_entry_author=(tripperson == author)) @@ -156,7 +158,7 @@ def Parseloghtml01(year, expedition, txt): tripid = mtripid and mtripid.group(1) or "" tripheader = re.sub("]*>", "", tripheader) - #print [tripheader] + print [tripheader] #continue tripdate, triptitle, trippeople = tripheader.split("|") @@ -234,7 +236,7 @@ yearlinks = [ ("1999", "1999/log.htm", Parseloghtml01), ("1998", "1998/log.htm", Parseloghtml01), ("1997", "1997/log.htm", Parseloghtml01), - #("1996", "1996/log.htm", Parseloghtml01), + ("1996", "1996/log.htm", Parseloghtml01), ] def SetDatesFromLogbookEntries(expedition): @@ -303,7 +305,7 @@ def LoadLogbooks(): models.LogbookEntry.objects.all().delete() expowebbase = os.path.join(settings.EXPOWEB, "years") #yearlinks = [ ("2001", "2001/log.htm", Parseloghtml01), ] #overwrite - #yearlinks = [ ("1997", "1997/log.htm", Parseloghtml01),] # overwrite + #yearlinks = [ ("1996", "1996/log.htm", Parseloghtml01),] # overwrite for year, lloc, parsefunc in yearlinks: expedition = models.Expedition.objects.filter(year = year)[0] diff --git a/troggle/templates/index.html b/troggle/templates/index.html index 0122bdd1e..bbc431268 100644 --- a/troggle/templates/index.html +++ b/troggle/templates/index.html @@ -7,11 +7,22 @@

The unfinished front page

Work down through an expedition page link -

Remaining work: continue to build up the network; tables of trips per year per person; parse 1996 logbook; -continue to correct the name matching and spelling; detect T/U on log entries; match caves to log entries; see the cave list; -simplify the survex parsing code (if necessary); vast front-page layout table of folks and caving trips and years; -links between logbooks and survex blocks to cave things; where are the subcaves; mini-tree of survexblocks; connect sketches -to caves to survey blocks and render thumbnailwise; all images to start appearing in pages; and so on

+

Remaining work: + +

continue to build up the network;

+

tables of trips per year per person;

+

parse 1995-1976 logbooks;

+

continue to correct the name matching and spelling;

+

detect T/U on log entries;

+

match caves to log entries;

+

see the cave list;

+

simplify the survex parsing code (if necessary);

+

vast front-page layout table of folks and caving trips and years;

+

links between logbooks and survex blocks to cave things;

+

where are the subcaves;

+

mini-tree of survexblocks;

+

connect sketches to caves to survey blocks and render thumbnailwise;

+

all images to start appearing in pages; and so on

{{message}}

diff --git a/troggle/templates/personexpedition.html b/troggle/templates/personexpedition.html index bbbc0677a..07dcb546e 100644 --- a/troggle/templates/personexpedition.html +++ b/troggle/templates/personexpedition.html @@ -9,32 +9,50 @@

{{message}}

-

Needs links fore and back through expeditions attended by this person (or as a complete barchart type list with one date in bold)

-

Needs lists below to be sorted by date, and the duplicates removed from survey role list

-

Finally, a correspondence between these two columns

+

Main page for expedition: {{personexpedition.expedition}}

-
- - -{% for personrole in personexpedition.personrole_set.all %} - - - - - +

List of other expos by this person

+

+{% for otherpersonexpedition in personexpedition.person.personexpedition_set.all %} +{% ifequal otherpersonexpedition personexpedition %} + | {{otherpersonexpedition.expedition.year}} +{% else %} + | {{otherpersonexpedition.expedition.year}} +{% endifequal %} {% endfor %} -

DatePlaceRole
{{personrole.survex_block.date}}{{personrole.survex_block.survexpath}}{{personrole.role}}
-
+

-
- - -{% for persontrip in personexpedition.persontrip_set.all %} - - - - - +

Table of all trips and surveys aligned by date

+
+
DateTitlePlace
{{persontrip.date}}{{persontrip.logbook_entry.title|safe}}{{persontrip.place}}
+ +{% for persondate in personexpedition.GetPersonChronology %} + + + + + + + + {% endfor %}
DateTripsSurveys
{{persondate.0}} + + {% for persontrip in persondate.1.persontrips %} + + + + + {% endfor %} +
{{persontrip.logbook_entry.title|safe}}{{persontrip.place}}
+ 		+ + {% for personsurvexroles in persondate.1.personroles.items %} + + + + + {% endfor %} +
{{personsurvexroles.0}}{{personsurvexroles.1}}
+
diff --git a/troggle/templates/survexblock.html b/troggle/templates/survexblock.html index ef392dfbc..dedf09f0c 100644 --- a/troggle/templates/survexblock.html +++ b/troggle/templates/survexblock.html @@ -29,10 +29,10 @@

Date: {{survexblock.date}}

-{% for personrole in survexblock.personrole_set.all %} +{% for personrole in survexblock.GetPersonroles %} - - + + {% endfor %}
{{personrole.personexpedition.person}}{{personrole.role}}{{personrole.person}}{{personrole.roles}}
@@ -40,7 +40,7 @@ -
+
{{ftext|survex_to_html}}
diff --git a/years/1996/log.htm b/years/1996/log.htm index c6f05efbb..57bdb9859 100644 --- a/years/1996/log.htm +++ b/years/1996/log.htm @@ -203,7 +203,7 @@ Trips same day finding: Puerile Humour &
-

4/7 |Top Camp carry | Nick, Matthew, Brian, Phil 4/7/96 |Top Camp carry | Nick, Matthew, Brian, PhilU

> Carried lots of shit up to Top Camp in the heat, whilst Steve and Anthony massacred some bunde with Anthony's Junior Hacksaw. Saw a little adder @@ -211,7 +211,7 @@ massacred some bunde with Anthony's Junior Hacksaw. Saw a little adder
-

2/7 | Journey to Expo | Brian & PhilU

+

2/7/96 | Journey to Expo | Brian & PhilU

Set of from London 3:30am. Folkestone. Chunnel. France. Belgium. Germany. Fly-camp. More Germany. Austria. Base Camp. Top Camp. 50mph. 'Nuff said. @@ -221,7 +221,7 @@ ADVENTURE

-

5/7 |161d | Matthew, PhilU, Steve

+

5/7/96 |161d | Matthew, PhilU, Steve

We walked from Top Camp to Scarface. It was a bastard. Got changed and sweated whilst waiting for everyone else. Entered cave and trundled along to @@ -241,7 +241,7 @@ Trips same day finding: Interview Blues &

-

6/7 | Pushing Leads off Trifurcation | Nick, Anthony, Brian

+

6/7/96 | Pushing Leads off Trifurcation | Nick, Anthony, Brian

(or Silly Bastards go caving in the rain) The caving was lovely, the walk @@ -270,7 +270,7 @@ This can only be reached by a very airy traverse - a job for the drill.

-

5/7| Pushing 95-54| Brian & Anthony

+

5/7/96| Pushing 95-54| Brian & Anthony

Anthony's caving bit: Pushing 95-54 near MINOAN surprise. Placed back up bolt to left of @@ -287,7 +287,7 @@ Trips same day finding: Puerile Humour &

-

6/7 | Pushing 95-54| Brian & Anthony

+

6/7/96 | Pushing 95-54| Brian & Anthony

BECKA - I added title and people here as unclear what write-up below refers to

@@ -361,7 +361,7 @@ trip (I hope)]
-

5/7/96 | Drive across Europe (not via Frankfurt) | Dunks, Paul & Jen

+

5/7/96 | Drive across Europe (not via Frankfurt) | Dunks, Paul & *Jen

Quite a straightforward journey really, except for there seems to have been some sort of communication fuck-up concerning the route. @@ -383,7 +383,7 @@ have to remove the headlights. In turn, to get to the clips holding the headlight in place, you have to remove the radiator grille...

Things weren't helped by someone having done a bodge at some stage with -one of the retaining clips for the headlight making the *#£!!ng thing damn +one of the retaining clips for the headlight making the *#�!!ng thing damn near impossible to put back in place.

Eventually fettled it all. Checked everything was working and set off. @@ -427,7 +427,7 @@ Those waiting at the bottom were most relieved to see the return of the rope.

-

12/7/96 | Driving to Austria | Andrew, Andrew, Juliette + Dave

+

12/7/96 | Driving to Austria | AndyC, AndrewA, Juliette + DavidF

It was awful. Austria was too near so we thought we (A+D) would empty Andrew's house to Southampton to make it take longer. So, we bought a tow @@ -449,7 +449,7 @@ thing do they have a repeating pattern or not.

[Picture follows] -

13/7/96 | Driving to Austria | Tina & MikeTA & Corrosion the Metro

+

13/7/96 | Driving to Austria | Tina & Mike TA & Corrosion the Metro

York is too far down Britain by half. Took ages just driving to the channel. Seacat was fun. Thought I'd been clever, thought I'd raided @@ -499,7 +499,7 @@ Staud'n'wirt and YOU'VE ALL SODDED OFF!
-

13/7/96 |Trouble free motoring in the badvan | J.Todd & Wookey

+

13/7/96 |Trouble free motoring in the badvan | J Todd & Wookey

BECKA - guessed date as 13/7

@@ -557,7 +557,7 @@ pushing got done - Raining outside.
-

14/7/96 | Puerile Humour | Lumatt + Ralph

+

14/7/96 | Puerile Humour | Lummat + Ralph

Excellent stroll to this series. Pitch '(20m?)' descended 7m on 2 naturals across traverse (NATURALS CITY 1) 3m to top of NC2. On left at @@ -579,7 +579,7 @@ pitch. Surveyed out.

-

15/7/96 | Puerile Humour cont. | Lumatt + Sam

+

15/7/96 | Puerile Humour cont. | Lummat + Sam

From the bottom of 'Natural City 3' spent 90 minutes removing pivoting chock stone from the head of the rift. Sam squeezed through the tight bit. @@ -597,7 +597,7 @@ leads to a pitch. This does not appear to join the larger one (QM).

From the T-junction, turn right + immediately on the left a 4m diameter abandoned phreatic tube ascends steeply. Immediately entering this a tight -pitch descends (QM). Continuing up enters <Lumatts Folly>, a large +pitch descends (QM). Continuing up enters <Lummats Folly>, a large aven. Climbing up the left hand side leads to a short narrow vertical tube avoiding a bold climb. On the opposite side of a slope an opening can be seen (QM). Continuing upwards leads to an opening in the left hand corner shortly @@ -658,7 +658,7 @@ pitch (2 secs) at one end and a climb up to the right to an aven and pitch

-

15/7/96 | Question mark extermination trip | JulianH, MikeTA

+

15/7/96 | Question mark extermination trip | JulianH, Mike TA

(a)
@@ -680,7 +680,7 @@ Derigged & came out.
-

13/7/96 | Trip to climb pitch in bugger | Juliet, Andy, Andy, Dave

+

13/7/96 | Trip to climb pitch in bugger | Juliet, AndyC, AndrewA, DavidF

BECKA - logbook said "(actually 13th, Ed.)" so have changed date from 11/7 to 13/7

@@ -702,7 +702,7 @@ near top. Smaller pitches & some crap leads.
-

14/7/96| Surveying in bugger | Juliet, AndrewA, Dave

+

14/7/96| Surveying in bugger | Juliet, AndrewA, DavidF

Trip to survey the bit that we went to find yesterday. I got to go up the nasty climbing bit (except I had the advantage of a rope and stuff). Isn't @@ -719,7 +719,7 @@ side bits that we couldn't see if they went anywhere. Got cold, went out.

-

15/7/96 | In bugger again | Dave Andy C.

+

15/7/96 | In bugger again | DavidF, Andy C

Went same place as above threw another 86m rope down. AndyCs bollocks froze off came out @@ -756,7 +756,7 @@ investigated. Lots of holes - mostly too tight or choked or snowplugged.

-

16/7/96 | More along the Purile Series. | Sam, Brian

+16/7/96 | More along the Purile Series. | Sam, Brian

Started by rigging pitch on other side of 'wall' noted by lummat & Sam on 15/7/96. Sling from top of wall to multi sling deviation in opposite wall @@ -770,7 +770,7 @@ in was another ascending rift up cleanwashed rock - leading to an aven. Heading upslope to the left is a white mud floored tube 3m wide 1.5m high (many bat droppings evident). This soon leads to a semi funnel shaped mud slope above a round shaft ~=8m to floor - large aven above (may be bottom of -shaft noted by Sam/Lummat - left at T-junction at top of Lumatt folly ?) +shaft noted by Sam/Lummat - left at T-junction at top of Lummat folly ?) Traversing carefully to right leads to a blind pocket in the wall. Traversing straignt on leads to a continuation of horizontal tube - continuing traverse round the aven leads to a mud col where a second aven ascends. @@ -861,7 +861,7 @@ holes, and also found himself a draughty dig. Silly sod.

-

13/7/96 | Pushing 95/31a | Dunk, Phil, Phil, Gunilla

+

13/7/96 | Pushing 95/31a | Dunks, PhilB, PhilU, Gunilla

Easy traverse round small drop leads to chamber with an obvious route off @@ -876,7 +876,7 @@ pissed off. Pissed off.

-

16/7/96 | Surveying 95/31 (or "Anthony's attempt on the title fuckwit of the week") | Duncan, Godzilla & Anthony

+

16/7/96 | Surveying 95/31 (or "Anthony's attempt on the title fuckwit of the week") | Duncan, Gunilla & Anthony

It all started so well when I refound my missing penknife which had been sitting in my cag. pocket for 2 months. I then only narrowly avoided @@ -901,7 +901,7 @@ my penknife at entrance.

-

17/7/96 | Qmark extermination trip | Tina, MikeTA

+

17/7/96 | Qmark extermination trip | Tina, Mike TA

Went to Regurgitation without getting lost! Rigged pitch at back off huge ish boulder. Went down. Rift goes for a few metres each way and blocks. @@ -967,7 +967,7 @@ the 2nd pitch at the end of the main way on. Still going.

-

17/7/96 | Surveying in Henri's Cat - 161d | AndyA, DaveF, Becka, JulianT

+

17/7/96 | Surveying in Henri's Cat - 161d | AndrewA, DavidF, Becka, JulianT

I avoided other trip to avoid some surveying. And I don't like heights. Walked down with ten other people. In the cave my stinky gave the feeblest @@ -999,7 +999,7 @@ do what Becca tells me to?

-

18/7/96| BEYOND 'DEAD BAT CHAMBER' | SAM + LUMATT

+

18/7/96| BEYOND 'DEAD BAT CHAMBER' | SAM + LUMMAT

Started by surveying by-pass to <Penguin Falls>. From <5-Ways> climbed up mud slope to left. At large pitch traversed to passage on the @@ -1044,7 +1044,7 @@ main passage at high level over mud.

-

17/7 | Interview Blues | Nick & Paul

+

17/7/96 | Interview Blues | Nick & Paul

Took Paul on his first trip down a typical KH scrotty rift pitch series. Started surveying from where Anthony, Brian & myself had got bored/cold @@ -1065,7 +1065,7 @@ putting the string out. Tedious job isn't it?

-

18/7 | Interview Blues | Nick & Brian

+

18/7/96 | Interview Blues | Nick & Brian

2/3 of team Silly Bastards returned, and this time with a longer rope. Bottomed the pitch and found my 'piece de resistance' - scrotty, narrow rift @@ -1094,7 +1094,7 @@ can't cope with it)

-

18/7/96
| Finishing Henri's Cat | Dave F Becka

+

18/7/96 | Finishing Henri's Cat | DavidF, Becka

Took 200m of rope to finish Henri's Cat which predestined the trip to an early finish. So down we went, I dropped a bolt driver down the pitch, so @@ -1131,7 +1131,7 @@ bored, and came out.

-

18/7/96 | Push/Survey QM 95-34 (rift by Ring Piece Junction) |

Duncan, Gunilla, Steve and Anthony

+

18/7/96 | Push/Survey QM 95-34 (rift by Ring Piece Junction) | Duncan, Gunilla, Steve and Anthony

Returned to the pitch that Duncan started bolting 2 days earlier. Steve and Anthony surveyed in whilst Duncan put more bolts in. There are 3 @@ -1152,7 +1152,7 @@ so "Hammeroids" will have to wait for another day....

-

18/7/96| Pitch in Genital wart | Phil U Andy C

+

18/7/96| Pitch in Genital wart | Phil U, Andy C

Trip to investigate "4s" pitch in genital wart. Rift to be called "a bad case of herpes" due to the walls being covered in brown spots everywhere @@ -1179,7 +1179,7 @@ down to retrieve it, and it doesn't go anywhere. Luv PhilU

-

19-JULY-1996
| Alternative Universe | MIKE'N' TINA

+

19/7/1996
| Alternative Universe | MIKE+ TINA

IN WHICH MIKE 'N' TINA (CUNNING OLD CRUSTIES) DISCOVER LOADSA PASSAGEWAY, AND BEAT WOOKEY (ANOTHER OLD CRUSTIE) TO IT BY ABOUT 90 MINUTES @@ -1244,7 +1244,7 @@ Next trips: Bounce Rift and 161e -
-

20/7/96 | Interview Blues | Nick, Becka, Anthony and Becka's Banana go down

+

20/7/96 | Interview Blues | Nick, Becka, Anthony

Bolted the seventh and eighth pitches of IB and put in a back-up bolt for the ninth, whilst Anthony and Becka invented a survey from the top of the @@ -1282,7 +1282,7 @@ leaving Brian & Paul to put in another bolt before following me out.

-

21/7/96 | 5-Ways area | Sam, Lumatt + Craig

+

21/7/96 | 5-Ways area | Sam, Lummat + Craig

Surveyed bits and pieces in the loop between the top of Pot-hole Passage and 5-ways and finished surveying Completely Loopy. Had lunch. @@ -1333,7 +1333,7 @@ bottom.

-

22-7-96 | Alternative Universe | Penny, Mike, Tina

+

22/7/96 | Alternative Universe | Penny, Mike, Tina

Trip to survey Alternative Universe and look down hole at the end. Another 250m surveyed. Hole at the end (on the left) goes down about 4m through @@ -1390,7 +1390,7 @@ Brian ? hrs

Begged Sam for a nice easy lead, and he obliged! Off down Puerile Humour, past Five Ways, along Shaft Mine. Got to a 3/5m climb down that Sam + -Lummatt had clambered (+ surveyed down). We rigged down it on a single +Lummat had clambered (+ surveyed down). We rigged down it on a single boulder.

[Highly schematic depiction of Bounce Rift in here] @@ -1417,7 +1417,7 @@ again. I slithered up - quite tight then. Wriggled shoulders pushed, then squeezed through & then through another 8" slot in mus - & screamed. Out in the sunlight looking at the shepherd's huts! Spent ten more minutes trying to extract Anthony, finally got him out - hence the Yorkshire Pudding -entrance (161E). Then heard a noise - "Hello." Ye Gods! Sam, Lummatt & +entrance (161E). Then heard a noise - "Hello." Ye Gods! Sam, Lummat & Craig appear just round the corner - they've got an entrance too! We squabble about who got out first then wander over to a big boulder to try to decide where we are. Then, because we're good little boys + girls, we all survey @@ -1450,7 +1450,7 @@ loose looking straight up, possibly could dig into horizontal tube, but all pretty chossy & we were COLD. We had been intending dropping the pit in the large chamber, but too chilly so stomped off down Puerile Humour to warm up. Found Brian bolting around Shaft Mine (it didn't go) & then met -Lummatt et al having great fun in Completely Loopy. The et al was having such +Lummat et al having great fun in Completely Loopy. The et al was having such fun that Ralph decided to head out to 161F entrance & find his way to 161D on the surface. Sam + I escorted him out - entrance is squirmier than 161E, though no squalid entrance squeeze. Sam + I back in & did more red @@ -1468,7 +1468,7 @@ Other trip (same day): Brian, Lummat & Co. /

-

23/7/96 | Traverse over Gizza Job pitch | DaveF + Becka

+

23/7/96 | Traverse over Gizza Job pitch | DavidF + Becka

To top of Interview Blues series to do a traverse over the first, Gizza Job pitch. I belayed Dave as he rigged a nice natural then put in 2 bolts @@ -1510,7 +1510,7 @@ descent) / Two trips set out to derig: First and

-

24/7/96 | Surveying = 161d | Anthony, Phil U + Becka +

24/7/96 | Surveying - 161d | Anthony, Phil U + Becka

Becka: 8th day caving on the run for me! (ie. only 1 night at Base Camp = vitamin deprivation!) @@ -1625,7 +1625,7 @@ for some more rope) and we continued on as Becka's write up.
-

24/7/96 | Photo trip - 161d | SAM, WOOKS, ANDY A, ANDY W, JULIETTE M

+

24/7/96 | Photo trip - 161d | SAM, WOOKEY, ANDY A, ANDY W, JULIET M

OBJECTIVES:
Freeze our bollocks off (Juliette excepted)
@@ -1749,7 +1749,7 @@ because I got confused after I came out of the crawl.
-

19/7/96 | HAMMEROIDS | DUNK, PAUL + GUNILLA

+

19/7/96 | HAMMEROIDS | DUNKS, PAUL + GUNILLA

BECKA - logbook said "(actually 19th, Ed.)" so have changed date from 20/7 to 19/7

@@ -1818,7 +1818,7 @@ survey back to the Batman Series. We've called this area 'Tipico Asturias.'
-

24.7.96 | Touristing | Petel & Clive

+

24/7/96 | Touristing | Petel & Clive

Clive's birthday trip was a lovely tourist looking at all the big bits of cave which are very nice thank you. Anyway it got rid of the need to go @@ -1831,7 +1831,7 @@ remembered we had no spits so we went home. The end. Love Clive

-

18-7-96 | Trying to avoid 'Stairway to Hell' Part 1 | ChrisD, Andrew, JulianH

+

18/7/96 | Trying to avoid 'Stairway to Hell' Part 1 | ChrisD, Andrew, JulianH

Chased up the ramp at Staud'n Wirt Palace. Loose chossy climb 1 didn't go. 15m pitch down ended in narrow drafting stream rift (could easily be made to @@ -1844,7 +1844,7 @@ rifts that ended in choke.

-

19-7-96 | 161d | Wookey & Chris

+

19/7/96 | 161d | Wookey & Chris

Connected up survey at Knossos. Came back & stuck our noses in a big passage off Triassic - to find it had been discovered an hour before by Mike @@ -1857,7 +1857,7 @@ to no effect. Half climbed aven at drop into Zombie Slime - but had to leave.

-

20-7-96 | Avoiding Stairway to Hell Pt3. | JulianH, ChrisD

+

20/7/96 | Avoiding Stairway to Hell Pt3. | JulianH, ChrisD

Really did it this time. Pulled a big rock out of Sam's dig - just lots of loose bits to dig out of strongly drafting rift. Looked around the @@ -1866,7 +1866,7 @@ Schwarzmooskogel side of the surface chasm on the was to 161d. T/U 15mins

-

21-7-96 | Stairway to Hell | JulianH, ChrisD

+

21/7/96 | Stairway to Hell | JulianH, ChrisD

Delaying tactics having failed, we set off for Stairway to Hell. Surveyed to it, took a long look at it, then turned & fled in horror. CJD finished @@ -1879,7 +1879,7 @@ surprisingly long way without reaching daylight.

-

25-7-96 | Forbidden Land | Andrew, Lummat, ChrisD

+

25/7/96 | Forbidden Land | Andrew, Lummat, ChrisD

Better sense having been cast to one side, we passed Stairway to Hell to reach Forbidden Land. The hanging death was the worst I have seen, & the @@ -1933,7 +1933,7 @@ other pitch would be better! We came out.

-

26/7/96 | Tourist - 161d | Mark M, Juliette K, Julian T, Ally G

+

26/7/96 | Tourist - 161d | Mark M, Juliette K, Julian T, *Ally G

We hate caving, especially Ally. We nicked enough gear and went in. Ally's peril sensitive light & cave detecting glasses now smeared with mud @@ -1960,7 +1960,7 @@ short pitch.

-

23/7/96 | Choss Pot - 161d | Ju K, Craig, Mark M

+

23/7/96 | Choss Pot - 161d | Juliette K, Craig, Mark M

Surveyed our finds in Choss Pot while Ju bolted the last pitch. Didn't go anywhere. Surveyed that too and pissed off out. @@ -1971,7 +1971,7 @@ anywhere. Surveyed that too and pissed off out.

-

22/7/96 | Go to the Forbidden Land | Wook & AndyA

+

22/7/96 | Go to the Forbidden Land | Wook & AndrewA

After Julian H & Chris D wimped at Stairway to Hell, that left it for me & Andy. @@ -1995,10 +1995,6 @@ was still going. There are also a couple of pitches & avens.

T/U 8hrs

-

Previous trip / -Next trip - -

Extra verse as sung in Hilda's or approx: @@ -2012,7 +2008,7 @@ best as I can do - Tina
-

26.07.96 | Alternative Universe | TINA & MIKE & PENNY

+

26/07/96 | Alternative Universe | TINA & MIKE & PENNY

Went to look at holes in Alternative Universe. Penny & Tina looked at first one which didn't go so Penny went out. Mike bolted second (from low @@ -2046,7 +2042,7 @@ amounts of rubbish & spent carbide.

-

1996.07.28 | To the Forbidden Land again | Wook & AndyA

+

28/07/1996 | To the Forbidden Land again | Wook & AndrewA

Andy showed Wook new bits, then put in a bolt for a ladder. Continued only 30m along rift before it degenerated. Scrotty bit continued to a choke - no @@ -2147,7 +2143,7 @@ little damp to ascend, hence we went back up IB and left.

-

29/7/96 | IB, where else? | Nick Brian & Craig

+

29/7/96 | IB, where else? | Nick, Brian & Craig

Having eliminated the nicer lead, it was time to go deep again, and we managed to convince Craig to come with us. Brian went ahead to rig the 9th @@ -2234,7 +2230,7 @@ slowly. It was 2-30am and it was misty and raining. Lovely trip.

-

31/7/96 | No prizes for guessing where | Nick, Brian, Dunk

+

31/7/96 | No prizes for guessing where | Nick, Brian, Dunks

Dunk decided to earn superhero points and helped us derig the remaining rope in IB. Dunk hauled, I derigged, Brian ferried tacklesacks. Prussiking @@ -2256,7 +2252,7 @@ Next trip - not next year, in fact, 1999 ?

-

29/7 | Rig/survey/Derig 136 | Wookey & Anthony

+

29/7/96 | Rig/survey/Derig 136 | Wookey & Anthony

Despite slightly shoddy weather and the fact that 136 sounds distinctly crap, we rigged in, made the connection to Forbidden Land, and surveyed out @@ -2295,9 +2291,9 @@ hole in the ground ever again. And pigs will fly....

-

31/7/96 | There 'n' back | Clive 'n' DaveK/Craig or DaveF/Sam

+

31/7/96 | There 'n' back | Clive, DaveH,Craig

-

BECKA - no date given in entry so I've inserted 31/7

+

BECKA - (of or DaveF/Sam) no date given in entry so I've inserted 31/7

I love driving. Craig left the road a couple of times on the way there due to mistaking slip roads for motorway lanes. Dave F did the same on the way @@ -2323,10 +2319,11 @@ DaveF Sam )

-

MISSING TRIPS

14/7/96 | Pushing trip connected Shortage of Walls to Rich Tea via the Teapot | JulianH & Gill

+

MISSING

+

TU 7 hours

Next trip @@ -2335,6 +2332,8 @@ DaveF Sam )

14/7/96 | Pushing trip which found Dr Snuggles etc. | Duncan, PhilB, Gunilla

+

MISSING

+

TU 5 ½

@@ -2346,7 +2345,7 @@ and went home. (email from Pete 97/02/13)" TU 2½
-

26/7/96 | Push/survey pitch at end Fogie's Folly/Wheelchair Access | Jeremy, MarkF (and Tony, DaveH in call-out book)

+

26/7/96 | Push/survey pitch at end Fogie's Folly/Wheelchair Access | Jeremy, MarkF, Tony, DaveH

(DaveH's knees gave out on walk over, so did not go u/g. Tony had to jack when hit on head by rock in Slidy Caver - TU presumably