Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv2608
Modified Files:
Tag: b0/19/0
Bayes.pm
Log Message:
whitespace cleanup
cross-port of:
fix case where it was possible for messages to terminate without CRLF.CRLF (my fault)
Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.149.2.1
retrieving revision 1.149.2.2
diff -C2 -d -r1.149.2.1 -r1.149.2.2
*** Bayes.pm 15 Jul 2003 17:50:35 -0000 1.149.2.1
--- Bayes.pm 21 Jul 2003 08:38:44 -0000 1.149.2.2
***************
*** 264,271 ****
if ( $word ne '' ) {
$word =~ /^(.)/;
! my $i = ord($1);
$self->{matrix__}{$bucket}[$i] = '' if ( !defined($self->{matrix__}{$bucket}[$i]) );
! $self->{matrix__}{$bucket}[$i] .= "|$word $value|" if ( ( $self->{matrix__}{$bucket}[$i] =~ s/\|\Q$word\E [\-\.\d]+\|/\|$word $value\|/ ) == 0 );
}
}
--- 264,271 ----
if ( $word ne '' ) {
$word =~ /^(.)/;
! my $i = ord($1);
$self->{matrix__}{$bucket}[$i] = '' if ( !defined($self->{matrix__}{$bucket}[$i]) );
! $self->{matrix__}{$bucket}[$i] .= "|$word $value|" if ( ( $self->{matrix__}{$bucket}[$i] =~ s/\|\Q$word\E [\-\.\d]+\|/\|$word $value\|/ ) == 0 );
}
}
***************
*** 679,685 ****
$self->{scores__} .= "<input type=\"hidden\" name=\"count\" value=\"" . ($mlen + 1) . "\" />";
$self->{scores__} .= "<hr><b>$language{QuickMagnets}</b><p>\n<table class=\"top20Words\">\n<tr>\n<th scope=\"col\">$language{Magnet}</th>\n<th>$language{Magnet_Always}</th>\n";
!
my %types = get_magnet_types();
!
foreach my $type ( keys %types ) {
--- 679,685 ----
$self->{scores__} .= "<input type=\"hidden\" name=\"count\" value=\"" . ($mlen + 1) . "\" />";
$self->{scores__} .= "<hr><b>$language{QuickMagnets}</b><p>\n<table class=\"top20Words\">\n<tr>\n<th scope=\"col\">$language{Magnet}</th>\n<th>$language{Magnet_Always}</th>\n";
!
my %types = get_magnet_types();
!
foreach my $type ( keys %types ) {
***************
*** 687,713 ****
{
$i += 1;
!
!
$self->{scores__} .= "<tr><td scope=\"col\">$type: ";
$self->{scores__} .= "<select name=\"text$i\" id=\"\">\n";
!
foreach my $magnet ( 0 .. $#{$qm{$type}} ) {
$self->{scores__} .= "<option>" . Classifier::MailParse::splitline(@{$qm{$type}}[$magnet], 0) . "</option>\n";
}
! $self->{scores__} .= "</select>\n";
$self->{scores__} .= "</td><td>";
! $self->{scores__} .= "<input type=\"hidden\" name=\"type$i\" id=\"magnetsAddType\" value=\"$type\"/>";
$self->{scores__} .= "<select name=\"bucket$i\" id=\"magnetsAddBucket\">\n<option value=\"\"></option>\n";
!
foreach my $bucket (@buckets) {
$self->{scores__} .= "<option value=\"$bucket\">$bucket</option>\n";
}
!
$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> </th>\n";
--- 687,713 ----
{
$i += 1;
!
!
$self->{scores__} .= "<tr><td scope=\"col\">$type: ";
$self->{scores__} .= "<select name=\"text$i\" id=\"\">\n";
!
foreach my $magnet ( 0 .. $#{$qm{$type}} ) {
$self->{scores__} .= "<option>" . Classifier::MailParse::splitline(@{$qm{$type}}[$magnet], 0) . "</option>\n";
}
! $self->{scores__} .= "</select>\n";
$self->{scores__} .= "</td><td>";
! $self->{scores__} .= "<input type=\"hidden\" name=\"type$i\" id=\"magnetsAddType\" value=\"$type\"/>";
$self->{scores__} .= "<select name=\"bucket$i\" id=\"magnetsAddBucket\">\n<option value=\"\"></option>\n";
!
foreach my $bucket (@buckets) {
$self->{scores__} .= "<option value=\"$bucket\">$bucket</option>\n";
}
!
$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> </th>\n";
***************
*** 899,903 ****
if ( $line =~ /(^[ \t])|([:])/ ) {
if ( $msg_subject eq '' ) {
! $msg_head_before .= $msg_head_q . $line;
} else {
$msg_head_after .= $msg_head_q . $line;
--- 899,903 ----
if ( $line =~ /(^[ \t])|([:])/ ) {
if ( $msg_subject eq '' ) {
! $msg_head_before .= $msg_head_q . $line;
} else {
$msg_head_after .= $msg_head_q . $line;
***************
*** 906,914 ****
} else {
# Gather up any lines that are questionable
!
! $msg_head_q .= $line;
}
!
!
}
} else {
--- 906,914 ----
} else {
# Gather up any lines that are questionable
!
! $msg_head_q .= $line;
}
!
!
}
} else {
***************
*** 1033,1041 ****
if ( ( $self->{parameters__}{$classification}{quarantine} == 1 ) && $echo ) {
print $client "$eol--$temp_file--$eol";
! }
}
if ( $got_full_body == 1 ) {
! print $client ".$eol" if ( $echo );
}
--- 1033,1041 ----
if ( ( $self->{parameters__}{$classification}{quarantine} == 1 ) && $echo ) {
print $client "$eol--$temp_file--$eol";
! }
}
if ( $got_full_body == 1 ) {
! print $client "$eol.$eol" if ( $echo );
}
***************
*** 1138,1142 ****
my $value = $self->get_value_( $bucket, $word );
!
return int( exp( $value ) * $self->get_bucket_word_count( $bucket ) + 0.5 );
}
--- 1138,1142 ----
my $value = $self->get_value_( $bucket, $word );
!
return int( exp( $value ) * $self->get_bucket_word_count( $bucket ) + 0.5 );
}
***************
*** 1468,1472 ****
# Check for an abort
last if ( $self->{alive_} == 0 );
!
print $client $_ if ( defined( $client ) );
--- 1468,1472 ----
# Check for an abort
last if ( $self->{alive_} == 0 );
!
print $client $_ if ( defined( $client ) );
|
