[Spambayes-checkins] spambayes pop3proxy.py,1.59,1.60

[Tim Stone]

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

Modified Files:
	pop3proxy.py 
Log Message:
Added option to disable caching of messages per feature request 690928

Index: pop3proxy.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/pop3proxy.py,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** pop3proxy.py	4 Mar 2003 18:25:55 -0000	1.59
--- pop3proxy.py	6 Mar 2003 14:13:34 -0000	1.60
***************
*** 83,88 ****
   o "Send me a status email every [...] telling how many mails have been
     classified, etc."
-  o Possibly integrate Tim Stone's SMTP code - make it use async, make
-    the training code update (rather than replace!) the database.
   o Remove any existing X-Spambayes-Classification header from incoming
     emails.
--- 83,86 ----
***************
*** 507,512 ****
              if command == 'RETR' and not state.isTest:
                  if options.pop3proxy_add_mailid_to.find("header") != -1:
!                     id_header = options.pop3proxy_mailid_header_name + ": " \
!                             + messageName + "\r\n"
                  if options.pop3proxy_add_mailid_to.find("body") != -1:
                      body = body[:len(body)-3] + \
--- 505,510 ----
              if command == 'RETR' and not state.isTest:
                  if options.pop3proxy_add_mailid_to.find("header") != -1:
!                     id_header = options.pop3proxy_mailid_header_name \
!                             + ": " + messageName + "\r\n"
                  if options.pop3proxy_add_mailid_to.find("body") != -1:
                      body = body[:len(body)-3] + \
***************
*** 536,540 ****
  
              # Cache the message; don't pollute the cache with test messages.
!             if command == 'RETR' and not state.isTest:
                  # Write the message into the Unknown cache.
                  message = state.unknownCorpus.makeMessage(messageName)
--- 534,539 ----
  
              # Cache the message; don't pollute the cache with test messages.
!             if command == 'RETR' and not state.isTest \
!                     and options.pop3proxy_cache_messages:
                  # Write the message into the Unknown cache.
                  message = state.unknownCorpus.makeMessage(messageName)