[Spambayes-checkins] spambayes/Outlook2000 export.py,1.11,1.12

[Tim Peters]

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

Modified Files:
	export.py 
Log Message:
Factored out some duplicated count into new count_messages() function.


Index: export.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/export.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** export.py	25 Dec 2003 18:57:56 -0000	1.11
--- export.py	25 Dec 2003 19:09:08 -0000	1.12
***************
*** 7,22 ****
  DEFAULT_DIRECTORY = "..\\testtools\\Data"
  
  def BuildBuckets(manager):
      store = manager.message_store
      config = manager.config
      num_ham = num_spam = 0
      for folder in store.GetFolderGenerator(config.training.spam_folder_ids,
                                             config.training.spam_include_sub):
!         for msg in folder.GetMessageGenerator():
!             num_spam += 1
      for folder in store.GetFolderGenerator(config.training.ham_folder_ids,
                                             config.training.ham_include_sub):
!         for msg in folder.GetMessageGenerator():
!             num_ham += 1
      num_buckets = min(num_ham, num_spam)/ FILES_PER_DIRECTORY
      dirs = []
--- 7,29 ----
  DEFAULT_DIRECTORY = "..\\testtools\\Data"
  
+ # Return # of msgs in folder (a MAPIMsgStoreFolder).
+ def count_messages(folder):
+     result = 0
+     for msg in folder.GetMessageGenerator():
+         result += 1
+     return result
+ 
  def BuildBuckets(manager):
      store = manager.message_store
      config = manager.config
+ 
      num_ham = num_spam = 0
      for folder in store.GetFolderGenerator(config.training.spam_folder_ids,
                                             config.training.spam_include_sub):
!         num_spam += count_messages(folder)
      for folder in store.GetFolderGenerator(config.training.ham_folder_ids,
                                             config.training.ham_include_sub):
!         num_ham += count_messages(folder)
! 
      num_buckets = min(num_ham, num_spam)/ FILES_PER_DIRECTORY
      dirs = []
***************
*** 54,57 ****
--- 61,66 ----
      return num
  
+ # This does all the work.  'directory' is the parent directory for the
+ # generated Ham and Spam sub-folders.
  def export(directory):
      print "Loading bayes manager..."