[Spambayes-checkins] spambayes/Outlook2000 train.py,1.24,1.25

[Mark Hammond]

Update of /cvsroot/spambayes/spambayes/Outlook2000
In directory sc8-pr-cvs1:/tmp/cvs-serv19880

Modified Files:
	train.py 
Log Message:
Allow messages to be scored after training.


Index: train.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/train.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** train.py	4 Feb 2003 02:19:05 -0000	1.24
--- train.py	17 Mar 2003 01:24:28 -0000	1.25
***************
*** 98,102 ****
  
  # Called back from the dialog to do the actual training.
! def trainer(mgr, progress, rebuild):
      config = mgr.config
      if rebuild:
--- 98,102 ----
  
  # Called back from the dialog to do the actual training.
! def trainer(mgr, progress, rebuild, rescore = True):
      config = mgr.config
      if rebuild:
***************
*** 133,136 ****
--- 133,146 ----
          return
      progress.set_status("Completed training with %d spam and %d good messages" % (bayes.nspam, bayes.nham))
+     if rescore:
+         # Setup the "filter now" config to what we want.
+         config = mgr.config.filter_now
+         config.only_unread = False
+         config.only_unseen = False
+         config.action_all = False
+         config.folder_ids = mgr.config.training.ham_folder_ids + mgr.config.training.spam_folder_ids
+         config.include_sub = mgr.config.training.ham_include_sub or mgr.config.training.spam_include_sub
+         import filter
+         filter.filterer(mgr, progress)
  
  def main():