[Spambayes-checkins] spambayes/spambayes ImapUI.py,1.47,1.48

[Tony Meyer]

Update of /cvsroot/spambayes/spambayes/spambayes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16550/spambayes

Modified Files:
	ImapUI.py 
Log Message:
Handle database changes while filter is running.

Actually, there will still be problems if it is changing while the filter is actually
 running, rather than waiting to run next; fixing that would be somewhat more complicated.

Index: ImapUI.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/ImapUI.py,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** ImapUI.py	13 May 2005 04:24:27 -0000	1.47
--- ImapUI.py	28 Nov 2005 10:57:07 -0000	1.48
***************
*** 13,22 ****
  The following functions are currently included:
  [From the base class UserInterface]
!   onClassify - classify a given message
!   onWordquery - query a word from the database
!   onTrain - train a message or mbox
!   onSave - save the database and possibly shutdown
  [Here]
!   onHome - a home page with various options
  
  To do:
--- 13,22 ----
  The following functions are currently included:
  [From the base class UserInterface]
!     onClassify - classify a given message
!     onWordquery - query a word from the database
!     onTrain - train a message or mbox
!     onSave - save the database and possibly shutdown
  [Here]
!     onHome - a home page with various options
  
  To do:
***************
*** 125,129 ****
      """Serves the HTML user interface for the proxies."""
      def __init__(self, cls, imaps, pwds, imap_session_class,
!                  lang_manager=None, stats=None):
          global parm_map
          # Only offer SSL if it is available
--- 125,130 ----
      """Serves the HTML user interface for the proxies."""
      def __init__(self, cls, imaps, pwds, imap_session_class,
!                  lang_manager=None, stats=None,
!                  close_db=None, change_db=None):
          global parm_map
          # Only offer SSL if it is available
***************
*** 143,146 ****
--- 144,149 ----
          self.app_for_version = "SpamBayes IMAP Filter"
          self.imap_session_class = imap_session_class
+         self.close_database = close_db
+         self.change_db = change_db
  
      def onHome(self):
***************
*** 175,183 ****
          restores the defaults."""
          # Re-read the options.
-         self.classifier.store()
          import Options
          Options.load_options()
          global options
          from Options import options
  
      def onSave(self, how):
--- 178,186 ----
          restores the defaults."""
          # Re-read the options.
          import Options
          Options.load_options()
          global options
          from Options import options
+         self.change_db()
  
      def onSave(self, how):