[popfile-commit] engine/Classifier Bayes.pm,1.153,1.154

[<jgr...@us...>]

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

Modified Files:
	Bayes.pm 
Log Message:
Tiny bit of cleanup (mostly whitespace) on Sam's cool TOP caching fix

Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.153
retrieving revision 1.154
diff -C2 -d -r1.153 -r1.154
*** Bayes.pm	24 Jun 2003 03:30:41 -0000	1.153
--- Bayes.pm	24 Jun 2003 13:38:26 -0000	1.154
***************
*** 836,841 ****
  {
      my ( $self, $dcount, $mcount, $ext) = @_;
!     
!     return $self->global_config_( 'msgdir' ) . "popfile$dcount" . "=$mcount" . (defined $ext?$ext:".msg");    
  }
  
--- 836,841 ----
  {
      my ( $self, $dcount, $mcount, $ext) = @_;
! 
!     return $self->global_config_( 'msgdir' ) . "popfile$dcount" . "=$mcount" . (defined $ext?$ext:'.msg');
  }
  
***************
*** 1572,1578 ****
  {
      my ( $self, $mail, $client, $file ) = @_;
!     
      # These if statements are repetitive to keep the inner loops efficient
!     
      if ( defined($file) && defined($client) ) {
          # echo to file and stream
--- 1572,1578 ----
  {
      my ( $self, $mail, $client, $file ) = @_;
! 
      # These if statements are repetitive to keep the inner loops efficient
! 
      if ( defined($file) && defined($client) ) {
          # echo to file and stream
***************
*** 1582,1589 ****
              # Check for an abort
              last if ( $self->{alive_} == 0 );
!     
              print $client $_;
              print FILE $_;
!     
              # The termination has to be a single line with exactly a dot on it and nothing
              # else other than line termination characters.  This is vital so that we do
--- 1582,1589 ----
              # Check for an abort
              last if ( $self->{alive_} == 0 );
! 
              print $client $_;
              print FILE $_;
! 
              # The termination has to be a single line with exactly a dot on it and nothing
              # else other than line termination characters.  This is vital so that we do
***************
*** 1598,1604 ****
              # Check for an abort
              last if ( $self->{alive_} == 0 );
!     
!             print $client $_;            
!     
              # The termination has to be a single line with exactly a dot on it and nothing
              # else other than line termination characters.  This is vital so that we do
--- 1598,1604 ----
              # Check for an abort
              last if ( $self->{alive_} == 0 );
! 
!             print $client $_;
! 
              # The termination has to be a single line with exactly a dot on it and nothing
              # else other than line termination characters.  This is vital so that we do
***************
*** 1613,1619 ****
              # Check for an abort
              last if ( $self->{alive_} == 0 );
!     
              print FILE $_;
!     
              # The termination has to be a single line with exactly a dot on it and nothing
              # else other than line termination characters.  This is vital so that we do
--- 1613,1619 ----
              # Check for an abort
              last if ( $self->{alive_} == 0 );
! 
              print FILE $_;
! 
              # The termination has to be a single line with exactly a dot on it and nothing
              # else other than line termination characters.  This is vital so that we do
***************
*** 1625,1632 ****
          # consume without echoing
  
!         while ( <$mail> ) {            
              # Check for an abort
              last if ( $self->{alive_} == 0 );
!     
              # The termination has to be a single line with exactly a dot on it and nothing
              # else other than line termination characters.  This is vital so that we do
--- 1625,1632 ----
          # consume without echoing
  
!         while ( <$mail> ) {
              # Check for an abort
              last if ( $self->{alive_} == 0 );
! 
              # The termination has to be a single line with exactly a dot on it and nothing
              # else other than line termination characters.  This is vital so that we do
***************
*** 1634,1638 ****
              last if ( /^\.(\r\n|\r|\n)$/ );
          }
!     }    
  }
  
--- 1634,1638 ----
              last if ( /^\.(\r\n|\r|\n)$/ );
          }
!     }
  }