[pybot-commits] CVS: pybot/pybot/modules log.py,1.13,1.14 servercontrol.py,1.3,1.4

[Gustavo N. <nie...@us...>]

Update of /cvsroot/pybot/pybot/pybot/modules
In directory sc8-pr-cvs1:/tmp/cvs-serv29789/pybot/modules

Modified Files:
	log.py servercontrol.py 
Log Message:
* modules/servercontrol.py: Minor typos fixed.
* modules/log.py: Only allow log searching inside
  the channel that the message has been typed.


Index: log.py
===================================================================
RCS file: /cvsroot/pybot/pybot/pybot/modules/log.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** log.py	20 May 2003 17:06:53 -0000	1.13
--- log.py	19 Aug 2003 21:59:10 -0000	1.14
***************
*** 103,112 ****
          return None
  
!     def search(self, regexp, max, searchline):
          p = re.compile(regexp, re.I)
          l = []
          cursor = db.cursor()
!         cursor.execute("select * from log where src != '' and dest != '' "
!                        "order by timestamp")
          row = cursor.fetchone()
          while row:
--- 103,112 ----
          return None
  
!     def search(self, regexp, max, target, searchline):
          p = re.compile(regexp, re.I)
          l = []
          cursor = db.cursor()
!         cursor.execute("select * from log where src != '' and dest == %s "
!                        "order by timestamp", (target,))
          row = cursor.fetchone()
          while row:
***************
*** 169,173 ****
                      if not logmsg:
                          msg.answer("%:", "Sorry, I haven't seen %s for a while..." % nick)
!                     elif mm.hasperm(msg, "log"):
                          msg.answer("%:", "I have seen %s %s, with the "
                                           "following message:" %
--- 169,173 ----
                      if not logmsg:
                          msg.answer("%:", "Sorry, I haven't seen %s for a while..." % nick)
!                     elif mm.hasperm(msg, "log") and msg.target == logmsg.dest:
                          msg.answer("%:", "I have seen %s %s, with the "
                                           "following message:" %
***************
*** 191,195 ****
                      max = 5
                      logmsgs = self.log.search(m.group("regexp"), max,
!                                               msg.rawline)
                      if logmsgs:
                          llen = len(logmsgs)
--- 191,195 ----
                      max = 5
                      logmsgs = self.log.search(m.group("regexp"), max,
!                                               msg.target, msg.rawline)
                      if logmsgs:
                          llen = len(logmsgs)

Index: servercontrol.py
===================================================================
RCS file: /cvsroot/pybot/pybot/pybot/modules/servercontrol.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** servercontrol.py	12 May 2003 20:42:21 -0000	1.3
--- servercontrol.py	19 Aug 2003 21:59:10 -0000	1.4
***************
*** 391,398 ****
                              l.append("%s (hosts: %s)" %
                                       (servername, ", ".join(hosts)))
!                     msg.answer("%:", "You're connected to the following "
                                       "servers:", ", ".join(l))
                  else:
!                     msg.answer("%:", "You're not connected to any servers",
                                       [".", "!"])
              else:
--- 391,398 ----
                              l.append("%s (hosts: %s)" %
                                       (servername, ", ".join(hosts)))
!                     msg.answer("%:", "I'm connected to the following "
                                       "servers:", ", ".join(l))
                  else:
!                     msg.answer("%:", "I'm not connected to any servers",
                                       [".", "!"])
              else: