Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv10596/Classifier
Modified Files:
Bayes.pm MailParse.pm
Log Message:
Restore mail parsing tests to working order
Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.201
retrieving revision 1.202
diff -C2 -d -r1.201 -r1.202
*** Bayes.pm 29 Sep 2003 21:54:44 -0000 1.201
--- Bayes.pm 29 Sep 2003 23:19:45 -0000 1.202
***************
*** 160,164 ****
# ---------------------------------------------------------------------------------------------
#
! # forked
#
# This is called inside the parent process that has just forked, since the parent needs access
--- 160,164 ----
# ---------------------------------------------------------------------------------------------
#
! # postfork
#
# This is called inside the parent process that has just forked, since the parent needs access
Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.164
retrieving revision 1.165
diff -C2 -d -r1.164 -r1.165
*** MailParse.pm 29 Sep 2003 21:54:44 -0000 1.164
--- MailParse.pm 29 Sep 2003 23:19:45 -0000 1.165
***************
*** 978,982 ****
my $found = 1;
- my $non_html = '';
$line =~ s/[\r\n]+//gm;
--- 978,981 ----
***************
*** 1034,1038 ****
} else {
$self->{html_arg__} .= $line;
- $self->add_line( $non_html, $encoded, '' );
return 1;
}
--- 1033,1036 ----
***************
*** 1057,1061 ****
$self->{html_arg__} = $3;
$self->{in_html_tag__} = 1;
- $self->add_line( $non_html, $encoded, '' );
return 1;
}
--- 1055,1058 ----
***************
*** 1067,1075 ****
if ( $line =~ s/^([^<]+)(<|$)/$2/ ) {
$found = 1;
! $non_html .= $1;
}
}
-
- $self->add_line( $non_html, $encoded, '' );
return 0;
--- 1064,1070 ----
if ( $line =~ s/^([^<]+)(<|$)/$2/ ) {
$found = 1;
! $self->add_line( $1, $encoded, '' );
}
}
return 0;
|
