[popfile-commit] engine/POPFile Configuration.pm,1.10,1.11

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

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

Modified Files:
	Configuration.pm 
Log Message:
Implemented the automatic upgrade of pre v0.19.0 command line and configuration file parameters

Index: Configuration.pm
===================================================================
RCS file: /cvsroot/popfile/engine/POPFile/Configuration.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Configuration.pm	5 Mar 2003 21:15:33 -0000	1.10
--- Configuration.pm	5 Mar 2003 22:49:04 -0000	1.11
***************
*** 75,79 ****
  
      if ( open PID, '>' . $self->config_( 'piddir' ) . 'popfile.pid' ) {
!         print PID "$$\n"; 
          close PID;
      }
--- 75,79 ----
  
      if ( open PID, '>' . $self->config_( 'piddir' ) . 'popfile.pid' ) {
!         print PID "$$\n";
          close PID;
      }
***************
*** 120,126 ****
  
              if ( $ARGV[$i] =~ /^-(.+)$/ ) {
!                 if ( defined($self->{configuration_parameters__}{$1}) ) {
                      if ( $i < $#ARGV ) {
!                         $self->{configuration_parameters__}{$1} = $ARGV[$i+1];
                          $i += 2;
                      } else {
--- 120,127 ----
  
              if ( $ARGV[$i] =~ /^-(.+)$/ ) {
! 	        my $parameter = $self->upgrade_parameter__($1);
!                 if ( defined($self->{configuration_parameters__}{$parameter}) ) {
                      if ( $i < $#ARGV ) {
!                         $self->{configuration_parameters__}{$parameter} = $ARGV[$i+1];
                          $i += 2;
                      } else {
***************
*** 142,148 ****
  # ---------------------------------------------------------------------------------------------
  #
  # load_configuration
  #
! # Loads the current configuration of popfile into the configuration hash from a local file.  
  # The format is a very simple set of lines containing a space separated name and value pair
  #
--- 143,229 ----
  # ---------------------------------------------------------------------------------------------
  #
+ # upgrade_parameter__
+ #
+ # Given a parameter from either command line or from the configuration file return the
+ # upgraded version (e.g. the old port parameter becomes pop3_port
+ #
+ # ---------------------------------------------------------------------------------------------
+ 
+ sub upgrade_parameter__
+ {
+     my ( $self, $parameter ) = @_;
+ 
+     # This table maps from the old parameter to the new one, for example the old
+     # xpl parameter which controls insertion of the X-POPFile-Link header in email
+     # is now called GLOBAL_xpl and is accessed through POPFile::Module::global_config_
+     # The old piddir parameter is now config_piddir and is accessed through either config_
+     # if accessed from the config module or through module_config_ from outside
+ 
+     my %upgrades = ( 
+ 
+ 		     # Parameters that are now handled by Classifier::Bayes
+ 
+ 		     'corpus',                   'bayes_corpus corpus',
+ 		     'unclassified_probability', 'bayes_unclassified_probability',
+ 
+ 		     # Parameters that are now handled by POPFile::Configuration
+ 
+ 		     'piddir',                   'config_piddir',
+ 
+ 		     # Parameters that are now global to POPFile
+ 
+ 		     'debug',                    'GLOBAL_debug',
+ 		     'ecount',                   'GLOBAL_ecount',
+ 		     'mcount',                   'GLOBAL_mcount',
+ 		     'msgdir',                   'GLOBAL_msgdir',
+ 		     'subject',                  'GLOBAL_subject',
+ 		     'imeout',                   'GLOBAL_timeout',
+ 		     'xpl',                      'GLOBAL_xpl',
+ 		     'xtc',                      'GLOBAL_xtc',
+ 
+ 		     # Parameters that are now handled by POPFile::Logger
+ 
+ 		     'logdir',                   'logger_logdir',
+ 
+ 		     # Parameters that are now handled by Proxy::POP3
+ 
+ 		     'download_count',           'pop3_download_count',
+ 		     'localpop',                 'pop3_local',
+ 		     'port',                     'pop3_port',
+ 		     'sport',                    'pop3_secure_port',
+ 		     'server',                   'pop3_secure_server',
+ 		     'separator',                'pop3_separator',
+ 		     'optoo',                    'pop3_toptoo',
+ 
+ 		     # Parameters that are now handled by UI::HTML
+ 
+ 		     'archive',                  'ui_archive',
+ 		     'archive_classes',          'ui_archive_classes',
+ 		     'archive_dir',              'ui_archive_dir',
+ 		     'history_days',             'ui_history_days',
+ 		     'language',                 'ui_language',
+ 		     'last_reset',               'ui_last_reset',
+ 		     'last_update_check',        'ui_last_update_check',
+ 		     'localui',                  'ui_local',
+ 		     'page_size',                'ui_page_size',
+ 		     'password',                 'ui_password',
+ 		     'send_stats',               'ui_send_stats',
+ 		     'skin',                     'ui_skin',
+ 		     'test_language',            'ui_test_language',
+ 		     'update_check',             'ui_update_check'
+     );
+ 
+     if ( defined( $upgrades{$parameter} ) ) {
+         return $upgrades{$parameter};
+     } else {
+         return $parameter;
+     }
+ }
+ 
+ # ---------------------------------------------------------------------------------------------
+ #
  # load_configuration
  #
! # Loads the current configuration of popfile into the configuration hash from a local file.
  # The format is a very simple set of lines containing a space separated name and value pair
  #
***************
*** 156,160 ****
              s/(\015|\012)//g; 
              if ( /(\S+) (.+)/ ) {
!                 $self->{configuration_parameters__}{$1} = $2;
              }
          }
--- 237,246 ----
              s/(\015|\012)//g; 
              if ( /(\S+) (.+)/ ) {
! 	        my $parameter = $1;
! 		my $value     = $2;
! 
! 		$parameter = $self->upgrade_parameter__($parameter);
! 
!                 $self->{configuration_parameters__}{$parameter} = $value;
              }
          }