[Spambayes-checkins] spambayes/Outlook2000 manager.py,1.50,1.51

[Mark Hammond]

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

Modified Files:
	manager.py 
Log Message:
Only attempt to create our fields on a mail item, and if no items are
found, don't attempt to recurse folders!

Fixes [ 696476 ] Manual filtering in outlook fails



Index: manager.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/manager.py,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** manager.py	4 Mar 2003 05:48:43 -0000	1.50
--- manager.py	4 Mar 2003 06:04:54 -0000	1.51
***************
*** 255,258 ****
--- 255,264 ----
          items = folder.Items
          item = items.GetFirst()
+         while item is not None:
+             if item.Class != win32com.client.constants.olMail:
+                 item = items.GetNext()
+                 continue
+             break
+         # OK - item is either a mail item, or None
          if item is not None:
              ups = item.UserProperties
***************
*** 280,291 ****
                            % (folder.Name.encode("mbcs", "replace"),)
                      print "", details
          # else no items in this folder - not much worth doing!
-         if include_sub:
-             # Recurse down the folder list.
-             folders = item.Folders
-             folder = folders.GetFirst()
-             while folder is not None:
-                 self.EnsureOutlookFieldsForFolder(folder.EntryID, True)
-                 folder = folders.GetNext()
  
      def LoadBayes(self):
--- 286,297 ----
                            % (folder.Name.encode("mbcs", "replace"),)
                      print "", details
+             if include_sub:
+                 # Recurse down the folder list.
+                 folders = item.Folders
+                 folder = folders.GetFirst()
+                 while folder is not None:
+                     self.EnsureOutlookFieldsForFolder(folder.EntryID, True)
+                     folder = folders.GetNext()
          # else no items in this folder - not much worth doing!
  
      def LoadBayes(self):