Menu
▾
▴
popfile-commit — CVS commit list messages
You can subscribe to this list here.
| 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
|
|
From: <jgr...@us...> - 2003-07-12 06:17:07
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv21679/Classifier
Modified Files:
MailParse.pm
Log Message:
Add colorization test and improve TestMailParse to bring up to 91% coverage... will get to 100% tomorrow
Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.144
retrieving revision 1.145
diff -C2 -d -r1.144 -r1.145
*** MailParse.pm 9 Jul 2003 23:32:50 -0000 1.144
--- MailParse.pm 12 Jul 2003 06:17:03 -0000 1.145
***************
*** 19,23 ****
# character code
! my %entityhash = ('aacute' => 224, 'Aacute' => 202, 'Acirc' => 203, 'acirc' => 225,
'acute' => 189, 'AElig' => 207, 'aelig' => 229, 'Agrave' => 201,
'agrave' => 223, 'amp' => 38, 'Aring' => 206, 'aring' => 228,
--- 19,23 ----
# character code
! my %entityhash = ('aacute' => 224, 'Aacute' => 202, 'Acirc' => 203, 'acirc' => 225, # PROFILE BLOCK START
'acute' => 189, 'AElig' => 207, 'aelig' => 229, 'Agrave' => 201,
'agrave' => 223, 'amp' => 38, 'Aring' => 206, 'aring' => 228,
***************
*** 43,47 ****
'ugrave' => 248, 'Ugrave' => 216, 'uml' => 168, 'Uuml' => 220,
'uuml' => 252, 'Yacute' => 220, 'yacute' => 252, 'yen' => 165,
! 'yuml' => 254);
#----------------------------------------------------------------------------
# new
--- 43,48 ----
'ugrave' => 248, 'Ugrave' => 216, 'uml' => 168, 'Uuml' => 220,
'uuml' => 252, 'Yacute' => 220, 'yacute' => 252, 'yen' => 165,
! 'yuml' => 254); # PROFILE BLOCK STOP
!
#----------------------------------------------------------------------------
# new
***************
*** 101,105 ****
# map_color value to get canonical color values
! $self->{color_map__} = { 'aliceblue','f0f8ff', 'antiquewhite','faebd7', 'aqua','00ffff', 'aquamarine','7fffd4', 'azure','f0ffff',
'beige','f5f5dc', 'bisque','ffe4c4', 'black','000000', 'blanchedalmond','ffebcd', 'blue','0000ff', 'blueviolet','8a2be2',
'brown','a52a2a', 'burlywood','deb887', 'cadetblue','5f9ea0', 'chartreuse','7fff00', 'chocolate','d2691e', 'coral','ff7f50',
--- 102,106 ----
# map_color value to get canonical color values
! $self->{color_map__} = { 'aliceblue','f0f8ff', 'antiquewhite','faebd7', 'aqua','00ffff', 'aquamarine','7fffd4', 'azure','f0ffff', # PROFILE BLOCK START
'beige','f5f5dc', 'bisque','ffe4c4', 'black','000000', 'blanchedalmond','ffebcd', 'blue','0000ff', 'blueviolet','8a2be2',
'brown','a52a2a', 'burlywood','deb887', 'cadetblue','5f9ea0', 'chartreuse','7fff00', 'chocolate','d2691e', 'coral','ff7f50',
***************
*** 125,129 ****
'skyblue','87ceeb', 'slateblue','6a5acd', 'slategray','708090', 'snow','fffafa', 'springgreen','00ff7f', 'steelblue','4682b4',
'tan','d2b48c', 'teal','008080', 'thistle','d8bfd8', 'tomato','ff6347', 'turquoise','40e0d0', 'violet','ee82ee', 'wheat','f5deb3',
! 'white','ffffff', 'whitesmoke','f5f5f5', 'yellow','ffff00', 'yellowgreen','9acd32' };
$self->{content_type__} = '';
--- 126,130 ----
'skyblue','87ceeb', 'slateblue','6a5acd', 'slategray','708090', 'snow','fffafa', 'springgreen','00ff7f', 'steelblue','4682b4',
'tan','d2b48c', 'teal','008080', 'thistle','d8bfd8', 'tomato','ff6347', 'turquoise','40e0d0', 'violet','ee82ee', 'wheat','f5deb3',
! 'white','ffffff', 'whitesmoke','f5f5f5', 'yellow','ffff00', 'yellowgreen','9acd32' }; # PROFILE BLOCK STOP
$self->{content_type__} = '';
***************
*** 180,185 ****
{
my ( $self ) = @_;
! $self->{htmlcolordistance__} = $self->compute_rgb_distance( $self->{htmlfontcolor__},
! $self->{htmlbackcolor__} );
}
--- 181,186 ----
{
my ( $self ) = @_;
!
! $self->{htmlcolordistance__} = $self->compute_rgb_distance( $self->{htmlfontcolor__}, $self->{htmlbackcolor__} );
}
|
|
From: <jgr...@us...> - 2003-07-12 06:17:07
|
Update of /cvsroot/popfile/engine/tests In directory sc8-pr-cvs1:/tmp/cvs-serv21679/tests Modified Files: TestMailParse.tst Added Files: TestMailParse019.clr Log Message: Add colorization test and improve TestMailParse to bring up to 91% coverage... will get to 100% tomorrow --- NEW FILE: TestMailParse019.clr --- <tt><b><font color="black">Return-Path</font></b>: <<b><font color="black">bu...@dr...</font></b>><br /><b><font color="black">Delivered-To</font></b>: run@mail.<b><font color="black">tepkom</font></b>.ru<br /><b><font color="black">Received</font></b>: by mail.<b><font color="black">tepkom</font></b>.ru (<b><font color="black">Postfix</font></b>)<br /> id 70071971F2; Wed, 29 Jan 2003 20:30:49 +0300 (<b><font color="black">MSK</font></b>)<br /><b><font color="black">Delivered-To</font></b>: rescuebre@<b><font color="black">tepkom</font></b>.ru<br /><b><font color="black">Received</font></b>: from localhost (localhost [<b><font color="brown">127.0.0.1</font></b>])<br /> by mail.<b><font color="black">tepkom</font></b>.ru (<b><font color="black">Postfix</font></b>) with SMTP<br /> id 6474D971FA; Wed, 29 Jan 2003 20:30:49 +0300 (<b><font color="black">MSK</font></b>)<br /><b><font color="black">Received</font></b>: from <b><font color="black">keymaster.<b><font color="black">relativity.com</font></b></font></b> (<b><font color="black">keymaster.<b><font color="black">relativity.com</font></b></font></b> [<b><font color="black">12.146.171.10</font></b>])<br /> by mail.<b><font color="black">tepkom</font></b>.ru (<b><font color="black">Postfix</font></b>) with ESMTP<br /> id 93510971F2; Wed, 29 Jan 2003 20:30:47 +0300 (<b><font color="black">MSK</font></b>)<br /><b><font color="black">Received</font></b>: from <b><font color="black">rtfm</font></b> (<b><font color="black">rtfm.<b><font color="black">relativity.com</font></b></font></b> [<b><font color="black">63.100.138.144</font></b>]) by <b><font color="black">keymaster.<b><font color="black">relativity.com</font></b></font></b> with SMTP (<b><font color="green">Microsoft</font></b> <b><font color="green">Exchange</font></b> <b><font color="brown">Internet</font></b> Mail <b><font color="green">Service</font></b> <b><font color="brown">Version</font></b> 5.5.2653.13)<br /> id D4Z7<b><font color="black">ASMC</font></b>; Wed, 29 Jan 2003 12:28:21 -0500<br /><b><font color="black">To</font></b>: <b><font color="black">elia@<b><font color="black">tepkom.ru</font></b></font></b>, <b><font color="black">rescuebre@<b><font color="black">tepkom.ru</font></b></font></b>, <b><font color="black">kcruz@<b><font color="black">relativity.com</font></b></font></b>, <b><font color="black">bugtracker@<b><font color="black">relativity.com</font></b></font></b><br /><b><font color="black">Date</font></b>: Wed, 29 Jan 03 12:28:29<br /><b><font color="black">From</font></b>: <<b><font color="black">bugs@<b><font color="black">drunin.net</font></b></font></b>><br /><b><font color="black">Subject</font></b>: VI ID: 24149 Status: <b><font color="black">Dev</font></b> <b><font color="black">Confirmed</font></b> <b><font color="black">Fix</font></b> <b><font color="black">Sev</font></b>: 1<br /><b><font color="black">MIME-Version</font></b>: 1.0<br /><b><font color="black">Content-Type</font></b>: multipart/mixed; boundary="isboundary"<br /><b><font color="black">Message-Id</font></b>: <200...@ma...><br /><b><font color="black">X-Text-Classification</font></b>: lists<br /><b><font color="black">X-POPFile-Link</font></b>: <http://<b><font color="brown">127.0.0.1</font></b>:8080/<b><font color="black">jump</font></b>_to_message?view=popfile523=1.<b><font color="black">msg</font></b>><br /><br />--isboundary<br /><b><font color="black">Content-Type</font></b>: text/html; charset=<b><font color="green">us-ascii</font></b><br /><br /><HTML><HEAD><br /><BODY><br /><DIV><B><FONT size=4><b><font color="black">Visual</font></b> <b><font color="black">Intercept</font></b> <b><font color="black">Notification</font></b>:</FONT></B></DIV><BR><br /><TABLE border rules=groups><br /> <TBODY><br /> <TR><br /> <TD><B><b><font color="black">Incident</font></b>:</B></TD><br /> <TD><br /> <A href="http://<b><font color="black">rtfm.<b><font color="black">relativity.com</font></b></font></b>/VIWeb/default.asp?type=incident&name=24149">24149</A><br /> (<A href="http://<b><font color="black">vi.<b><font color="black">relativity.com</font></b></font></b>/VIWeb/default.asp?type=incident&name=24149"><b><font color="brown">Alternative</font></b> <br /><b><font color="brown">server</font></b></A>)<br /> </TD><br /> <TD WIDTH="20%"><TD><TD><TD></TR><br /> <TBODY><br /> <TR><br /> <TD><B>Subject:</B></TD><br /> <TD COLSPAN=5><b><font color="black">Internal</font></b> <b><font color="brown">error</font></b> in <b><font color="black">BRE</font></b>.<b><font color="brown">dll</font></b></TD></TR><br /> <TBODY><br /> <TR><br /> <TD><B><b><font color="brown">Project</font></b>:</B></TD><br /> <TD COLSPAN=5>/<b><font color="green">Program</font></b>/RW/<b><font color="black">Cobol</font></b>/<b><font color="black">BRE</font></b>/<b><font color="brown">Structure</font></b> <b><font color="green">Based</font></b></TD></TR><br /> <TR><br /> <TD><B><b><font color="brown">Version</font></b>:</B></TD><br /> <TD COLSPAN=5>7.1.00</TD></TR><br /> <TR><br /> <TD><B><b><font color="black">Release</font></b>:</B></TD><br /> <TD COLSPAN=5></TD></TR><br /> <TR><br /> <TD><B><b><font color="brown">Build</font></b>:</B></TD><br /> <TD COLSPAN=5></TD></TR><br /> <TBODY><br /> <TR><br /> <TD><B><b><font color="green">Customer</font></b>:</B></TD><br /> <TD COLSPAN=5><b><font color="black">INTERNAL</font></b></TD></TR><br /> <TBODY><br /> <TR><br /> <TD><B>Status:</B></TD><br /> <TD><b><font color="brown">Dev</font></b> <b><font color="brown">Confirmed</font></b> <b><font color="black">Fix</font></b></TD><TD><br /> <TD><B><b><font color="black">AssignID</font></b>:</B></TD><br /> <TD><b><font color="black">snd</font></b></TD><br /> <TD>1/29/2003 10:16:01 AM</TD></TR><br /> <TR><br /> <TD><B><b><font color="black">Priority</font></b>:</B></TD><br /> <TD><b><font color="brown">High</font></b></TD><TD><br /> <TD><B><b><font color="black">RequestID</font></b>:</B></TD><br /> <TD><b><font color="black">elia</font></b></TD><br /> <TD>1/29/2003 10:16:01 AM</TD></TR><br /> <TR><br /> <TD><B><b><font color="black">Severity</font></b>:</B></TD><br /> <TD>1</TD><TD><br /> <TD><B><b><font color="black">QAID</font></b>:</B></TD><br /> <TD><b><font color="black">elia</font></b></TD><br /> <TD>1/29/2003 10:16:01 AM</TD></TR><br /> <TR><br /> <TD><B><b><font color="black">Category</font></b>:</B></TD><br /> <TD><b><font color="black">BRE</font></b></TD><TD><br /> <TD><B><b><font color="black">ChangeID</font></b>:</B></TD><br /> <TD><b><font color="black">snd</font></b></TD><br /> <TD>1/29/2003 12:26:59 PM</TD></TR><br /> <TBODY><br /> <TR><br /> <TD vAlign=top><B><b><font color="brown">Description</font></b>:</B></TD><br /> <TD COLSPAN=5><TEXTAREA READONLY ROWS=10 COLS=60>FROM:<b><font color="black">elia</font></b> DATE:01/29/2003 10:16:01 <br /><br /> The "<b><font color="black">Internal</font></b> <b><font color="brown">error</font></b> in <b><font color="black">BRE</font></b>.<b><font color="brown">dll</font></b>" message is <b><font color="black">generated</font></b> <b><font color="green">when</font></b> <b><font color="brown">structure</font></b> <b><font color="green">based</font></b> <b><font color="black">slice</font></b><br /> is <b><font color="black">extracted</font></b> from <b><font color="green">program</font></b> <b><font color="brown">which</font></b> has been <b><font color="black">verified</font></b> with "<b><font color="green">Perform</font></b> <b><font color="green">Program</font></b> <b><font color="green">analysis</font></b> = no"<br /> and at the <b><font color="green">same</font></b> <b><font color="green">time</font></b> <b><font color="black">BRE</font></b> <b><font color="brown">option</font></b> "<b><font color="green">Ensure</font></b> <b><font color="black">consistent</font></b> <b><font color="green">access</font></b> to <b><font color="black">external</font></b> <b><font color="brown">resources</font></b> = yes".<br /><br /> The <b><font color="black">correct</font></b> <b><font color="brown">error</font></b> message <b><font color="green">should</font></b> be <b><font color="black">generated</font></b>.<br /><br /> "<b><font color="brown">Severe</font></b> Re-<b><font color="black">verify</font></b> the <b><font color="green">program</font></b> with '<b><font color="green">Perform</font></b> <b><font color="green">program</font></b> <b><font color="black">analysis'</font></b> <b><font color="brown">option</font></b> <b><font color="green">set</font></b>".<br /><br /><br /> <b><font color="black">Test</font></b>:MEDIUM\\RescueWin\archives\VS-cobol\Computation\<b><font color="black">Logical</font></b>-path\<b><font color="green">CALL</font></b>-accept4.<b><font color="black">CBL</font></b> <br /><br /> *|<b><font color="green">Start</font></b> <b><font color="brown">paragraph</font></b>: p1<br /> *|<b><font color="brown">Last</font></b> <b><font color="brown">paragraph</font></b>: p1<br /><br /> 1015 <b><font color="green">blue</font></b>.<br /><br />FROM:<b><font color="black">snd</font></b> DATE:<b><font color="green">Wednesday</font></b>, <b><font color="green">January</font></b> 29, 2003 11:52:45 AM <br /><br /><b><font color="green">Fixed</font></b> in <b><font color="green">Blue</font></b>. No <b><font color="black">warning</font></b> in this <b><font color="green">case</font></b>, <b><font color="black">BRE</font></b> <b><font color="black">runs</font></b> <b><font color="black">DFA</font></b> <b><font color="black">instead</font></b>.<br /></TEXTAREA></TD></TR><br /> <TR><br /> <TD vAlign=top><B><b><font color="black">Resolution</font></b>:</B></TD><br /> <TD COLSPAN=5><TEXTAREA READONLY ROWS=10 COLS=60></TEXTAREA></TD></TR><br /> <TR><br /> <TD vAlign=top><B><b><font color="black">WorkAround</font></b>:</B></TD><br /> <TD COLSPAN=5><TEXTAREA READONLY ROWS=10 COLS=60></TEXTAREA></TD></TR></TBODY></TABLE><br /><HR><br />If you have received this <b><font color="green">email</font></b> in <b><font color="brown">error</font></b>, <b><font color="green">please</font></b> <b><font color="black">respond</font></b> to: <A <br />href="mailto:BugTracker@<b><font color="black">relativity.com</font></b>">Bug...@re...</A> <br /><HR><br /></BODY></HTML><br /><br />--isboundary--<br /><br /><br /></tt> Index: TestMailParse.tst =================================================================== RCS file: /cvsroot/popfile/engine/tests/TestMailParse.tst,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TestMailParse.tst 11 Jul 2003 21:53:30 -0000 1.9 --- TestMailParse.tst 12 Jul 2003 06:17:03 -0000 1.10 *************** *** 8,11 **** --- 8,44 ---- use Classifier::MailParse; + use Classifier::Bayes; + use POPFile::Configuration; + use POPFile::MQ; + use POPFile::Logger; + + # Load the test corpus + my $c = new POPFile::Configuration; + my $mq = new POPFile::MQ; + my $l = new POPFile::Logger; + my $b = new Classifier::Bayes; + + $c->configuration( $c ); + $c->mq( $mq ); + $c->logger( $l ); + + $l->configuration( $c ); + $l->mq( $mq ); + $l->logger( $l ); + + $l->initialize(); + + $mq->configuration( $c ); + $mq->mq( $mq ); + $mq->logger( $l ); + + $b->configuration( $c ); + $b->mq( $mq ); + $b->logger( $l ); + + + $b->initialize(); + $b->config_( 'corpus', 'tests/corpus' ); + $b->start(); my $cl = new Classifier::MailParse; *************** *** 147,148 **** --- 180,199 ---- test_assert_equal( $cl->{cc__}, 'ds...@dm..., ds...@da..., ds...@cr..., ds...@da..., <ds...@do...>, <ds...@dn...>, <ds...@cy...>, <ds...@cs...>, <ds...@di...>, <ds...@cv...>, <ds...@dr...>, <ds...@cr...>, <ds...@dc...>, <ds...@da...>' ); + # Test colorization + + my @color_tests = sort glob 'tests/TestMailParse019.msg'; + + for my $color_test (@color_tests) { + my $colored = $color_test; + $colored =~ s/msg/clr/; + + $cl->{color__} = 1; + $cl->{bayes__} = $b; + my $html = $cl->parse_file( $color_test ); + + open HTML, "<$colored"; + my $check = <HTML>; + $check =~ s/[\r\n]*//g; + close HTML; + test_assert_equal( $check, $html ); + } |
|
From: <jgr...@us...> - 2003-07-12 05:59:05
|
Update of /cvsroot/popfile/engine/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv19533/tests
Modified Files:
TestConfiguration.tst
Log Message:
Test suite now has 100% coverage for Configuration meaning that all the POPFile/ modules have 100% coverage... moving on to other modules now
Index: TestConfiguration.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestConfiguration.tst,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestConfiguration.tst 10 Jul 2003 04:28:16 -0000 1.1
--- TestConfiguration.tst 12 Jul 2003 05:59:02 -0000 1.2
***************
*** 61,66 ****
--- 61,140 ----
close PIDFILE;
test_assert_equal( $pid, $$ );
+ open (STDERR, ">stdout.tmp");
+ test_assert_equal( $c->start(), 0 );
+ close STDERR;
$c->stop();
test_assert( !( -e 'tests/popfile.pid' ) );
+ # Check that parameter upgrading works
+
+ my %upgrades = ( 'corpus', 'bayes_corpus',
+ 'unclassified_probability', 'bayes_unclassified_probability',
+ 'piddir', 'config_piddir',
+ 'debug', 'GLOBAL_debug',
+ 'msgdir', 'GLOBAL_msgdir',
+ 'subject', 'GLOBAL_subject',
+ 'timeout', 'GLOBAL_timeout',
+ 'xpl', 'GLOBAL_xpl',
+ 'xtc', 'GLOBAL_xtc',
+ 'download_count', 'GLOBAL_download_count',
+ 'logdir', 'logger_logdir',
+ 'localpop', 'pop3_local',
+ 'port', 'pop3_port',
+ 'sport', 'pop3_secure_port',
+ 'server', 'pop3_secure_server',
+ 'separator', 'pop3_separator',
+ 'toptoo', 'pop3_toptoo',
+ 'archive', 'html_archive',
+ 'archive_classes', 'html_archive_classes',
+ 'archive_dir', 'html_archive_dir',
+ 'history_days', 'html_history_days',
+ 'language', 'html_language',
+ 'last_reset', 'html_last_reset',
+ 'last_update_check', 'html_last_update_check',
+ 'localui', 'html_local',
+ 'page_size', 'html_page_size',
+ 'password', 'html_password',
+ 'send_stats', 'html_send_stats',
+ 'skin', 'html_skin',
+ 'test_language', 'html_test_language',
+ 'update_check', 'html_update_check',
+ 'ui_port', 'html_port' );
+
+ foreach my $param (sort keys %upgrades) {
+ test_assert_equal( $upgrades{$param}, $c->upgrade_parameter__( $param ) );
+ }
+
+ test_assert_equal( 'random', $c->upgrade_parameter__( 'random' ) );
+
+ # Check command line parsing
+ @ARGV = ( '-config_piddir', 'test2/' );
+ $c->parse_command_line();
+ test_assert_equal( $c->module_config_( 'config', 'piddir' ), 'test2/' );
+ @ARGV = ( 'config_piddir', 'test3/' );
+ open (STDERR, ">stdout.tmp");
+ $c->parse_command_line();
+ close STDERR;
+ open OUTPUT, "<stdout.tmp";
+ my $line = <OUTPUT>;
+ close OUTPUT;
+ test_assert_regexp( $line, 'Expected a command line option and got config_piddir' );
+ test_assert_equal( $c->module_config_( 'config', 'piddir' ), 'test2/' );
+ @ARGV = ( '-config_piddir' );
+ open (STDERR, ">stdout.tmp");
+ $c->parse_command_line();
+ close STDERR;
+ open OUTPUT, "<stdout.tmp";
+ my $line = <OUTPUT>;
+ close OUTPUT;
+ test_assert_regexp( $line, 'Missing argument for -config_piddir' );
+ test_assert_equal( $c->module_config_( 'config', 'piddir' ), 'test2/' );
+ @ARGV = ( '-config_foobar' );
+ open (STDERR, ">stdout.tmp");
+ $c->parse_command_line();
+ close STDERR;
+ open OUTPUT, "<stdout.tmp";
+ my $line = <OUTPUT>;
+ close OUTPUT;
+ test_assert_regexp( $line, 'Unknown command line option -config_foobar' );
|
|
From: <jgr...@us...> - 2003-07-12 05:59:05
|
Update of /cvsroot/popfile/engine/POPFile
In directory sc8-pr-cvs1:/tmp/cvs-serv19533/POPFile
Modified Files:
Configuration.pm
Log Message:
Test suite now has 100% coverage for Configuration meaning that all the POPFile/ modules have 100% coverage... moving on to other modules now
Index: Configuration.pm
===================================================================
RCS file: /cvsroot/popfile/engine/POPFile/Configuration.pm,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Configuration.pm 10 Jul 2003 04:28:15 -0000 1.21
--- Configuration.pm 12 Jul 2003 05:59:02 -0000 1.22
***************
*** 114,122 ****
if ( -e $self->{pid_file__} ) {
! my $error = "\n\nAnother copy of POPFile appears to be running. \nIf this is not the case then" .
! " delete the file \n$self->{pid_file__} and restart POPFile.\n\n";
! print $error;
! $self->log_( $error );
return 0;
--- 114,120 ----
if ( -e $self->{pid_file__} ) {
! my $error = "\n\nAnother copy of POPFile appears to be running. \nIf this is not the case then delete the file \n$self->{pid_file__} and restart POPFile.\n\n";
! print STDERR $error;
return 0;
***************
*** 167,175 ****
my $i = 0;
! while ( $i < $#ARGV ) {
# A command line argument must start with a -
if ( $ARGV[$i] =~ /^-(.+)$/ ) {
my $parameter = $self->upgrade_parameter__($1);
if ( defined($self->{configuration_parameters__}{$parameter}) ) {
if ( $i < $#ARGV ) {
--- 165,174 ----
my $i = 0;
! while ( $i <= $#ARGV ) {
# A command line argument must start with a -
if ( $ARGV[$i] =~ /^-(.+)$/ ) {
my $parameter = $self->upgrade_parameter__($1);
+
if ( defined($self->{configuration_parameters__}{$parameter}) ) {
if ( $i < $#ARGV ) {
***************
*** 177,189 ****
$i += 2;
} else {
! print "Missing argument for $ARGV[$i]\n";
last;
}
} else {
! print "Unknown command line option $ARGV[$i]\n";
last;
}
} else {
! print "Expected a command line option and got $ARGV[$i]\n";
last;
}
--- 176,188 ----
$i += 2;
} else {
! print STDERR "Missing argument for $ARGV[$i]\n";
last;
}
} else {
! print STDERR "Unknown command line option $ARGV[$i]\n";
last;
}
} else {
! print STDERR "Expected a command line option and got $ARGV[$i]\n";
last;
}
***************
*** 211,215 ****
# if accessed from the config module or through module_config_ from outside
! my %upgrades = (
# Parameters that are now handled by Classifier::Bayes
--- 210,214 ----
# if accessed from the config module or through module_config_ from outside
! my %upgrades = ( # PROFILE BLOCK START
# Parameters that are now handled by Classifier::Bayes
***************
*** 262,266 ****
'update_check', 'html_update_check',
'ui_port', 'html_port',
! );
if ( defined( $upgrades{$parameter} ) ) {
--- 261,265 ----
'update_check', 'html_update_check',
'ui_port', 'html_port',
! ); # PROFILE BLOCK END
if ( defined( $upgrades{$parameter} ) ) {
|
|
From: <jgr...@us...> - 2003-07-12 05:59:05
|
Update of /cvsroot/popfile/engine/Devel
In directory sc8-pr-cvs1:/tmp/cvs-serv19533/Devel
Modified Files:
TestCoverage.pm
Log Message:
Test suite now has 100% coverage for Configuration meaning that all the POPFile/ modules have 100% coverage... moving on to other modules now
Index: TestCoverage.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Devel/TestCoverage.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestCoverage.pm 12 Jul 2003 00:43:20 -0000 1.3
--- TestCoverage.pm 12 Jul 2003 05:59:02 -0000 1.4
***************
*** 21,24 ****
--- 21,25 ----
# We want to look inside subroutines so tell the debugger to trace into
# them
+
$DB::trace = 1;
}
***************
*** 46,50 ****
{
if ( ( $file =~ /^[^\/]/ ) && ( $file ne 'tests.pl' ) && !( $file =~ /^Test\// ) ) {
! my $current_line = 0;
open SOURCE_FILE, "<$file";
--- 47,52 ----
{
if ( ( $file =~ /^[^\/]/ ) && ( $file ne 'tests.pl' ) && !( $file =~ /^Test\// ) ) {
! my $current_line = 0;
! my $block_executed = 0;
open SOURCE_FILE, "<$file";
***************
*** 63,82 ****
# comments or just have braces on them or
# just an else or just a subroutine definition
! if ( ( /^\s*\#/ == 0 ) &&
! ( /^\s*$/ == 0 ) &&
! ( /^\s*(\{|\}|else|\s)+\s*$/ == 0 ) &&
! ( /^\s*sub \w+( \{)?\s*$/ == 0 ) &&
! ( /^\s*package / == 0 ) )
! {
! $count{$file}{total_executable_lines} += 1;
! # If this line was executed then keep count of
! # that fact
! if ( $count{$file}{$current_line} > 0 ) {
! $count{$file}{total_executed} += 1;
! } else {
! print "$file $_\n" if ( $file =~/Module/);
! }
}
}
--- 65,97 ----
# comments or just have braces on them or
# just an else or just a subroutine definition
! if ( ( ( /^\s*\#/ == 0 ) &&
! ( /^\s*$/ == 0 ) &&
! ( /^\s*(\{|\}|else|\s)+\s*$/ == 0 ) &&
! ( /^\s*sub \w+( \{)?\s*$/ == 0 ) &&
! ( /^\s*package / == 0 ) ) || ( $block_executed ) ) {
! $count{$file}{total_executable_lines} += 1;
! # If this line was executed then keep count of
! # that fact
!
! if ( ( $count{$file}{$current_line} > 0 ) || ( $block_executed ) ) {
! $count{$file}{total_executed} += 1;
!
! # Check to see if the special comment PROFILE BLOCK START is on the line
! # and if so set the block mode where we count lines as being executed
! # in the block if the first line was
!
! if ( /\# PROFILE BLOCK START/ ) {
! $block_executed = 1;
! }
!
! if ( /\# PROFILE BLOCK STOP/ ) {
! $block_executed = 0;
! }
! } else {
! print "$file $_\n" if ( $file =~/Configuration/);
! }
}
+
}
|
|
From: <jgr...@us...> - 2003-07-12 00:43:24
|
Update of /cvsroot/popfile/engine/POPFile
In directory sc8-pr-cvs1:/tmp/cvs-serv16055/POPFile
Modified Files:
MQ.pm
Log Message:
Improve test suite coverage for MQ, Module and Logger. Now at 100%
Index: MQ.pm
===================================================================
RCS file: /cvsroot/popfile/engine/POPFile/MQ.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MQ.pm 9 Jul 2003 18:18:19 -0000 1.2
--- MQ.pm 12 Jul 2003 00:43:20 -0000 1.3
***************
*** 89,102 ****
for my $type (keys %{$self->{queue__}}) {
while ( my $ref = shift @{$self->{queue__}{$type}} ) {
! if ( defined( $ref ) ) {
! for my $waiter (@{$self->{waiters__}{$type}}) {
! my $message = @$ref[0];
! my $parameter = @$ref[1];
! $waiter->deliver( $type, $message, $parameter );
! }
! } else {
! last;
! }
}
}
--- 89,98 ----
for my $type (keys %{$self->{queue__}}) {
while ( my $ref = shift @{$self->{queue__}{$type}} ) {
! for my $waiter (@{$self->{waiters__}{$type}}) {
! my $message = @$ref[0];
! my $parameter = @$ref[1];
! $waiter->deliver( $type, $message, $parameter );
! }
}
}
|
|
From: <jgr...@us...> - 2003-07-12 00:43:23
|
Update of /cvsroot/popfile/engine/tests In directory sc8-pr-cvs1:/tmp/cvs-serv16055/tests Modified Files: TestModule.tst Log Message: Improve test suite coverage for MQ, Module and Logger. Now at 100% Index: TestModule.tst =================================================================== RCS file: /cvsroot/popfile/engine/tests/TestModule.tst,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TestModule.tst 10 Jul 2003 04:28:16 -0000 1.2 --- TestModule.tst 12 Jul 2003 00:43:20 -0000 1.3 *************** *** 37,40 **** --- 37,47 ---- test_assert_equal( $m->global_config_( 'gparameter' ), 'gvalue' ); + # Call the null methods + $m->prefork(); + $m->stop(); + $m->reaper(); + $m->forked(); + $m->deliver(); + # Check that the MQ interface functions work |
|
From: <jgr...@us...> - 2003-07-12 00:43:23
|
Update of /cvsroot/popfile/engine/Devel
In directory sc8-pr-cvs1:/tmp/cvs-serv16055/Devel
Modified Files:
TestCoverage.pm
Log Message:
Improve test suite coverage for MQ, Module and Logger. Now at 100%
Index: TestCoverage.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Devel/TestCoverage.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestCoverage.pm 10 Jul 2003 04:28:15 -0000 1.2
--- TestCoverage.pm 12 Jul 2003 00:43:20 -0000 1.3
***************
*** 63,67 ****
# comments or just have braces on them or
# just an else or just a subroutine definition
! if ( ( /^\s*\#/ == 0 ) && ( /^\s*$/ == 0 ) && ( /^\s*(\{|\}|else|\s)+\s*$/ == 0 ) && ( /^\s*sub \w+( \{)?\s*$/ == 0 ) )
{
$count{$file}{total_executable_lines} += 1;
--- 63,71 ----
# comments or just have braces on them or
# just an else or just a subroutine definition
! if ( ( /^\s*\#/ == 0 ) &&
! ( /^\s*$/ == 0 ) &&
! ( /^\s*(\{|\}|else|\s)+\s*$/ == 0 ) &&
! ( /^\s*sub \w+( \{)?\s*$/ == 0 ) &&
! ( /^\s*package / == 0 ) )
{
$count{$file}{total_executable_lines} += 1;
***************
*** 71,75 ****
if ( $count{$file}{$current_line} > 0 ) {
$count{$file}{total_executed} += 1;
! }
}
}
--- 75,81 ----
if ( $count{$file}{$current_line} > 0 ) {
$count{$file}{total_executed} += 1;
! } else {
! print "$file $_\n" if ( $file =~/Module/);
! }
}
}
|
|
From: <jgr...@us...> - 2003-07-12 00:22:35
|
Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv13909/UI
Modified Files:
HTML.pm
Log Message:
Add code to the history cache that checks that the global download_count is valid
Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.179
retrieving revision 1.180
diff -C2 -d -r1.179 -r1.180
*** HTML.pm 9 Jul 2003 21:15:40 -0000 1.179
--- HTML.pm 12 Jul 2003 00:22:32 -0000 1.180
***************
*** 2497,2500 ****
--- 2497,2506 ----
my ( $self ) = @_;
+ # We calculate the largest value for the first number in the MSG file
+ # names to verify at the end that the global download_count parameter
+ # has not been corrupted.
+
+ my $max = 0;
+
# First we mark every entry in the history cache with cull set to one, after we have
# looked through the messages directory for message we will delete any of the entries
***************
*** 2521,2527 ****
# just get the base name of the file that we are dealing with
! $history_files[$i] =~ /(popfile\d+=\d+\.msg)$/;
$history_files[$i] = $1;
# If this file already exists in the history cache then just mark it not
# to be culled and move on.
--- 2527,2537 ----
# just get the base name of the file that we are dealing with
! $history_files[$i] =~ /(popfile(\d+)=\d+\.msg)$/;
$history_files[$i] = $1;
+ if ( $2 > $max ) {
+ $max = $2;
+ }
+
# If this file already exists in the history cache then just mark it not
# to be culled and move on.
***************
*** 2547,2550 ****
--- 2557,2564 ----
$self->{need_resort__} = 0;
$self->sort_filter_history( '', '', '' );
+
+ if ( $max > $self->global_config_( 'download_count' ) ) {
+ $self->global_config_( 'download_count', $max+1 );
+ }
}
|
Update of /cvsroot/popfile/engine/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv27453/tests
Modified Files:
TestBayes.tst TestMailParse.tst TestMailParse001.cam
TestMailParse001.msg TestMailParse002.cam TestMailParse003.cam
TestMailParse004.cam TestMailParse005.cam TestMailParse006.cam
TestMailParse007.cam TestMailParse008.cam TestMailParse009.cam
TestMailParse010.cam TestMailParse011.cam TestMailParse012.cam
TestMailParse013.cam TestMailParse014.cam TestMailParse015.cam
TestMailParse016.cam TestMailParse017.cam TestMailParse018.cam
TestMailParse019.cam TestMailParse020.cam TestMailParse021.cam
Log Message:
Update suite to fix errors
Index: TestBayes.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestBayes.tst,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** TestBayes.tst 18 Jun 2003 20:34:55 -0000 1.10
--- TestBayes.tst 11 Jul 2003 21:53:30 -0000 1.11
***************
*** 72,76 ****
}
! test_assert_equal( $b->classify_file( $class_test ), $class, $class_test );
}
--- 72,76 ----
}
! test_assert_equal( $b->classify( $class_test ), $class, $class_test );
}
Index: TestMailParse.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse.tst,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TestMailParse.tst 9 Jul 2003 18:18:25 -0000 1.8
--- TestMailParse.tst 11 Jul 2003 21:53:30 -0000 1.9
***************
*** 129,145 ****
# Check that from, to and subject get set correctly when parsing a message
! $cl->parse_stream( 'tests/TestMailParse013.msg' );
test_assert_equal( $cl->{from__}, 'RN <rr...@nn...>' );
test_assert_equal( $cl->{to__}, '"Armlet Forum" <arm...@ne...>' );
test_assert_equal( $cl->{subject__}, '(Archive Copy) RE: CW v9 and armlets...' );
! $cl->parse_stream( 'tests/TestMailParse018.msg' );
$cl->{to__} =~ /(\Qbugtracker\E@\Qrelativity.com\E)/;
test_assert_equal( $1, 'bug...@re...' );
! $cl->parse_stream( 'tests/TestMailParse019.msg' );
$cl->{to__} =~ /(\Qbugtracker\E@\Qrelativity.com\E)/;
test_assert_equal( $1, 'bug...@re...' );
# Check that multi-line To: and CC: headers get handled properly
! $cl->parse_stream( 'tests/TestMailParse021.msg' );
$cl->{to__} =~ s/[\r\n]//g;
test_assert_equal( $cl->{to__}, 'ds...@ct..., ds...@do..., ds...@di..., ds...@di..., ds...@cr..., <ds...@cy...>, <ds...@do...>, <ds...@db...>, <ds...@cs...> , <ds...@cr...>, <ds...@dr...>, <ds...@cv...>, <ds...@dm...>, <ds...@da...>, <ds...@da...>' );
--- 129,145 ----
# Check that from, to and subject get set correctly when parsing a message
! $cl->parse_file( 'tests/TestMailParse013.msg' );
test_assert_equal( $cl->{from__}, 'RN <rr...@nn...>' );
test_assert_equal( $cl->{to__}, '"Armlet Forum" <arm...@ne...>' );
test_assert_equal( $cl->{subject__}, '(Archive Copy) RE: CW v9 and armlets...' );
! $cl->parse_file( 'tests/TestMailParse018.msg' );
$cl->{to__} =~ /(\Qbugtracker\E@\Qrelativity.com\E)/;
test_assert_equal( $1, 'bug...@re...' );
! $cl->parse_file( 'tests/TestMailParse019.msg' );
$cl->{to__} =~ /(\Qbugtracker\E@\Qrelativity.com\E)/;
test_assert_equal( $1, 'bug...@re...' );
# Check that multi-line To: and CC: headers get handled properly
! $cl->parse_file( 'tests/TestMailParse021.msg' );
$cl->{to__} =~ s/[\r\n]//g;
test_assert_equal( $cl->{to__}, 'ds...@ct..., ds...@do..., ds...@di..., ds...@di..., ds...@cr..., <ds...@cy...>, <ds...@do...>, <ds...@db...>, <ds...@cs...> , <ds...@cr...>, <ds...@dr...>, <ds...@cv...>, <ds...@dm...>, <ds...@da...>, <ds...@da...>' );
Index: TestMailParse001.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse001.cam,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMailParse001.cam 16 Apr 2003 01:26:45 -0000 1.4
--- TestMailParse001.cam 11 Jul 2003 21:53:30 -0000 1.5
***************
*** 2,7 ****
Subject: [spam]
X-Text-Classification: spam
! X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
Testing S P A C E D out words spaced out in a document.
! .
--- 2,7 ----
Subject: [spam]
X-Text-Classification: spam
! X-POPFile-Link: http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg
Testing S P A C E D out words spaced out in a document.
!
Index: TestMailParse001.msg
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse001.msg,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse001.msg 20 Feb 2003 21:30:35 -0000 1.2
--- TestMailParse001.msg 11 Jul 2003 21:53:30 -0000 1.3
***************
*** 2,4 ****
Testing S P A C E D out words spaced out in a document.
! .
--- 2,4 ----
Testing S P A C E D out words spaced out in a document.
!
Index: TestMailParse002.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse002.cam,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMailParse002.cam 16 Apr 2003 01:26:45 -0000 1.4
--- TestMailParse002.cam 11 Jul 2003 21:53:30 -0000 1.5
***************
*** 2,6 ****
Subject: [spam]
X-Text-Classification: spam
! X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
who wants to be a millionaire milli<!---->onaire mi<!-- testing -->llionaire millionair<!-- -->e
--- 2,6 ----
Subject: [spam]
X-Text-Classification: spam
! X-POPFile-Link: http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg
who wants to be a millionaire milli<!---->onaire mi<!-- testing -->llionaire millionair<!-- -->e
Index: TestMailParse003.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse003.cam,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TestMailParse003.cam 26 Jun 2003 14:09:00 -0000 1.5
--- TestMailParse003.cam 11 Jul 2003 21:53:30 -0000 1.6
***************
*** 15,19 ****
X-OriginalArrivalTime: 13 Jan 2003 00:49:31.0608 (UTC) FILETIME=[A257A580:01C2BA9D]
X-Text-Classification: spam
! X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
--=gs6mlah1knva3tk5nbs4422k3570q7m3k==
--- 15,19 ----
X-OriginalArrivalTime: 13 Jan 2003 00:49:31.0608 (UTC) FILETIME=[A257A580:01C2BA9D]
X-Text-Classification: spam
! X-POPFile-Link: http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg
--=gs6mlah1knva3tk5nbs4422k3570q7m3k==
Index: TestMailParse004.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse004.cam,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMailParse004.cam 16 Apr 2003 01:26:45 -0000 1.4
--- TestMailParse004.cam 11 Jul 2003 21:53:30 -0000 1.5
***************
*** 10,14 ****
X-UIDL: B<E!!^8S!!0'="!J;6"!
X-Text-Classification: spam
! X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
------=_NextPart_000_60BF_00005753.000048CC
--- 10,14 ----
X-UIDL: B<E!!^8S!!0'="!J;6"!
X-Text-Classification: spam
! X-POPFile-Link: http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg
------=_NextPart_000_60BF_00005753.000048CC
Index: TestMailParse005.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse005.cam,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMailParse005.cam 16 Apr 2003 01:26:45 -0000 1.4
--- TestMailParse005.cam 11 Jul 2003 21:53:30 -0000 1.5
***************
*** 6,10 ****
X-UIDL: ll'"!$DC!!7ld"!85K!!
X-Text-Classification: spam
! X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
Below is the result of your feedback form. It was submitted by
--- 6,10 ----
X-UIDL: ll'"!$DC!!7ld"!85K!!
X-Text-Classification: spam
! X-POPFile-Link: http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg
Below is the result of your feedback form. It was submitted by
Index: TestMailParse006.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse006.cam,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMailParse006.cam 16 Apr 2003 01:26:45 -0000 1.4
--- TestMailParse006.cam 11 Jul 2003 21:53:30 -0000 1.5
***************
*** 2,6 ****
Subject: [spam]
X-Text-Classification: spam
! X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
We're so sure about the quality and effectiveness of our p.roducts, we
--- 2,6 ----
Subject: [spam]
X-Text-Classification: spam
! X-POPFile-Link: http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg
We're so sure about the quality and effectiveness of our p.roducts, we
Index: TestMailParse007.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse007.cam,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMailParse007.cam 16 Apr 2003 01:26:45 -0000 1.4
--- TestMailParse007.cam 11 Jul 2003 21:53:30 -0000 1.5
***************
*** 11,15 ****
Subject: [spam] Think you've seen porn? How about a dog giving 5+ girls oral sex till they cum?
X-Text-Classification: spam
! X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
So you think you've seen some crazy porn?
--- 11,15 ----
Subject: [spam] Think you've seen porn? How about a dog giving 5+ girls oral sex till they cum?
X-Text-Classification: spam
! X-POPFile-Link: http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg
So you think you've seen some crazy porn?
Index: TestMailParse008.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse008.cam,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMailParse008.cam 16 Apr 2003 01:26:45 -0000 1.4
--- TestMailParse008.cam 11 Jul 2003 21:53:30 -0000 1.5
***************
*** 14,18 ****
Message-Id: <20030112013444.RTJR4607.priv-edtnes27.telusplanet.net@N1N>
X-Text-Classification: spam
! X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
<HTML><HEAD><TITLE></TITLE>
--- 14,18 ----
Message-Id: <20030112013444.RTJR4607.priv-edtnes27.telusplanet.net@N1N>
X-Text-Classification: spam
! X-POPFile-Link: http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg
<HTML><HEAD><TITLE></TITLE>
Index: TestMailParse009.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse009.cam,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMailParse009.cam 16 Apr 2003 01:26:45 -0000 1.4
--- TestMailParse009.cam 11 Jul 2003 21:53:30 -0000 1.5
***************
*** 16,20 ****
Message-ID: <avj...@FQ...>
X-Text-Classification: spam
! X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
<font color=white>*-*-**-*-*-*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*
--- 16,20 ----
Message-ID: <avj...@FQ...>
X-Text-Classification: spam
! X-POPFile-Link: http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg
<font color=white>*-*-**-*-*-*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*-*-*--*-*-*-*-*-*-*
Index: TestMailParse010.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse010.cam,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TestMailParse010.cam 26 Jun 2003 14:19:41 -0000 1.6
--- TestMailParse010.cam 11 Jul 2003 21:53:30 -0000 1.7
***************
*** 17,21 ****
Content-Transfer-Encoding: base64
X-Text-Classification: spam
! X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
Q29uZ3JhdHVsYXRpb25zIQ0KDQpZb3UgaGF2ZSBiZWVuIHNlbGVjdGVkIHRvIHJlY2lldmUgbWVt
--- 17,21 ----
Content-Transfer-Encoding: base64
X-Text-Classification: spam
! X-POPFile-Link: http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg
Q29uZ3JhdHVsYXRpb25zIQ0KDQpZb3UgaGF2ZSBiZWVuIHNlbGVjdGVkIHRvIHJlY2lldmUgbWVt
Index: TestMailParse011.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse011.cam,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TestMailParse011.cam 26 Jun 2003 14:09:00 -0000 1.5
--- TestMailParse011.cam 11 Jul 2003 21:53:30 -0000 1.6
***************
*** 17,21 ****
X-OriginalArrivalTime: 18 Jan 2003 06:26:40.0656 (UTC) FILETIME=[8FDC2900:01BAAAABA]
X-Text-Classification: spam
! X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
I think you answered my ad longtime ago if it was not you I am sorry.
--- 17,21 ----
X-OriginalArrivalTime: 18 Jan 2003 06:26:40.0656 (UTC) FILETIME=[8FDC2900:01BAAAABA]
X-Text-Classification: spam
! X-POPFile-Link: http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg
I think you answered my ad longtime ago if it was not you I am sorry.
Index: TestMailParse012.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse012.cam,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMailParse012.cam 16 Apr 2003 01:26:45 -0000 1.4
--- TestMailParse012.cam 11 Jul 2003 21:53:30 -0000 1.5
***************
*** 16,20 ****
X-POPFile-Link: <http://127.0.0.1:9090/jump_to_message?view=popfile2146=1.msg>
X-Text-Classification: spam
! X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
<html>
--- 16,20 ----
X-POPFile-Link: <http://127.0.0.1:9090/jump_to_message?view=popfile2146=1.msg>
X-Text-Classification: spam
! X-POPFile-Link: http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg
<html>
Index: TestMailParse013.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse013.cam,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TestMailParse013.cam 26 Jun 2003 14:09:00 -0000 1.5
--- TestMailParse013.cam 11 Jul 2003 21:53:30 -0000 1.6
***************
*** 20,24 ****
X-MBF-FILE: MDaemon Gateway to RFC822 (RFC822.MBF v1.0)
X-Text-Classification: spam
! X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
On Sun, 5 Jan 2003 22:46:10 -0800,
--- 20,24 ----
X-MBF-FILE: MDaemon Gateway to RFC822 (RFC822.MBF v1.0)
X-Text-Classification: spam
! X-POPFile-Link: http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg
On Sun, 5 Jan 2003 22:46:10 -0800,
Index: TestMailParse014.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse014.cam,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMailParse014.cam 16 Apr 2003 01:26:45 -0000 1.4
--- TestMailParse014.cam 11 Jul 2003 21:53:30 -0000 1.5
***************
*** 10,14 ****
X-OriginalArrivalTime: 26 Nov 2002 04:51:23.0664 (UTC) FILETIME=[785FA900:01C29507]
X-Text-Classification: spam
! X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
<BODY BGCOLOR="WHITE">
--- 10,14 ----
X-OriginalArrivalTime: 26 Nov 2002 04:51:23.0664 (UTC) FILETIME=[785FA900:01C29507]
X-Text-Classification: spam
! X-POPFile-Link: http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg
<BODY BGCOLOR="WHITE">
Index: TestMailParse015.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse015.cam,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMailParse015.cam 16 Apr 2003 01:26:45 -0000 1.4
--- TestMailParse015.cam 11 Jul 2003 21:53:31 -0000 1.5
***************
*** 16,20 ****
X-UIDL: &Tb"!2d_!!]9M!!OK]!!
X-Text-Classification: spam
! X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
------=_NextPart_000_00C3_68A82A2C.D7041A60
--- 16,20 ----
X-UIDL: &Tb"!2d_!!]9M!!OK]!!
X-Text-Classification: spam
! X-POPFile-Link: http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg
------=_NextPart_000_00C3_68A82A2C.D7041A60
Index: TestMailParse016.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse016.cam,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMailParse016.cam 16 Apr 2003 01:26:46 -0000 1.4
--- TestMailParse016.cam 11 Jul 2003 21:53:31 -0000 1.5
***************
*** 2,6 ****
Subject: [spam]
X-Text-Classification: spam
! X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
--- 2,6 ----
Subject: [spam]
X-Text-Classification: spam
! X-POPFile-Link: http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg
Index: TestMailParse017.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse017.cam,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMailParse017.cam 16 Apr 2003 01:26:46 -0000 1.4
--- TestMailParse017.cam 11 Jul 2003 21:53:31 -0000 1.5
***************
*** 19,23 ****
X-OriginalArrivalTime: 25 Jan 2003 07:51:07.0369 (UTC)
X-Text-Classification: spam
! X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
------=_NextPart_000_33CD_00000E99.00006014
--- 19,23 ----
X-OriginalArrivalTime: 25 Jan 2003 07:51:07.0369 (UTC)
X-Text-Classification: spam
! X-POPFile-Link: http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg
------=_NextPart_000_33CD_00000E99.00006014
Index: TestMailParse018.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse018.cam,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMailParse018.cam 16 Apr 2003 01:26:46 -0000 1.4
--- TestMailParse018.cam 11 Jul 2003 21:53:31 -0000 1.5
***************
*** 20,24 ****
X-POPFile-Link: http://127.0.0.1:8080/jump_to_message?view=popfile1043193600_48.msg
X-Text-Classification: spam
! X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
--isboundary
--- 20,24 ----
X-POPFile-Link: http://127.0.0.1:8080/jump_to_message?view=popfile1043193600_48.msg
X-Text-Classification: spam
! X-POPFile-Link: http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg
--isboundary
Index: TestMailParse019.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse019.cam,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse019.cam 28 Feb 2003 01:57:23 -0000 1.2
--- TestMailParse019.cam 11 Jul 2003 21:53:31 -0000 1.3
***************
*** 22,26 ****
X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile523=1.msg>
X-Text-Classification: spam
! X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
--isboundary
--- 22,26 ----
X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile523=1.msg>
X-Text-Classification: spam
! X-POPFile-Link: http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg
--isboundary
Index: TestMailParse020.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse020.cam,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMailParse020.cam 16 Apr 2003 01:26:46 -0000 1.4
--- TestMailParse020.cam 11 Jul 2003 21:53:31 -0000 1.5
***************
*** 25,29 ****
X-Sender: 320...@t-...
X-Text-Classification: spam
! X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
--=.P.GDOi)uP6IbU+
--- 25,29 ----
X-Sender: 320...@t-...
X-Text-Classification: spam
! X-POPFile-Link: http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg
--=.P.GDOi)uP6IbU+
Index: TestMailParse021.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse021.cam,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMailParse021.cam 16 Apr 2003 01:26:46 -0000 1.4
--- TestMailParse021.cam 11 Jul 2003 21:53:31 -0000 1.5
***************
*** 28,32 ****
X-OriginalArrivalTime: 13 Feb 2003 02:51:23.0500 (UTC) FILETIME=[CB6012C0:01C2D30A]
X-Text-Classification: spam
! X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
<html><body><font face=Tahoma size=2 color=#FFFFFF><table border=0 width=489 height=41 bgcolor=#FFFFFF><tr><td width=100% height=35 bgcolor=#000000 align=center><font face=Impact size=3 color=#00FFFF>Take Control of Your Computer With This Top-of-the-Line Software!</font></td></tr></table><table border=5 cellspacing=3 width=489 cellpadding=3 bgcolor=#000080 bordercolor=#FFFFFF style="border-collapse: collapse" bordercolordark=#000000 height=567 bordercolorlight=#CCCCFF><tr><td width=467 height=555 bordercolorlight=#FFFFFF bordercolordark=#FFFF99><table border=6 width=100% height=86 bgcolor=#000000 bordercolor=#FFFFFF><tr><td width=100% height=80 align=center><b><font face=Tahoma size=6 color=#FFFFFF>
--- 28,32 ----
X-OriginalArrivalTime: 13 Feb 2003 02:51:23.0500 (UTC) FILETIME=[CB6012C0:01C2D30A]
X-Text-Classification: spam
! X-POPFile-Link: http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg
<html><body><font face=Tahoma size=2 color=#FFFFFF><table border=0 width=489 height=41 bgcolor=#FFFFFF><tr><td width=100% height=35 bgcolor=#000000 align=center><font face=Impact size=3 color=#00FFFF>Take Control of Your Computer With This Top-of-the-Line Software!</font></td></tr></table><table border=5 cellspacing=3 width=489 cellpadding=3 bgcolor=#000080 bordercolor=#FFFFFF style="border-collapse: collapse" bordercolordark=#000000 height=567 bordercolorlight=#CCCCFF><tr><td width=467 height=555 bordercolorlight=#FFFFFF bordercolordark=#FFFF99><table border=6 width=100% height=86 bgcolor=#000000 bordercolor=#FFFFFF><tr><td width=100% height=80 align=center><b><font face=Tahoma size=6 color=#FFFFFF>
|
|
From: <jgr...@us...> - 2003-07-11 21:53:19
|
Update of /cvsroot/popfile/engine
In directory sc8-pr-cvs1:/tmp/cvs-serv27423
Modified Files:
tests.pl
Log Message:
Make the test runner alert when errors are found within test suites
Index: tests.pl
===================================================================
RCS file: /cvsroot/popfile/engine/tests.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** tests.pl 9 Jul 2003 18:18:09 -0000 1.17
--- tests.pl 11 Jul 2003 21:53:16 -0000 1.18
***************
*** 171,175 ****
}
close SUITE;
! eval $suite;
if ( $test_failures > $current_error_count ) {
--- 171,177 ----
}
close SUITE;
! if ( !defined( eval $suite ) ) {
! print "Error in $test: $@";
! }
if ( $test_failures > $current_error_count ) {
|
|
From: <jgr...@us...> - 2003-07-11 21:53:00
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv27368/Classifier
Modified Files:
Bayes.pm
Log Message:
Small modifications to Bayes to clean up code and make sure that very large quarantined messages get the trailing MIME boundary
Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.166
retrieving revision 1.167
diff -C2 -d -r1.166 -r1.167
*** Bayes.pm 11 Jul 2003 05:29:21 -0000 1.166
--- Bayes.pm 11 Jul 2003 21:52:55 -0000 1.167
***************
*** 1197,1221 ****
}
! if ( $got_full_body == 0 ) {
! if ( $echo ) {
! $self->echo_to_dot_( $mail, $client, ">>" . $temp_file );
! } else {
! $self->echo_to_dot_( $mail, undef, ">>" . $temp_file );
! }
! } else {
! if ( $classification ne 'unclassified' ) {
! if ( ( $self->{parameters__}{$classification}{quarantine} == 1 ) && $echo ) {
! print $client "$eol--$temp_file--$eol";
! }
}
! print $client "$eol.$eol" if ( $echo );
}
if ( $nosave ) {
unlink( $temp_file );
! }
!
! if ( !$nosave ) {
$self->history_write_class($class_file, undef, $classification, undef, ($self->{magnet_used__}?$self->{magnet_detail__}:undef));
--- 1197,1217 ----
}
! if ( !$got_full_body ) {
! $self->echo_to_dot_( $mail, $echo?$client:undef, '>>' . $temp_file );
! }
!
! if ( $classification ne 'unclassified' ) {
! if ( ( $self->{parameters__}{$classification}{quarantine} == 1 ) && $echo ) {
! print $client "$eol--$temp_file--$eol";
}
+ }
! if ( $echo ) {
! print $client "$eol.$eol";
}
if ( $nosave ) {
unlink( $temp_file );
! } else {
$self->history_write_class($class_file, undef, $classification, undef, ($self->{magnet_used__}?$self->{magnet_detail__}:undef));
***************
*** 1465,1468 ****
--- 1461,1468 ----
my ( $self, $bucket ) = @_;
+ if ( !defined( $self->{total__}{$bucket} ) ) {
+ return;
+ }
+
my $bucket_directory = $self->config_( 'corpus' ) . "/$bucket";
***************
*** 1490,1493 ****
--- 1490,1497 ----
my ( $self, $old_bucket, $new_bucket ) = @_;
+ if ( !defined( $self->{total__}{$old_bucket} ) ) {
+ return;
+ }
+
rename($self->config_( 'corpus' ) . "/$old_bucket" , $self->config_( 'corpus' ) . "/$new_bucket");
***************
*** 1509,1512 ****
--- 1513,1523 ----
my ( $self, $bucket, @files ) = @_;
+ # Verify that the bucket exists. You must call create_bucket before this
+ # when making a new bucket.
+
+ if ( !defined( $self->{total__}{$bucket} ) ) {
+ return;
+ }
+
my %words;
***************
*** 1585,1588 ****
--- 1596,1606 ----
{
my ( $self, $file, $bucket ) = @_;
+
+ # Verify that the bucket exists. You must call create_bucket before this
+ # when making a new bucket.
+
+ if ( !defined( $self->{total__}{$bucket} ) ) {
+ return;
+ }
my %words;
|
|
From: <jgr...@us...> - 2003-07-11 19:07:16
|
Update of /cvsroot/popfile/engine/manual/de In directory sc8-pr-cvs1:/tmp/cvs-serv3813 Modified Files: email.html Log Message: Fix error in German Index: email.html =================================================================== RCS file: /cvsroot/popfile/engine/manual/de/email.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** email.html 10 Dec 2002 21:51:09 -0000 1.1 --- email.html 11 Jul 2003 19:07:13 -0000 1.2 *************** *** 157,161 **** <li>Wählen Sie in Outlook Extras -> Regel-Assistent... <a href=o_filter1.png>[screenshot]</a> <li>Der Regel-Assistent erscheint nun. Klicken Sie auf "Neu..." und wählen Sie "Regel ohne Vorlage erstellen". <a href=o_filter2.png>[screenshot]</a> ! <li>Outlook kann den <b>X-Text-Classification</b> Header verwenden. Dies erlaubt ein völlig unsichtbares Filtern der Emails im Hintergrund. Klicken Sie auf "Weiter" und wählen <i>mit bestimmten Wörtern im Betreff</i>. <li>Klicken Sie nun auf den grau hervorgehobenen Link <i>bestimmte Wörter</i> und geben Sie "X-Text-Classification: " gefolgt von dem Namen einer der von Ihnen eingerichteten Kategorien ein und klicken Sie "Hinzufügen" und dann "OK". <li>Klicken Sie auf "Weiter" und wählen Sie <i>in einen bestimmten Ordner verschieben</i>. --- 157,161 ---- <li>Wählen Sie in Outlook Extras -> Regel-Assistent... <a href=o_filter1.png>[screenshot]</a> <li>Der Regel-Assistent erscheint nun. Klicken Sie auf "Neu..." und wählen Sie "Regel ohne Vorlage erstellen". <a href=o_filter2.png>[screenshot]</a> ! <li>Outlook kann den <b>X-Text-Classification</b> Header verwenden. Dies erlaubt ein völlig unsichtbares Filtern der Emails im Hintergrund. Klicken Sie auf "Weiter" und wählen <i>mit bestimmten Wörtern in der Nachrichtenkpfzeile"</i>. <li>Klicken Sie nun auf den grau hervorgehobenen Link <i>bestimmte Wörter</i> und geben Sie "X-Text-Classification: " gefolgt von dem Namen einer der von Ihnen eingerichteten Kategorien ein und klicken Sie "Hinzufügen" und dann "OK". <li>Klicken Sie auf "Weiter" und wählen Sie <i>in einen bestimmten Ordner verschieben</i>. |
Update of /cvsroot/popfile/engine/manual/kr In directory sc8-pr-cvs1:/tmp/cvs-serv29512/kr Added Files: email.html email_other_con.html email_other_filter.html firewalls.html firsttime.html installing.html manual.html multiple.html o_filter1_kr.gif o_filter2_kr.gif o_popfile1_kr.gif o_popfile2_kr.gif o_popfile3_kr.gif oe_filter1_kr.gif oe_filter2_2_kr.gif oe_filter2_kr.gif oe_filter3_kr.gif oe_filter4_kr.gif oe_filter5_kr.gif oe_popfile1_kr.gif oe_popfile2_kr.gif oe_popfile3_kr.gif oe_popfile4_kr.gif proxies.html spa.html training.html Log Message: Added Korean manual --- NEW FILE: email.html --- (This appears to be a binary file; contents omitted.) --- NEW FILE: email_other_con.html --- (This appears to be a binary file; contents omitted.) --- NEW FILE: email_other_filter.html --- (This appears to be a binary file; contents omitted.) --- NEW FILE: firewalls.html --- (This appears to be a binary file; contents omitted.) --- NEW FILE: firsttime.html --- (This appears to be a binary file; contents omitted.) --- NEW FILE: installing.html --- (This appears to be a binary file; contents omitted.) --- NEW FILE: manual.html --- (This appears to be a binary file; contents omitted.) --- NEW FILE: multiple.html --- (This appears to be a binary file; contents omitted.) --- NEW FILE: o_filter1_kr.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: o_filter2_kr.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: o_popfile1_kr.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: o_popfile2_kr.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: o_popfile3_kr.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: oe_filter1_kr.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: oe_filter2_2_kr.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: oe_filter2_kr.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: oe_filter3_kr.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: oe_filter4_kr.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: oe_filter5_kr.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: oe_popfile1_kr.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: oe_popfile2_kr.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: oe_popfile3_kr.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: oe_popfile4_kr.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: proxies.html --- (This appears to be a binary file; contents omitted.) --- NEW FILE: spa.html --- (This appears to be a binary file; contents omitted.) --- NEW FILE: training.html --- (This appears to be a binary file; contents omitted.) |
|
From: <jgr...@us...> - 2003-07-11 18:22:12
|
Update of /cvsroot/popfile/engine/manual/kr In directory sc8-pr-cvs1:/tmp/cvs-serv29345/kr Log Message: Directory /cvsroot/popfile/engine/manual/kr added to the repository |
|
From: <ssc...@us...> - 2003-07-11 05:29:29
|
Update of /cvsroot/popfile/engine/Classifier In directory sc8-pr-cvs1:/tmp/cvs-serv19391 Modified Files: Bayes.pm Log Message: add binmode comment for classify_and_modify Index: Bayes.pm =================================================================== RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v retrieving revision 1.165 retrieving revision 1.166 diff -C2 -d -r1.165 -r1.166 *** Bayes.pm 11 Jul 2003 02:24:58 -0000 1.165 --- Bayes.pm 11 Jul 2003 05:29:21 -0000 1.166 *************** *** 975,978 **** --- 975,980 ---- # was saved # + # IMPORTANT NOTE: $mail and $client should be binmode + # # --------------------------------------------------------------------------------------------- sub classify_and_modify |
|
From: <ssc...@us...> - 2003-07-11 02:25:01
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv30203
Modified Files:
Bayes.pm
Log Message:
remove some possibly extraneous binmodes of streams
Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.164
retrieving revision 1.165
diff -C2 -d -r1.164 -r1.165
*** Bayes.pm 11 Jul 2003 02:12:43 -0000 1.164
--- Bayes.pm 11 Jul 2003 02:24:58 -0000 1.165
***************
*** 982,990 ****
$echo = 1 unless (defined $echo);
- # binmode both our streams incase they're file streams or something odd
-
- binmode $mail;
- binmode $client;
-
my $msg_subject = ''; # The message subject
my $msg_head_before = ''; # Store the message headers that come before Subject here
--- 982,985 ----
|
|
From: <jgr...@us...> - 2003-07-11 02:12:46
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv28660
Modified Files:
Bayes.pm
Log Message:
Fix a bug where the headers of messages larger than 100000 bytes were going to be corrupted because of the latest change I made to write the MSG file after the CLS
Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.163
retrieving revision 1.164
diff -C2 -d -r1.163 -r1.164
*** Bayes.pm 9 Jul 2003 21:53:19 -0000 1.163
--- Bayes.pm 11 Jul 2003 02:12:43 -0000 1.164
***************
*** 1011,1015 ****
my $getting_headers = 1;
! my $temp_file = $self->history_filename($dcount,$mcount, ".msg",1);
my $nopath_temp_file = $self->history_filename($dcount,$mcount,".msg",0);
--- 1011,1016 ----
my $getting_headers = 1;
! my $msg_file = $self->history_filename($dcount,$mcount, ".msg",1);
! my $temp_file = "$msg_file.tmp";
my $nopath_temp_file = $self->history_filename($dcount,$mcount,".msg",0);
***************
*** 1026,1030 ****
# get class file errors
! open TEMP, ">$temp_file.tmp";
while ( <$mail> ) {
--- 1027,1031 ----
# get class file errors
! open TEMP, ">$temp_file";
while ( <$mail> ) {
***************
*** 1209,1213 ****
if ( ( $self->{parameters__}{$classification}{quarantine} == 1 ) && $echo ) {
print $client "$eol--$temp_file--$eol";
! }
}
--- 1210,1214 ----
if ( ( $self->{parameters__}{$classification}{quarantine} == 1 ) && $echo ) {
print $client "$eol--$temp_file--$eol";
! }
}
***************
*** 1226,1230 ****
# file error since it was already written
! rename "$temp_file.tmp", $temp_file;
}
--- 1227,1232 ----
# file error since it was already written
! unlink $msg_file;
! rename $temp_file, $msg_file;
}
|
|
From: <jgr...@us...> - 2003-07-10 04:28:18
|
Update of /cvsroot/popfile/engine/POPFile
In directory sc8-pr-cvs1:/tmp/cvs-serv8514/POPFile
Modified Files:
Configuration.pm
Log Message:
New test suites for MQ and Configuration; helper class for testing MQ; Logger, MQ and Module now over 90% covered by tests
Index: Configuration.pm
===================================================================
RCS file: /cvsroot/popfile/engine/POPFile/Configuration.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Configuration.pm 1 Jul 2003 18:38:59 -0000 1.20
--- Configuration.pm 10 Jul 2003 04:28:15 -0000 1.21
***************
*** 25,29 ****
# Class new() function
#----------------------------------------------------------------------------
! sub new
{
my $type = shift;
--- 25,29 ----
# Class new() function
#----------------------------------------------------------------------------
! sub new
{
my $type = shift;
|
|
From: <jgr...@us...> - 2003-07-10 04:28:18
|
Update of /cvsroot/popfile/engine/Devel
In directory sc8-pr-cvs1:/tmp/cvs-serv8514/Devel
Modified Files:
TestCoverage.pm
Log Message:
New test suites for MQ and Configuration; helper class for testing MQ; Logger, MQ and Module now over 90% covered by tests
Index: TestCoverage.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Devel/TestCoverage.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestCoverage.pm 9 Jul 2003 18:18:16 -0000 1.1
--- TestCoverage.pm 10 Jul 2003 04:28:15 -0000 1.2
***************
*** 45,49 ****
for my $file (keys %count)
{
! if ( ( $file =~ /^[^\/]/ ) && ( $file ne 'tests.pl' ) ) {
my $current_line = 0;
--- 45,49 ----
for my $file (keys %count)
{
! if ( ( $file =~ /^[^\/]/ ) && ( $file ne 'tests.pl' ) && !( $file =~ /^Test\// ) ) {
my $current_line = 0;
***************
*** 63,67 ****
# comments or just have braces on them or
# just an else or just a subroutine definition
! if ( ( /^\s*\#/ == 0 ) && ( /^\s*$/ == 0 ) && ( /^\s*(\{|\}|else)\s*$/ == 0 ) && ( /^\s*sub \w+( \{)?\s*$/ == 0 ) )
{
$count{$file}{total_executable_lines} += 1;
--- 63,67 ----
# comments or just have braces on them or
# just an else or just a subroutine definition
! if ( ( /^\s*\#/ == 0 ) && ( /^\s*$/ == 0 ) && ( /^\s*(\{|\}|else|\s)+\s*$/ == 0 ) && ( /^\s*sub \w+( \{)?\s*$/ == 0 ) )
{
$count{$file}{total_executable_lines} += 1;
|
|
From: <jgr...@us...> - 2003-07-10 04:28:18
|
Update of /cvsroot/popfile/engine/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv8514/tests
Modified Files:
TestModule.tst
Added Files:
TestConfiguration.tst TestMQ.tst
Log Message:
New test suites for MQ and Configuration; helper class for testing MQ; Logger, MQ and Module now over 90% covered by tests
--- NEW FILE: TestConfiguration.tst ---
# ---------------------------------------------------------------------------------------------
#
# Tests for Configuration.pm
#
# Copyright (c) 2003 John Graham-Cumming
#
# ---------------------------------------------------------------------------------------------
use POPFile::Configuration;
use POPFile::MQ;
use POPFile::Logger;
my $c = new POPFile::Configuration;
my $mq = new POPFile::MQ;
my $l = new POPFile::Logger;
$c->configuration( $c );
# Check that we can get and set a parameter
$c->parameter( 'testparam', 'testvalue' );
test_assert_equal( $c->parameter( 'testparam' ), 'testvalue' );
# Check that we can get the full hash of parameters
my @all = $c->configuration_parameters();
test_assert_equal( $#all, 0 );
test_assert_equal( $all[0], 'testparam' );
$c->mq( $mq );
$c->logger( $l );
$l->configuration( $c );
$l->mq( $mq );
$l->logger( $l );
$l->initialize();
$mq->configuration( $c );
$mq->mq( $mq );
$mq->logger( $l );
# Basic tests
test_assert_equal( $c->name(), 'config' );
# Parameters
test_assert_equal( $c->initialize(), 1 );
test_assert_equal( $c->config_( 'piddir' ), './' );
test_assert_equal( $c->global_config_( 'download_count' ), 0 );
test_assert_equal( $c->global_config_( 'timeout' ), 60 );
test_assert_equal( $c->global_config_( 'xtc' ), 1 );
test_assert_equal( $c->global_config_( 'xpl' ), 1 );
test_assert_equal( $c->global_config_( 'subject' ), 1 );
test_assert_equal( $c->global_config_( 'msgdir' ), 'messages/' );
# Check that the PID file gets created and then deleted and
# contains the correct process ID
$c->config_( 'piddir', 'tests/' );
test_assert_equal( $c->start(), 1 );
test_assert( ( -e 'tests/popfile.pid' ) );
open PIDFILE, '<tests/popfile.pid';
my $pid = <PIDFILE>;
close PIDFILE;
test_assert_equal( $pid, $$ );
$c->stop();
test_assert( !( -e 'tests/popfile.pid' ) );
--- NEW FILE: TestMQ.tst ---
# ---------------------------------------------------------------------------------------------
#
# Tests for MQ.pm
#
# Copyright (c) 2003 John Graham-Cumming
#
# ---------------------------------------------------------------------------------------------
use POPFile::Configuration;
use POPFile::MQ;
use POPFile::Logger;
my $c = new POPFile::Configuration;
my $mq = new POPFile::MQ;
my $l = new POPFile::Logger;
$c->configuration( $c );
$c->mq( $mq );
$c->logger( $l );
$l->configuration( $c );
$l->mq( $mq );
$l->logger( $l );
$l->initialize();
$mq->configuration( $c );
$mq->mq( $mq );
$mq->logger( $l );
# Basic configuration
test_assert_equal( $mq->name(), 'mq' );
# This is a helper object with a deliver
# function that can be called by the message queue
# and a read function that we can call to check that
# messages are getting delivered
use Test::MQReceiver;
my $r = new Test::MQReceiver;
# Register three different message types
$mq->register( 'MSG1', $r );
$mq->register( 'MSG2', $r );
$mq->register( 'MSG3', $r );
# Now send messages and check for their receipt
# First send a single message and check that it is
# received
$mq->post( 'MSG1', 'message1', 'param1' );
$mq->service();
my @messages = $r->read();
test_assert_equal( $#messages, 0 );
test_assert_equal( $messages[0][0], 'MSG1' );
test_assert_equal( $messages[0][1], 'message1' );
test_assert_equal( $messages[0][2], 'param1' );
# Now send three messages and check that they are
# received
$mq->post( 'MSG1', 'message1', 'param1' );
$mq->post( 'MSG2', 'message2', 'param2' );
$mq->post( 'MSG3', 'message3', 'param3' );
$mq->service();
my @messages = $r->read();
test_assert_equal( $#messages, 2 );
test_assert_equal( $messages[0][0], 'MSG1' );
test_assert_equal( $messages[0][1], 'message1' );
test_assert_equal( $messages[0][2], 'param1' );
test_assert_equal( $messages[1][0], 'MSG2' );
test_assert_equal( $messages[1][1], 'message2' );
test_assert_equal( $messages[1][2], 'param2' );
test_assert_equal( $messages[2][0], 'MSG3' );
test_assert_equal( $messages[2][1], 'message3' );
test_assert_equal( $messages[2][2], 'param3' );
# Now send a message that we have not registered
# and check that we do not receive it
$mq->post( 'MSG4', 'message4', 'param4' );
$mq->service();
my @messages = $r->read();
test_assert_equal( $#messages, -1 );
# Now register for it and try to get the message
# this should fail as it should have been cleared
$mq->register( 'MSG3', $r );
$mq->service();
my @messages = $r->read();
test_assert_equal( $#messages, -1 );
# Now try sending the same message multiple times
$mq->post( 'MSG1', 'message1', 'param1' );
$mq->post( 'MSG1', 'message1', 'param1' );
$mq->post( 'MSG1', 'message1', 'param1' );
$mq->service();
my @messages = $r->read();
test_assert_equal( $#messages, 2 );
test_assert_equal( $messages[0][0], 'MSG1' );
test_assert_equal( $messages[0][1], 'message1' );
test_assert_equal( $messages[0][2], 'param1' );
test_assert_equal( $messages[1][0], 'MSG1' );
test_assert_equal( $messages[1][1], 'message1' );
test_assert_equal( $messages[1][2], 'param1' );
test_assert_equal( $messages[1][0], 'MSG1' );
test_assert_equal( $messages[1][1], 'message1' );
test_assert_equal( $messages[1][2], 'param1' );
Index: TestModule.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestModule.tst,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestModule.tst 1 Jul 2003 18:39:00 -0000 1.1
--- TestModule.tst 10 Jul 2003 04:28:16 -0000 1.2
***************
*** 49,52 ****
--- 49,64 ----
test_assert_equal( $mq->{queue__}{DUMMY}[0][1], 'param' );
+ # Check that register UI item sends the right message
+ use Test::MQReceiver;
+ my $r = new Test::MQReceiver;
+ $m->mq_register_( 'UIREG', $r );
+ $m->register_configuration_item_( 'type', 'name', $c );
+ $mq->service();
+ my @messages = $r->read();
+ test_assert_equal( $#messages, 0 );
+ test_assert_equal( $messages[0][0], 'UIREG' );
+ test_assert_equal( $messages[0][1], 'type:name' );
+ test_assert_equal( $messages[0][2], $c );
+
# Check that the logger function works
***************
*** 61,62 ****
--- 73,91 ----
test_assert( $l->{last_ten__}[0] =~ /logmsg/ );
test_assert_equal( $l->last_ten(), $m->last_ten_log_entries() );
+
+ # Check all the setter/getter functions
+
+ test_assert_equal( $m->mq(), $mq );
+ test_assert_equal( $m->configuration(), $c );
+ $m->forker( 'forker' );
+ test_assert_equal( $m->forker(), 'forker' );
+ test_assert_equal( $m->logger(), $l );
+ $m->pipeready( 'pr' );
+ test_assert_equal( $m->pipeready(), 'pr' );
+ test_assert_equal( $m->alive(), 1 );
+ $m->alive(0);
+ test_assert_equal( $m->alive(), 0 );
+ $m->name( 'newname' );
+ test_assert_equal( $m->name(), 'newname' );
+ $m->version( 'vt.t.t' );
+ test_assert_equal( $m->version(), 'vt.t.t' );
|
|
From: <jgr...@us...> - 2003-07-10 04:24:15
|
Update of /cvsroot/popfile/engine/Test In directory sc8-pr-cvs1:/tmp/cvs-serv8101/Test Log Message: Directory /cvsroot/popfile/engine/Test added to the repository |
|
From: <jgr...@us...> - 2003-07-09 23:32:53
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv32198/Classifier
Modified Files:
MailParse.pm
Log Message:
Make my last check in clearer and work with the test suite
Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.143
retrieving revision 1.144
diff -C2 -d -r1.143 -r1.144
*** MailParse.pm 9 Jul 2003 21:53:19 -0000 1.143
--- MailParse.pm 9 Jul 2003 23:32:50 -0000 1.144
***************
*** 1080,1084 ****
while ( $read =~ s/(.*?)[\r\n]+// ) {
! my $line = $1;
next if ( !defined($line) );
--- 1080,1084 ----
while ( $read =~ s/(.*?)[\r\n]+// ) {
! my $line = "$1\r\n";
next if ( !defined($line) );
|
|
From: <jgr...@us...> - 2003-07-09 21:53:22
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv18322/Classifier
Modified Files:
Bayes.pm MailParse.pm
Log Message:
Finally, and totally by chance, discovered the reason why some users sometimes report that a message has the right classification but the wrong XTC or subject modification. Fixed.
Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.162
retrieving revision 1.163
diff -C2 -d -r1.162 -r1.163
*** Bayes.pm 9 Jul 2003 18:18:11 -0000 1.162
--- Bayes.pm 9 Jul 2003 21:53:19 -0000 1.163
***************
*** 690,693 ****
--- 690,695 ----
my $total = 0;
+ $self->log_( "Base score is $base_score for $ranking[0]" );
+
# Compute the total of all the scores to generate the normalized scores and probability
# estimate. $total is always 1 after the first loop iteration, so any additional term
***************
*** 845,849 ****
{
my ( $self, $dcount, $mcount, $ext, $path) = @_;
!
$path = 0 if (!defined($path));
--- 847,851 ----
{
my ( $self, $dcount, $mcount, $ext, $path) = @_;
!
$path = 0 if (!defined($path));
***************
*** 1010,1015 ****
my $temp_file = $self->history_filename($dcount,$mcount, ".msg",1);
! my $nopath_temp_file = $self->history_filename($dcount,$mcount,".msg",0);
!
# Get the class-file info without the path, since we'd just need to strip it
my $class_file = $self->history_filename($dcount,$mcount, ".cls",0);
--- 1012,1017 ----
my $temp_file = $self->history_filename($dcount,$mcount, ".msg",1);
! my $nopath_temp_file = $self->history_filename($dcount,$mcount,".msg",0);
!
# Get the class-file info without the path, since we'd just need to strip it
my $class_file = $self->history_filename($dcount,$mcount, ".cls",0);
Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.142
retrieving revision 1.143
diff -C2 -d -r1.142 -r1.143
*** MailParse.pm 9 Jul 2003 18:18:14 -0000 1.142
--- MailParse.pm 9 Jul 2003 21:53:19 -0000 1.143
***************
*** 1079,1083 ****
# For the Mac we do further splitting of the line at the CR characters
! while ( $read =~ s/(.*?[\r\n]+)// ) {
my $line = $1;
--- 1079,1083 ----
# For the Mac we do further splitting of the line at the CR characters
! while ( $read =~ s/(.*?)[\r\n]+// ) {
my $line = $1;
|
|
From: <jgr...@us...> - 2003-07-09 21:53:21
|
Update of /cvsroot/popfile/engine
In directory sc8-pr-cvs1:/tmp/cvs-serv18322
Modified Files:
bayes.pl
Log Message:
Finally, and totally by chance, discovered the reason why some users sometimes report that a message has the right classification but the wrong XTC or subject modification. Fixed.
Index: bayes.pl
===================================================================
RCS file: /cvsroot/popfile/engine/bayes.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** bayes.pl 9 Jul 2003 18:18:09 -0000 1.19
--- bayes.pl 9 Jul 2003 21:53:19 -0000 1.20
***************
*** 16,21 ****
# main
! if ( $#ARGV == 0 )
! {
my $c = new POPFile::Configuration;
my $mq = new POPFile::MQ;
--- 16,20 ----
# main
! if ( $#ARGV == 0 ) {
my $c = new POPFile::Configuration;
my $mq = new POPFile::MQ;
***************
*** 48,57 ****
my @files = glob $ARGV[0];
! foreach my $file (@files)
! {
print "$file is '" . $b->classify($file) . "'\n";
}
! foreach my $word (keys %{$b->{parser__}->{words__}}) {
print "$word $b->{parser__}->{words__}{$word}\n";
}
--- 47,55 ----
my @files = glob $ARGV[0];
! foreach my $file (@files) {
print "$file is '" . $b->classify($file) . "'\n";
}
! foreach my $word (sort keys %{$b->{parser__}->{words__}}) {
print "$word $b->{parser__}->{words__}{$word}\n";
}
|
11 messages has been excluded from this view by a project administrator.
