[Spambayes-checkins] spambayes/Outlook2000 addin.py,1.23,1.24 msgstore.py,1.16,1.17

[Mark Hammond]

Update of /cvsroot/spambayes/spambayes/Outlook2000
In directory usw-pr-cvs1:/tmp/cvs-serv14570

Modified Files:
	addin.py msgstore.py 
Log Message:
Fix a couple of places the "multiple stores" concept fell over.


Index: addin.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/addin.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** addin.py	1 Nov 2002 14:35:05 -0000	1.23
--- addin.py	1 Nov 2002 23:54:03 -0000	1.24
***************
*** 121,125 ****
          #     PR_RECEIVED_BY_ENTRYID
          #     PR_TRANSPORT_MESSAGE_HEADERS
!         msgstore_message = self.manager.message_store.GetMessage(item.EntryID)
          if msgstore_message.GetField(self.manager.config.field_score_name) is not None:
              # Already seem this message - user probably moving it back
--- 121,125 ----
          #     PR_RECEIVED_BY_ENTRYID
          #     PR_TRANSPORT_MESSAGE_HEADERS
!         msgstore_message = self.manager.message_store.GetMessage(item)
          if msgstore_message.GetField(self.manager.config.field_score_name) is not None:
              # Already seem this message - user probably moving it back
***************
*** 154,158 ****
          if not self.manager.config.training.train_manual_spam:
              return
!         msgstore_message = self.manager.message_store.GetMessage(item.EntryID)
          prop = msgstore_message.GetField(self.manager.config.field_score_name)
          if prop is not None:
--- 154,158 ----
          if not self.manager.config.training.train_manual_spam:
              return
!         msgstore_message = self.manager.message_store.GetMessage(item)
          prop = msgstore_message.GetField(self.manager.config.field_score_name)
          if prop is not None:
***************
*** 189,193 ****
          return
  
!     msgstore_message = mgr.message_store.GetMessage(item.EntryID)
      score, clues = mgr.score(msgstore_message, evidence=True, scale=False)
      new_msg = app.CreateItem(0)
--- 189,193 ----
          return
  
!     msgstore_message = mgr.message_store.GetMessage(item)
      score, clues = mgr.score(msgstore_message, evidence=True, scale=False)
      new_msg = app.CreateItem(0)

Index: msgstore.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/msgstore.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** msgstore.py	1 Nov 2002 14:35:06 -0000	1.16
--- msgstore.py	1 Nov 2002 23:54:03 -0000	1.17
***************
*** 206,211 ****
  
      def GetMessage(self, message_id):
!         # Return a single message given the ID.
!         message_id = self.NormalizeID(message_id)
          prop_ids = PR_PARENT_ENTRYID, PR_SEARCH_KEY, PR_CONTENT_UNREAD
          mapi_object = self._OpenEntry(message_id)
--- 206,217 ----
  
      def GetMessage(self, message_id):
!         # Return a single message given either the ID, or an Outlook
!         # message representing the object.
!         if hasattr(message_id, "EntryID"):
!             # A CDO object
!             message_id = mapi.BinFromHex(message_id.Parent.StoreID), \
!                          mapi.BinFromHex(message_id.EntryID)
!         else:
!             message_id = self.NormalizeID(message_id)
          prop_ids = PR_PARENT_ENTRYID, PR_SEARCH_KEY, PR_CONTENT_UNREAD
          mapi_object = self._OpenEntry(message_id)