[popfile-commit] engine/POPFile Configuration.pm,1.27,1.28

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

Update of /cvsroot/popfile/engine/POPFile
In directory sc8-pr-cvs1:/tmp/cvs-serv22773/POPFile

Modified Files:
	Configuration.pm 
Log Message:
Create test suites for the utility scripts:

    insert.pl
    bayes.pl
    pipe.pl


insert.pl:

Added code to detect errors (file does not exist,
bucket does not exist), output error messages and
return an error code.

Make sure that all POPFile modules are cleaned up
when done.

bayes.pl:

Added code to detect errors (file does not exist), 
output error messages and return an error code.

Make sure that all POPFile modules are cleaned up
when done.

pipe.pl:

Make sure that all POPFile modules are cleaned up
when done.

Pass in \n as the end of line character so that the
STDOUT output will have the right end of line character
for the platform pipe.pl is being used on.   If this
is not done then POPFile will use the standard network
line ending: \r\n.

Classifer/Bayes.pm:

Add reference to IO::Handle since we need it for
flush.

Add an optional $crlf option to classify_and_modify so
that it can be used with non-network streams that require
an EOL different from \r\n.  

If classify_and_modify is told not to save the file in
the history then there's no need to save the file even
temporarily because the streaming parsing added in v0.20.0
doesn't need a copy of the message on disk.

write_line__ might now be passed an undef file handle so
don't try to write to it.

If we are not saving the classification to the history
then don't add the XPL header (or the equivalent link
in a quarantined message) since it wont work.

POPFile/Configuration.pm:

Add code to determine whether there has been a 
configuration change.  This is done to prevent the
configuration being saved when nothing has changed.
This is particularly needed by the scripts which wont
change the configuration and shouldn't have the code
of a save.

tests/TestInsertScript.tst:

Test suite for insert.pl.

tests/TestBayesScript.tst:

Test suite for bayes.pl.

tests/TestPipeScript.tst:

Test suite for pipe.pl.



















Index: Configuration.pm
===================================================================
RCS file: /cvsroot/popfile/engine/POPFile/Configuration.pm,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** Configuration.pm	20 Aug 2003 03:09:03 -0000	1.27
--- Configuration.pm	20 Oct 2003 12:53:50 -0000	1.28
***************
*** 65,68 ****
--- 65,72 ----
      $self->{pid_check__} = time;
  
+     # Used to tell whether we need to save the configuration
+ 
+     $self->{save_needed__} = 0;
+ 
      bless $self, $type;
  
***************
*** 104,119 ****
--- 108,128 ----
  
      # The default timeout in seconds for POP3 commands
+ 
      $self->global_config_( 'timeout', 60 );
  
      # Subject modification (global setting is on)
+ 
      $self->global_config_( 'subject', 1 );
  
      # Adding the X-Text-Classification on
+ 
      $self->global_config_( 'xtc', 1 );
  
      # Adding the X-POPFile-Link is on
+ 
      $self->global_config_( 'xpl', 1 );
  
      # The default location for the message files
+ 
      $self->global_config_( 'msgdir', 'messages/' );
  
***************
*** 175,180 ****
  }
  
- 
- 
  # ---------------------------------------------------------------------------------------------
  #
--- 184,187 ----
***************
*** 193,197 ****
  }
  
- 
  # ---------------------------------------------------------------------------------------------
  #
--- 200,203 ----
***************
*** 450,453 ****
--- 456,461 ----
          close CONFIG;
      }
+ 
+     $self->{save_needed__} = 0;
  }
  
***************
*** 463,467 ****
--- 471,481 ----
      my ( $self ) = @_;
  
+     if ( $self->{save_needed__} == 0 ) {
+         return;
+     }
+ 
      if ( open CONFIG, ">popfile.cfg" ) {
+         $self->{save_needed__} = 0;
+ 
          foreach my $key (sort keys %{$self->{configuration_parameters__}}) {
              print CONFIG "$key $self->{configuration_parameters__}{$key}\n";
***************
*** 489,492 ****
--- 503,507 ----
  
    if ( defined( $value ) ) {
+     $self->{save_needed__} = 1;
      $self->{configuration_parameters__}{$name} = $value;
    }