popfile-commit Mailing List for POPFile - Automatic Email Classification (Page 145)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv32380

Modified Files:
	Bayes.pm 
Log Message:
prevent duplicates, header saving and message over-writing when toptoo is enabled
[ 701390 ] -toptoo 1 results in duplicates in history
[ 705448 ] Right Classification, Wrong Headers


Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.137
retrieving revision 1.138
diff -C2 -d -r1.137 -r1.138
*** Bayes.pm	26 Apr 2003 04:22:54 -0000	1.137
--- Bayes.pm	26 Apr 2003 09:43:20 -0000	1.138
***************
*** 772,775 ****
--- 772,776 ----
  # $nosave   - indicates that the message downloaded should not be saved in the history
  # $class    - if we already know the classification
+ # $echo     - 1 to echo to the client, 0 to supress, defaults to 1
  #
  # Returns a classification if it worked, otherwise returns an empty string
***************
*** 778,782 ****
  sub classify_and_modify
  {
!     my ( $self, $mail, $client, $dcount, $mcount, $nosave, $class ) = @_;
  
      my $msg_subject     = '';     # The message subject
--- 779,785 ----
  sub classify_and_modify
  {
!     my ( $self, $mail, $client, $dcount, $mcount, $nosave, $class, $echo ) = @_;
!     
!     $echo = 1 unless (defined $echo);
  
      my $msg_subject     = '';     # The message subject
***************
*** 843,859 ****
                  $message_size += length $line;
                  print TEMP $fileline;
! 
!                 if ( $line =~ /^Subject:(.*)/i )  {
!                     $msg_subject = $1;
!                     $msg_subject =~ s/(\012|\015)//g;
!                     next;
!                 }
! 
!                 # Strip out the X-Text-Classification header that is in an incoming message
!                 if ( ( $line =~ /^X-Text-Classification:/i ) == 0 ) {
!                     if ( $msg_subject eq '' )  {
!                         $msg_head_before .= $line;
!                     } else {
!                         $msg_head_after  .= $line;
                      }
                  }
--- 846,867 ----
                  $message_size += length $line;
                  print TEMP $fileline;
!                 
!                 # If there is no echoing occuring, it doesn't matter what we do to these
!                 
!                 if ($echo) {
!     
!                     if ( $line =~ /^Subject:(.*)/i )  {
!                         $msg_subject = $1;
!                         $msg_subject =~ s/(\012|\015)//g;
!                         next;
!                     }
!     
!                     # Strip out the X-Text-Classification header that is in an incoming message
!                     if ( ( $line =~ /^X-Text-Classification:/i ) == 0 ) {
!                         if ( $msg_subject eq '' )  {
!                             $msg_head_before .= $line;
!                         } else {
!                             $msg_head_after  .= $line;
!                         }
                      }
                  }
***************
*** 871,875 ****
          # Check to see if too much time has passed and we need to keep the mail client happy
          if ( time > ( $last_timeout + 2 ) ) {
!             print $client "X-POPFile-TimeoutPrevention: $timeout_count$eol" if ( !$nosave );
              $timeout_count += 1;
              $last_timeout = time;
--- 879,883 ----
          # Check to see if too much time has passed and we need to keep the mail client happy
          if ( time > ( $last_timeout + 2 ) ) {
!             print $client "X-POPFile-TimeoutPrevention: $timeout_count$eol" if ( $echo );
              $timeout_count += 1;
              $last_timeout = time;
***************
*** 925,929 ****
      # Echo the text of the message to the client
  
!     if ( !$nosave ) {
  
          # If the bucket is quarantined then we'll treat it specially by changing the message header to contain
--- 933,937 ----
      # Echo the text of the message to the client
  
!     if ( $echo ) {
  
          # If the bucket is quarantined then we'll treat it specially by changing the message header to contain
***************
*** 967,979 ****
  
      if ( $got_full_body == 0 )    {
!         $self->echo_to_dot_( $mail, $client ) if ( !$nosave );
      } else {
          if ( $classification ne 'unclassified' ) {
!             if ( $self->{parameters__}{$classification}{quarantine} == 1 ) {
                  print $client "$eol--$temp_file$eol";
! 	    }
          }
  
!         print $client ".$eol" if ( !$nosave );
      }
  
--- 975,987 ----
  
      if ( $got_full_body == 0 )    {
!         $self->echo_to_dot_( $mail, $client ) if ( $echo );
      } else {
          if ( $classification ne 'unclassified' ) {
!             if ( ( $self->{parameters__}{$classification}{quarantine} == 1 ) && $echo ) {
                  print $client "$eol--$temp_file$eol";
! 	        }
          }
  
!         print $client ".$eol" if ( $echo );
      }

2003	Jan	Feb (160)	Mar (119)	Apr (111)	May (118)	Jun (101)	Jul (304)	Aug (113)	Sep (140)	Oct (137)	Nov (87)	Dec (122)
2004	Jan (78)	Feb (125)	Mar (131)	Apr (59)	May (121)	Jun (166)	Jul (150)	Aug (137)	Sep (73)	Oct (58)	Nov (27)	Dec (60)
2005	Jan (131)	Feb (84)	Mar (36)	Apr (8)	May (28)	Jun (20)	Jul (10)	Aug (72)	Sep (76)	Oct (34)	Nov (3)	Dec (29)
2006	Jan (13)	Feb (92)	Mar (7)	Apr (1)	May (1)	Jun (2)	Jul (4)	Aug (17)	Sep (5)	Oct (2)	Nov (8)	Dec (12)
2007	Jan (28)	Feb (15)	Mar	Apr	May (8)	Jun (4)	Jul (5)	Aug (8)	Sep (20)	Oct (38)	Nov (65)	Dec (92)
2008	Jan (21)	Feb (56)	Mar (27)	Apr (174)	May (25)	Jun	Jul	Aug	Sep	Oct	Nov	Dec

popfile-commit Mailing List for POPFile - Automatic Email Classification (Page 145)

popfile-commit — CVS commit list messages