popfile-commit

[<ssc...@us...>]

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

Modified Files:
	Bayes.pm 
Log Message:
prevent double CRLF.CRLF on long messages
prevent CRLF.CRLF from being echoed to files
added comments to echo_to_dot clarifying that CRLF.CRLF is consumed
cleanup some tabs

Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.168
retrieving revision 1.169
diff -C2 -d -r1.168 -r1.169
*** Bayes.pm	15 Jul 2003 02:43:44 -0000	1.168
--- Bayes.pm	17 Jul 2003 04:48:42 -0000	1.169
***************
*** 744,751 ****
                      $self->{scores__} .= "</select></td></tr>";
                  }
! 	    }
  
              $self->{scores__} .= "<tr><td></td><td><input type=\"submit\" class=\"submit\" name=\"create\" value=\"$language{Create}\" /></td></tr></table></form>";
! 	}
  
          $self->{scores__} .= "<hr><b>$language{Scores}</b><p>\n<table class=\"top20Words\">\n<tr>\n<th scope=\"col\">$language{Bucket}</th>\n<th>&nbsp;</th>\n";
--- 744,751 ----
                      $self->{scores__} .= "</select></td></tr>";
                  }
!             }
  
              $self->{scores__} .= "<tr><td></td><td><input type=\"submit\" class=\"submit\" name=\"create\" value=\"$language{Create}\" /></td></tr></table></form>";
!         }
  
          $self->{scores__} .= "<hr><b>$language{Scores}</b><p>\n<table class=\"top20Words\">\n<tr>\n<th scope=\"col\">$language{Bucket}</th>\n<th>&nbsp;</th>\n";
***************
*** 1211,1215 ****
      }
  
!     if ( $echo ) {
          print $client "$eol.$eol";
      }
--- 1211,1215 ----
      }
  
!     if ( $echo && $got_full_body ) {
          print $client "$eol.$eol";
      }
***************
*** 1662,1665 ****
--- 1662,1666 ----
  #
  # echo all information from the $mail server until a single line with a . is seen
+ # Also echoes the line with . to $client but not to $file
  #
  # ---------------------------------------------------------------------------------------------
***************
*** 1683,1696 ****
  
              if ( /^\.(\r\n|\r|\n)$/ ) {
! 	        if ( $before ne '' ) {
                      print $client $before;
                      print FILE    $before;
! 		}
  
                  print $client $_;
-                 print FILE    $_;
  
                  last;
! 	    }
  
              print $client $_;
--- 1684,1696 ----
  
              if ( /^\.(\r\n|\r|\n)$/ ) {
!                 if ( $before ne '' ) {
                      print $client $before;
                      print FILE    $before;
!                 }
  
                  print $client $_;
  
                  last;
!             }
  
              print $client $_;
***************
*** 1711,1722 ****
  
              if ( /^\.(\r\n|\r|\n)$/ ) {
! 	        if ( $before ne '' ) {
                      print $client $before;
! 		}
  
                  print $client $_;
  
                  last;
! 	    }
  
              print $client $_;
--- 1711,1722 ----
  
              if ( /^\.(\r\n|\r|\n)$/ ) {
!                 if ( $before ne '' ) {
                      print $client $before;
!                 }
  
                  print $client $_;
  
                  last;
!             }
  
              print $client $_;
***************
*** 1735,1746 ****
  
              if ( /^\.(\r\n|\r|\n)$/ ) {
! 	        if ( $before ne '' ) {
!                     print FILE $before;
! 		}
! 
!                 print FILE $_;
! 
                  last;
! 	    }
  
              print FILE $_;
--- 1735,1743 ----
  
              if ( /^\.(\r\n|\r|\n)$/ ) {
!                 if ( $before ne '' ) {
!                         print FILE $before;
!                 }
                  last;
!             }
  
              print FILE $_;