ChatLogTracker._onboard_event takes a vessel argument

diff --git a/yoweb-scrape b/yoweb-scrape
index 720e886769131f60d64f854f9b26576a5d4ffe86..93ce3177b59d5370da7b90544b9bd21a98ec5990 100755 (executable)
--- a/yoweb-scrape
+++ b/yoweb-scrape
@@ -436,18 +436,17 @@ class ChatLogTracker:
        def force_redisplay(self):
                self._need_redisplay = True
 
        def force_redisplay(self):
                self._need_redisplay = True
 

-       def _onboard_event(self,timestamp,pirate,event):
-               try: pa = self._pl[pirate]
-               except KeyError: pa = None
-               if pa is not None and pa.v is self._v:
+       def _onboard_event(self,v,timestamp,pirate,event):
+               pa = self._pl.get(pirate, None)
+               if pa is not None and pa.v is v:

                        pa.last_time = timestamp
                        pa.last_event = event
                else:
                        if pa is not None: del pa.v[pirate]
                        pa.last_time = timestamp
                        pa.last_event = event
                else:
                        if pa is not None: del pa.v[pirate]

-                       pa = PirateAboard(pirate, self._v, timestamp, event)
+                       pa = PirateAboard(pirate, v, timestamp, event)

                        self._pl[pirate] = pa
                        self._pl[pirate] = pa

-                       self._v[pirate] = pa
-               self._v['#lastinfo'] = timestamp
+                       v[pirate] = pa
+               v['#lastinfo'] = timestamp

                self.force_redisplay()
                return pa
 
                self.force_redisplay()
                return pa
 


@@ -518,15 +517,16 @@ class ChatLogTracker:
 
                l = l[l.find(' ')+1:]
 
 
                l = l[l.find(' ')+1:]
 

-               def ob_x(who,event):
-                       return self._onboard_event(timestamp, who, event)
+               def ob_x(pirate,event):
+                       return self._onboard_event(
+                                       self._v, timestamp, pirate, event)

                def ob1(did): ob_x(m.group(1), did); return d(did)
                def oba(did): return ob1('%s %s' % (did, m.group(2)))
 
                def ob1(did): ob_x(m.group(1), did); return d(did)
                def oba(did): return ob1('%s %s' % (did, m.group(2)))
 

-               def disembark(who, how):
-                       ob_x(who, 'leaving '+how)
-                       del self._v[who]
-                       del self._pl[who]
+               def disembark(pirate, event):
+                       ob_x(pirate, 'leaving '+event)
+                       del self._v[pirate]
+                       del self._pl[pirate]

 
                m = rm('Going aboard the (\\S.*\\S)\\.\\.\\.$')
                if m:
 
                m = rm('Going aboard the (\\S.*\\S)\\.\\.\\.$')
                if m: