[svn r8221] merge the trip table to have surveys by date

2025-12-11 16:17:12 +00:00 · 2009-01-24 15:01:59 +01:00
parent e0d941fa54
commit 7d9ec8009a
9 changed files with 201 additions and 102 deletions
--- 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 = [ ]
--- 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):
--- 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;
--- 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
+        
+        
--- 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("</?(?:[ab]|span)[^>]*>", "", 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]
--- a/troggle/templates/index.html
+++ b/troggle/templates/index.html
@@ -7,11 +7,22 @@

 <h2>The unfinished front page</h2>
 <b>Work down through an expedition page link</b>
-<p class="indent">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</p>
+<p class="indent"><b>Remaining work:</b> 
+
+<p>continue to build up the network; </p>
+<p>tables of trips per year per person;</p> 
+<p>parse 1995-1976 logbooks; </p>
+<p>continue to correct the name matching and spelling; </p>
+<p>detect T/U on log entries; </p>
+<p>match caves to log entries; </p>
+<p>see the cave list;</p> 
+<p>simplify the survex parsing code (if necessary); </p>
+<p>vast front-page layout table of folks and caving trips and years; </p>
+<p>links between logbooks and survex blocks to cave things; </p>
+<p>where are the subcaves; </p>
+<p>mini-tree of survexblocks; </p>
+<p>connect sketches to caves to survey blocks and render thumbnailwise; </p>
+<p>all images to start appearing in pages; and so on</p>

 <h3>{{message}}</h3>

--- a/troggle/templates/personexpedition.html
+++ b/troggle/templates/personexpedition.html
@@ -9,32 +9,50 @@

 <h3>{{message}}</h3>

-<p>Needs links fore and back through expeditions attended by this person (or as a complete barchart type list with one date in bold)</p>
-<p>Needs lists below to be sorted by date, and the duplicates removed from survey role list</p>
-<p>Finally, a correspondence between these two columns</p>
+<p><b><a href="{% url expedition personexpedition.expedition.year %}">Main page for expedition: {{personexpedition.expedition}}</a></b></p>

-<div id="col2">
-<table class="survexcontibutions">
-<tr><th>Date</th><th>Place</th><th>Role</th></tr>
-{% for personrole in personexpedition.personrole_set.all %}
-  <tr>
-    <td>{{personrole.survex_block.date}}</td>
-    <td><a href="{% url survexblock personrole.survex_block.survexpath %}">{{personrole.survex_block.survexpath}}</a></td>
-    <td>{{personrole.role}}</td>
-  </tr>
+<p>List of other expos by this person</p>
+<p>
+{% for otherpersonexpedition in personexpedition.person.personexpedition_set.all %}
+{% ifequal otherpersonexpedition personexpedition %}
+  | <b>{{otherpersonexpedition.expedition.year}}</b>
+{% else %}
+  | <a href="{% url personexpedition personexpedition.person.href otherpersonexpedition.expedition.year %}">{{otherpersonexpedition.expedition.year}}</a>
+{% endifequal %}
 {% endfor %}
-</table>
-</div>
+</p>

-<div id="col1">
-<table class="expeditionlogbooks">
-<tr><th>Date</th><th>Title</th><th>Place</th></tr>
-{% for persontrip in personexpedition.persontrip_set.all %}
-  <tr>
-    <td>{{persontrip.date}}</td>
-    <td><a href="{% url logbookentry persontrip.logbook_entry.href %}">{{persontrip.logbook_entry.title|safe}}</td>
-    <td>{{persontrip.place}}</td>
-  </tr>
+<h3>Table of all trips and surveys aligned by date</h3>
+<div>
+<table class="survexcontibutions">
+<tr><th>Date</th><th>Trips</th><th>Surveys</th></tr>
+{% for persondate in personexpedition.GetPersonChronology %}
+<tr>
+  <td class="date">{{persondate.0}}</td>
+
+  <td> 
+    <table>
+    {% for persontrip in persondate.1.persontrips %}
+      <tr>
+        <td class="trip"><a href="{% url logbookentry persontrip.logbook_entry.href %}">{{persontrip.logbook_entry.title|safe}}</a></td>
+        <td class="place">{{persontrip.place}}</td>
+      </tr>
+    {% endfor %}
+    </table>
+  </td>
+  
+  <td>
+    <table>
+    {% for personsurvexroles in persondate.1.personroles.items %}
+      <tr>
+        <td class="survexblock"><a href="{% url survexblock personsurvexroles.0 %}">{{personsurvexroles.0}}</a></td>
+        <td class="roles">{{personsurvexroles.1}}</td>
+      </tr>
+    {% endfor %}
+    </table>
+  </td>
+
+</tr>
 {% endfor %}
 </table>
 </div>
--- a/troggle/templates/survexblock.html
+++ b/troggle/templates/survexblock.html
@@ -29,10 +29,10 @@
 <p>Date: {{survexblock.date}}</p>

 <table>
-{% for personrole in survexblock.personrole_set.all %}
+{% for personrole in survexblock.GetPersonroles %}
 <tr>
-  <td><a href="{% url personexpedition personrole.personexpedition.person.href personrole.personexpedition.expedition.year%}">{{personrole.personexpedition.person}}</a></td>
-  <td>{{personrole.role}}</td>
+  <td><a href="{% url personexpedition personrole.person.href personrole.expeditionyear%}">{{personrole.person}}</a></td>
+  <td>{{personrole.roles}}</td>
 </tr>
 {% endfor %}
 </table>
@@ -40,7 +40,7 @@

 </div>

-<div id="col1">
+<div class="survexblock">
 {{ftext|survex_to_html}}
 </div>

--- a/years/1996/log.htm
+++ b/years/1996/log.htm
@@ -203,7 +203,7 @@ Trips same day finding: <a href="#id1996-161-1">Puerile Humour</a> &amp;

 <hr />

-<p>4/7 |Top Camp carry | <u>Nick</u>, Matthew, Brian, Phil </p<
+<p>4/7/96 |Top Camp carry | <u>Nick</u>, Matthew, Brian, PhilU </p>
 >
 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

 <hr />

-<p>2/7 | Journey to Expo | Brian &amp; <u>PhilU</u> </p>
+<p>2/7/96 | Journey to Expo | Brian &amp; <u>PhilU</u> </p>

 <p>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

 <hr />

-<p><a id="id1996-161-1">5/7</a> |161d | Matthew, <u>PhilU</u>, Steve </p>
+<p><a id="id1996-161-1">5/7/96</a> |161d | Matthew, <u>PhilU</u>, Steve </p>

 <p>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: <a href="#id1996-161-3">Interview Blues</a> &amp;

 <hr />

-<p><a id="id1996-161-4">6/7</a> | Pushing Leads off Trifurcation | <u>Nick</u>, Anthony, Brian  </p>
+<p><a id="id1996-161-4">6/7/96</a> | Pushing Leads off Trifurcation | <u>Nick</u>, Anthony, Brian  </p>


 <p>(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.

 <hr />

-<p><a id="id1996-161-2"></a> 5/7| Pushing 95-54| <u>Brian</u> &amp;  Anthony </p>
+<p><a id="id1996-161-2"></a> 5/7/96| Pushing 95-54| <u>Brian</u> &amp;  Anthony </p>

 <p>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: <a href="#id1996-161-1">Puerile Humour</a> &amp;

 <hr />

-<p><a id="id1996-161-4a">6/7</a> | Pushing 95-54| <u>Brian</u> &amp;  Anthony </p>
+<p><a id="id1996-161-4a">6/7/96</a> | Pushing 95-54| <u>Brian</u> &amp;  Anthony </p>

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

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

 <hr />

-<p> 5/7/96 | Drive across Europe (<u>not</u> via Frankfurt) | <u>Dunks</u>, Paul &amp; Jen </p>
+<p> 5/7/96 | Drive across Europe (<u>not</u> via Frankfurt) | <u>Dunks</u>, Paul &amp; *Jen </p>

 <p>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...

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

 <p>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.

 <hr />
 
-<p> 12/7/96 | Driving to Austria | Andrew, Andrew, Juliette + <u>Dave</u></p>
+<p> 12/7/96 | Driving to Austria | AndyC, AndrewA, Juliette + <u>DavidF</u></p>

 <p>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.

 <p>[Picture follows]

-<p>13/7/96  |  Driving to Austria |  Tina &amp; MikeTA &amp; Corrosion the Metro </p>
+<p>13/7/96  |  Driving to Austria |  Tina &amp; Mike TA &amp; Corrosion the Metro </p>

  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!

 <hr />

-<p>13/7/96 |Trouble free motoring in the badvan | J.Todd &amp; Wookey  </p>
+<p>13/7/96 |Trouble free motoring in the badvan | J Todd &amp; Wookey  </p>

 <p> BECKA - guessed date as 13/7 </p>

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

 <hr />

-<p><a id="id1996-161-12">14/7/96</a> | Puerile Humour | <u>Lumatt</u> + Ralph </p>
+<p><a id="id1996-161-12">14/7/96</a> | Puerile Humour | <u>Lummat</u> + Ralph </p>

 <p>Excellent stroll to this series. Pitch '(20m?)' descended 7m on 2 naturals
 across traverse (<u>N</u>ATURALS <u>C</u>ITY 1) 3m to top of NC2. On left at
@@ -579,7 +579,7 @@ pitch. Surveyed out.

 <hr />

-<p><a id="id1996-161-16">15/7/96</a> | Puerile Humour cont. | <u>Lumatt</u> + Sam </p>
+<p><a id="id1996-161-16">15/7/96</a> | Puerile Humour cont. | <u>Lummat</u> + Sam </p>

 <p>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).

 <p>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 &lt;Lumatts Folly&gt;, a large
+pitch descends (QM). Continuing up enters &lt;Lummats Folly&gt;, 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

 <hr />

-<p><a id="id1996-161-18">15/7/96</a> | Question mark extermination trip | JulianH, <u>MikeTA</u> </p>
+<p><a id="id1996-161-18">15/7/96</a> | Question mark extermination trip | JulianH, <u>Mike TA</u> </p>

 <dl>
 <dt>(a)<dd>
@@ -680,7 +680,7 @@ Derigged &amp; came out.

 <hr />

-<p><a id="id1996-161-7">13/7/96</a> | Trip to climb pitch in bugger | Juliet, Andy, Andy, <u>Dave</u> </p>
+<p><a id="id1996-161-7">13/7/96</a> | Trip to climb pitch in bugger | Juliet, AndyC, AndrewA, <u>DavidF</u> </p>

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

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

 <hr />

-<p><a id="id1996-161-11">14/7/96</a>| Surveying in bugger  |   Juliet, AndrewA, Dave   </p>
+<p><a id="id1996-161-11">14/7/96</a>| Surveying in bugger  |   Juliet, AndrewA, DavidF   </p>

 <p>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.

 <hr />

-<p><a id="id1996-161-17">15/7/96</a> | In bugger again | <u>Dave</u> Andy C. </p>
+<p><a id="id1996-161-17">15/7/96</a> | In bugger again | <u>DavidF</u>, Andy C </p>

 <p>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.

 <hr />

-<p align=right><a id="id1996-161-20">16/7/96</a> | More along the Purile Series. | Sam, Brian </p>
+<a id="id1996-161-20">16/7/96</a> | More along the Purile Series. | Sam, Brian </p>

 <p>Started by rigging pitch on other side of 'wall' noted by lummat &amp; 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.

 <hr />

-<p> 13/7/96 | Pushing 95/31a |  <a id="id1996-161-10"><u>Dunk</u></a>, Phil, Phil, Gunilla </p>
+<p> 13/7/96 | Pushing 95/31a |  <a id="id1996-161-10"><u>Dunks</u></a>, PhilB, PhilU, Gunilla </p>


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

 <hr />

-<p> 16/7/96 | Surveying 95/31 (or "Anthony's attempt on the title fuckwit of the week") | <a id="id1996-161-21">Duncan</a>, Godzilla &amp; <u>Anthony</u></p>
+<p> 16/7/96 | Surveying 95/31 (or "Anthony's attempt on the title fuckwit of the week") | <a id="id1996-161-21">Duncan</a>, Gunilla &amp; <u>Anthony</u></p>

 <p>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.

 <hr />

-<p><a id="id1996-161-24">17/7/96</a> | Qmark extermination trip  | Tina, <u>MikeTA</u>    </p>
+<p><a id="id1996-161-24">17/7/96</a> | Qmark extermination trip  | Tina, <u>Mike TA</u>    </p>

 <p>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.

 <hr />

-<p><a id="id1996-161-23">17/7/96</a> | Surveying in Henri's Cat - 161d | AndyA, DaveF, Becka, <u>JulianT</u> </p>
+<p><a id="id1996-161-23">17/7/96</a> | Surveying in Henri's Cat - 161d | AndrewA, DavidF, Becka, <u>JulianT</u> </p>

 <p>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?

 <hr />

-<p><a id="id1996-161-28">18/7/96</a>| BEYOND 'DEAD BAT CHAMBER' | SAM + <u>LUMATT</u></p>
+<p><a id="id1996-161-28">18/7/96</a>| BEYOND 'DEAD BAT CHAMBER' | SAM + <u>LUMMAT</u></p>

 <p>Started by surveying by-pass to &lt;Penguin Falls&gt;. From &lt;5-Ways&gt;
 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.

 <hr />

-<p><a id="id1996-161-25">17/7</a> | Interview Blues | <u>Nick</u> &amp; Paul </p>
+<p><a id="id1996-161-25">17/7/96</a> | Interview Blues | <u>Nick</u> &amp; Paul </p>

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

 <hr />

-<p> <a id="id1996-161-27">18/7</a> | Interview Blues |  <u>Nick</u> &amp; Brian </p>
+<p> <a id="id1996-161-27">18/7/96</a> | Interview Blues |  <u>Nick</u> &amp; Brian </p>

 <p>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)

 <hr />

-<p><a id="id1996-161-29">18/7/96</a><br> | Finishing Henri's Cat | <u>Dave F</u>  Becka     </p>
+<p><a id="id1996-161-29">18/7/96</a> | Finishing Henri's Cat | <u>DavidF</u>,  Becka     </p>

 <p>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.

 <hr />

-<p><a id="id1996-161-31">18/7/96</a> | Push/Survey QM 95-34 (rift by Ring Piece Junction) | <p>Duncan, Gunilla, Steve and <u>Anthony</u> </p>
+<p><a id="id1996-161-31">18/7/96</a> | Push/Survey QM 95-34 (rift by Ring Piece Junction) | Duncan, Gunilla, Steve and <u>Anthony</u> </p>

 <p>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....

 <hr />

-<p><a id="id1996-161-32"><u>18/7/96</u></a>| Pitch in Genital wart | Phil U  <u>Andy C</u>   </p>
+<p><a id="id1996-161-32">18/7/96</a>| Pitch in Genital wart | Phil U,  <u>Andy C</u>   </p>

 <p>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 <u>PhilU</u>

 <hr />

-<p><a id="id1996-161-37">19-JULY-1996</a><br> | Alternative Universe |  <u>MIKE</u>'N' TINA </p>
+<p><a id="id1996-161-37">19/7/1996</a><br> | Alternative Universe |  <u>MIKE</u>+ TINA </p>

 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: <a href="#id1996-161-43">Bounce Rift and 161e</a> -

 <hr />

-<p><a id="id1996-161-39">20/7/96</a> | Interview Blues | <u>Nick</u>, Becka, Anthony and Becka's Banana go down  </p>
+<p><a id="id1996-161-39">20/7/96</a> | Interview Blues | <u>Nick</u>, Becka, Anthony  </p>

 <p>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 &amp; Paul to put in another bolt before following me out.

 <hr />

-<p><a id="id1996-161-42">21/7/96</a> |  5-Ways area |  Sam, <u>Lumatt</u> + Craig  </p>
+<p><a id="id1996-161-42">21/7/96</a> |  5-Ways area |  Sam, <u>Lummat</u> + Craig  </p>

 <p>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.

 <hr />

-<p><a id="id1996-161-49">22-7-96</a> | Alternative Universe | <u>Penny</u>, Mike, Tina </p>
+<p><a id="id1996-161-49">22/7/96</a> | Alternative Universe | <u>Penny</u>, Mike, Tina </p>

 <p>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</p>

 <p>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.

 <p>[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 &amp; then through another 8" slot in mus - &amp; 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 &amp;
+entrance (161E). Then heard a noise - "Hello." Ye Gods! Sam, Lummat &amp;
 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 &amp; 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) &amp; 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 &amp; 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 &amp; did more red
@@ -1468,7 +1468,7 @@ Other trip (same day): <a href="#id1996-161-45">Brian, Lummat &amp; Co.</a> /

 <hr />

-<p><a id="id1996-161-51">23/7/96</a> | Traverse over Gizza Job pitch | DaveF + <u>Becka</u>  </p>
+<p><a id="id1996-161-51">23/7/96</a> | Traverse over Gizza Job pitch | DavidF + <u>Becka</u>  </p>

 <p>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: <a href="#id1996-161-67">First</a> and

 <hr />

-<p><a id="id1996-161-57">24/7/96</a>  | Surveying = 161d | Anthony, Phil U + <u>Becka</u>
+<p><a id="id1996-161-57">24/7/96</a>  | Surveying - 161d | Anthony, Phil U + <u>Becka</u></p>

 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.

 <hr />

-<p><a id="id1996-161-58">24/7/96</a>  | Photo trip - 161d | <u>SAM</u>, WOOKS, ANDY A, ANDY W, JULIETTE M </p>
+<p><a id="id1996-161-58">24/7/96</a>  | Photo trip - 161d | <u>SAM</u>, WOOKEY, ANDY A, ANDY W, JULIET M </p>

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

 <hr />

-<p><a id="id1996-161-35">19/7/96</a> | HAMMEROIDS | <u>DUNK</u>, PAUL + GUNILLA</p>
+<p><a id="id1996-161-35">19/7/96</a> | HAMMEROIDS | <u>DUNKS</u>, PAUL + GUNILLA</p>

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

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

 <hr />

-<p><a id="id1996-161-59">24.7.96</a>  | Touristing |  Petel &amp; <u>Clive</u> </p>
+<p><a id="id1996-161-59">24/7/96</a>  | Touristing |  Petel &amp; <u>Clive</u> </p>

 <p>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

 <hr />

-<p><a id="id1996-161-30">18-7-96</a>  | Trying to avoid 'Stairway to Hell'  Part 1 |  <u>ChrisD</u>, Andrew, JulianH<br> </p>
+<p><a id="id1996-161-30">18/7/96</a>  | Trying to avoid 'Stairway to Hell'  Part 1 |  <u>ChrisD</u>, Andrew, JulianH<br> </p>

 <p>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.

 <hr />

-<p><a id="id1996-161-34">19-7-96</a> | 161d |  Wookey &amp; <u>Chris</u>  </p>
+<p><a id="id1996-161-34">19/7/96</a> | 161d |  Wookey &amp; <u>Chris</u>  </p>

 <p>Connected up survey at Knossos. Came back &amp; 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.

 <hr />

-<p>20-7-96 | Avoiding Stairway to Hell Pt3. |  JulianH, <u>ChrisD</u> </p>
+<p>20/7/96 | Avoiding Stairway to Hell Pt3. |  JulianH, <u>ChrisD</u> </p>

 <p>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

 <hr />

-<p><a id="id1996-161-40">21-7-96</a> | Stairway to Hell |  JulianH, <u>ChrisD</u>  </p>
+<p><a id="id1996-161-40">21/7/96</a> | Stairway to Hell |  JulianH, <u>ChrisD</u>  </p>

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

 <hr />

-<p><a id="id1996-161-60">25-7-96</a> | Forbidden Land |  Andrew, Lummat, <u>ChrisD</u>  </p>
+<p><a id="id1996-161-60">25/7/96</a> | Forbidden Land |  Andrew, Lummat, <u>ChrisD</u>  </p>

 <p>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, &amp; the
@@ -1933,7 +1933,7 @@ other pitch would be better! We came out.

 <hr />

-<p><a id="id1996-161-66">26/7/96</a>  | Tourist - 161d |  Mark M, Juliette K, <u>Julian T</u>, Ally G  </p>
+<p><a id="id1996-161-66">26/7/96</a>  | Tourist - 161d |  Mark M, Juliette K, <u>Julian T</u>, *Ally G  </p>

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

 <hr />

-<p><a id="id1996-161-50">23/7/96</a> | Choss Pot - 161d |  Ju K, Craig, <u>Mark M</u>  </p>
+<p><a id="id1996-161-50">23/7/96</a> | Choss Pot - 161d |  Juliette K, Craig, <u>Mark M</u>  </p>

 <p>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.

 <hr />

-<p>22/7/96<a id="id1996-161-48"> | Go to the Forbidden Land | <u>Wook</u></a> &amp; AndyA </p>
+<p>22/7/96<a id="id1996-161-48"> | Go to the Forbidden Land | <u>Wook</u></a> &amp; AndrewA </p>

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

 <p align=right>T/U 8hrs</p>

-<p><a href="#id1996-161-40">Previous trip</a> /
-<a href="#id1996-161-60">Next trip</a>
-
-<hr />

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

 <hr />

-<p><a id="id1996-161-65">26.07.96</a> | Alternative Universe | TINA &amp; <u>MIKE</u> &amp; PENNY     </p>
+<p><a id="id1996-161-65">26/07/96</a> | Alternative Universe | TINA &amp; <u>MIKE</u> &amp; PENNY     </p>

 <p>Went to look at holes in Alternative Universe. Penny &amp; 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 &amp; spent carbide.

 <hr />

-<p><a id="id1996-161-69">1996.07.28</a> | To the Forbidden Land again | <u>Wook</u> &amp; AndyA </p>
+<p><a id="id1996-161-69">28/07/1996</a> | To the Forbidden Land again | <u>Wook</u> &amp; AndrewA </p>

 <p>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.

 <hr />

-<p><a id="id1996-161-71">29/7/96</a> | IB, where else? | <u>Nick</u> Brian &amp; Craig </p>
+<p><a id="id1996-161-71">29/7/96</a> | IB, where else? | <u>Nick</u>, Brian &amp; Craig </p>

 <p>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.

 <hr />

-<p><a id="id1996-161-74">31/7/96</a>  | No prizes for guessing where | <u>Nick</u>, Brian, Dunk </p>
+<p><a id="id1996-161-74">31/7/96</a>  | No prizes for guessing where | <u>Nick</u>, Brian, Dunks </p>

 <p>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 ?

 <hr />

-<p> 29/7 | Rig/survey/Derig 136 | Wookey &amp; <u>Anthony</u> </p>
+<p> 29/7/96 | Rig/survey/Derig 136 | Wookey &amp; <u>Anthony</u> </p>

 <p>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....

 <hr />

-<p> 31/7/96 |  There 'n' back | <u>Clive</u> 'n' DaveK/Craig or DaveF/Sam </p>   
+<p> 31/7/96 |  There 'n' back | <u>Clive</u>, DaveH,Craig</p>   

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

 <p>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  )

 <hr />

-<center><h3>MISSING TRIPS</h3></center>

 <p><a id="id1996-161-14">14/7/96</a> | Pushing trip connected Shortage of Walls to Rich Tea via the Teapot |  JulianH &amp; Gill </p>

+<p>MISSING</p>
+
 <p align=right>TU 7 hours</p>

 <p><a href="#id1996-161-19">Next trip</a>
@@ -2335,6 +2332,8 @@ DaveF Sam  )

 <p><a id="id1996-161-15">14/7/96</a> | Pushing trip which found Dr Snuggles etc. |  Duncan, PhilB, Gunilla </p>

+<p>MISSING</p>
+
 <p align=right>TU 5 &frac12;</p>

 <hr />
@@ -2346,7 +2345,7 @@ and went home. (email from Pete 97/02/13)" TU 2&frac12;

 <hr />

-<p><a id="id1996-161-63">26/7/96</a> | Push/survey pitch at end Fogie's Folly/Wheelchair Access | Jeremy, MarkF (and Tony, DaveH in call-out book) </p>
+<p><a id="id1996-161-63">26/7/96</a> | Push/survey pitch at end Fogie's Folly/Wheelchair Access | Jeremy, MarkF, Tony, DaveH </p>

 <p>(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