[popfile-commit] engine/UI HTML.pm,1.223,1.224

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

Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv28710/UI

Modified Files:
	HTML.pm 
Log Message:
Ran test suite for the first time since introducing the changes
to use the BerkeleyDB environment.  A number of tests indicated that
there were problems...

TODO: There are still a small number of HTML tests failing that need to be 
investigated.

tests/Makefile:

Set the POPFILE_USER and POPFILE_ROOT variables for the shell which runs the
test suite to override any that are set in the parent environment.  Delete the
messages/ folder when tests have finished running.

tests.pl:

Ran dos2unix to remove DOS line endings.

bayes.pl
pipe.pl
insert.pl:

Added a call to POPFile::Configuration::initialize so that the POPFILE_ROOT
and POPFILE_USER paths are set up correctly.

UI/HTML.pm:

Make sure that the magnet and reclassified fields in the history cache are
never undefined.   stop() was not calling the parent stop() and hence the port
used by the HTTP interface was never closed.

Classifier/Bayes.pm:

Added the flag DB_CREATE to the BerkeleyDB::Hash set up since it is needed
for the first creation of the database.

load_word_matrix_ takes a parameter that specifies whether the matrix is
being loaded in a child or a parent process.  In child processes the matrix
will be loaded read only, in parent processes read/write and with recovery.
load_bucket_ and tie_bucket_ changed in line.

When starting delete the old BerkeleyDB environment files.  Child processes
get the DB_RDONLY flag on database access.

Classifier/MailParse.pm:

Fix lowercasing of the SpamAssassin headers.

tests/TestHTML.tst:

Added creation of a Classifier::WordMangle object since it is now required as
it has become an PLM.  Skip TestMailParse026 which is used just for the
Japanese tests.

Change to use the OO interface to String::Interpolate since the non-OO
interface is failing on Linux.

Start the WordMangle interface since that's when it loads the stopwords now.

tests/TestHTML.script:

Temporarily disable the tests for the UI password since they are affecting the
rest of the tests (TODO: need to reinstate these and find a way to get the new 
session key from the HTML interface while it is running).

tests/TestMailParse027.wrd:

Fix the case of the SpamAssassin header labels.

tests/TestBayes.tst:

Improve the message warning about text::Kakasi being missing.

tests/TestPOP3.tst:

Connect to 127.0.0.1 instead of localhost to avoid problems on Linux.  Make
the test POP3 server return lines from files using $eol instead of \n.

tests/TestMailParse001.msg:

Removed an extra blank line at the end so that it matches with tests/
TestMailParse001.cam.

All tests/*.tst files:

Added 1; to the end of each file so that the return code from the eval() in
tests.pl is set correctly.



Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.223
retrieving revision 1.224
diff -C2 -d -r1.223 -r1.224
*** HTML.pm	17 Nov 2003 19:28:29 -0000	1.223
--- HTML.pm	29 Nov 2003 23:54:26 -0000	1.224
***************
*** 308,311 ****
--- 308,313 ----
      $self->copy_pre_cache__();
      $self->save_disk_cache__();
+ 
+     $self->SUPER::stop();
  }
  
***************
*** 2619,2622 ****
--- 2621,2627 ----
      my $subject = '';
      my $long_header = '';
+ 
+     $magnet       = '' if ( !defined( $magnet ) );
+     $reclassified = '' if ( !defined( $reclassified ) );
  
      if ( open MAIL, '<'. $self->get_user_path_( $self->global_config_( 'msgdir' ) . $file ) ) {