[popfile-commit] engine/POPFile Configuration.pm,1.24,1.25 Loader.pm,1.3,1.4 Logger.pm,1.20,1.21 MQ.pm,1.3,1.4

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

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

Modified Files:
	Configuration.pm Loader.pm Logger.pm MQ.pm 
Log Message:
Remove all tabs from the source code and fix my editor so that *I* don't introduce any more

Index: Configuration.pm
===================================================================
RCS file: /cvsroot/popfile/engine/POPFile/Configuration.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Configuration.pm	26 Jul 2003 14:59:46 -0000	1.24
--- Configuration.pm	26 Jul 2003 18:28:28 -0000	1.25
***************
*** 304,308 ****
  
              if ( $ARGV[$i] =~ /^-(.+)$/ ) {
! 	        my $parameter = $self->upgrade_parameter__($1);
  
                  if ( defined($self->{configuration_parameters__}{$parameter}) ) {
--- 304,308 ----
  
              if ( $ARGV[$i] =~ /^-(.+)$/ ) {
!                 my $parameter = $self->upgrade_parameter__($1);
  
                  if ( defined($self->{configuration_parameters__}{$parameter}) ) {
***************
*** 347,398 ****
      my %upgrades = ( # PROFILE BLOCK START
  
! 		     # Parameters that are now handled by Classifier::Bayes
  
! 		     'corpus',                   'bayes_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',
! 		     'msgdir',                   'GLOBAL_msgdir',
! 		     'subject',                  'GLOBAL_subject',
! 		     'timeout',                  'GLOBAL_timeout',
! 		     'xpl',                      'GLOBAL_xpl',
! 		     'xtc',                      'GLOBAL_xtc',
! 		     'download_count',           'GLOBAL_download_count',
  
! 		     # Parameters that are now handled by POPFile::Logger
  
! 		     'logdir',                   'logger_logdir',
  
! 		     # Parameters that are now handled by Proxy::POP3
  
! 		     'localpop',                 'pop3_local',
! 		     'port',                     'pop3_port',
! 		     'sport',                    'pop3_secure_port',
! 		     'server',                   'pop3_secure_server',
! 		     'separator',                'pop3_separator',
! 		     'toptoo',                   'pop3_toptoo',
  
! 		     # Parameters that are now handled by UI::HTML
  
! 		     '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',
      ); # PROFILE BLOCK STOP
--- 347,398 ----
      my %upgrades = ( # PROFILE BLOCK START
  
!                      # Parameters that are now handled by Classifier::Bayes
  
!                      'corpus',                   'bayes_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',
!                      'msgdir',                   'GLOBAL_msgdir',
!                      'subject',                  'GLOBAL_subject',
!                      'timeout',                  'GLOBAL_timeout',
!                      'xpl',                      'GLOBAL_xpl',
!                      'xtc',                      'GLOBAL_xtc',
!                      'download_count',           'GLOBAL_download_count',
  
!                      # Parameters that are now handled by POPFile::Logger
  
!                      'logdir',                   'logger_logdir',
  
!                      # Parameters that are now handled by Proxy::POP3
  
!                      'localpop',                 'pop3_local',
!                      'port',                     'pop3_port',
!                      'sport',                    'pop3_secure_port',
!                      'server',                   'pop3_secure_server',
!                      'separator',                'pop3_separator',
!                      'toptoo',                   'pop3_toptoo',
  
!                      # Parameters that are now handled by UI::HTML
  
!                      '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',
      ); # PROFILE BLOCK STOP
***************
*** 421,428 ****
              s/(\015|\012)//g;
              if ( /(\S+) (.+)/ ) {
! 	        my $parameter = $1;
! 		my $value     = $2;
  
! 		$parameter = $self->upgrade_parameter__($parameter);
  
                  $self->{configuration_parameters__}{$parameter} = $value;
--- 421,428 ----
              s/(\015|\012)//g;
              if ( /(\S+) (.+)/ ) {
!                 my $parameter = $1;
!                 my $value     = $2;
  
!                 $parameter = $self->upgrade_parameter__($parameter);
  
                  $self->{configuration_parameters__}{$parameter} = $value;

Index: Loader.pm
===================================================================
RCS file: /cvsroot/popfile/engine/POPFile/Loader.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Loader.pm	17 Jul 2003 20:12:16 -0000	1.3
--- Loader.pm	26 Jul 2003 18:28:28 -0000	1.4
***************
*** 610,614 ****
          foreach my $name (keys %{$self->{components__}{$type}}) {
              print " $name" if $self->{debug__};
! 	    flush STDOUT;
              $self->{components__}{$type}{$name}->alive(0);
              $self->{components__}{$type}{$name}->stop();
--- 610,614 ----
          foreach my $name (keys %{$self->{components__}{$type}}) {
              print " $name" if $self->{debug__};
!             flush STDOUT;
              $self->{components__}{$type}{$name}->alive(0);
              $self->{components__}{$type}{$name}->stop();

Index: Logger.pm
===================================================================
RCS file: /cvsroot/popfile/engine/POPFile/Logger.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Logger.pm	9 Jul 2003 18:18:19 -0000	1.20
--- Logger.pm	26 Jul 2003 18:28:28 -0000	1.21
***************
*** 175,181 ****
          push @{$self->{last_ten__}}, ($msg);
  
! 	if ( $#{$self->{last_ten__}} > 9 ) {
              shift @{$self->{last_ten__}};
! 	}
      }
  }
--- 175,181 ----
          push @{$self->{last_ten__}}, ($msg);
  
!         if ( $#{$self->{last_ten__}} > 9 ) {
              shift @{$self->{last_ten__}};
!         }
      }
  }

Index: MQ.pm
===================================================================
RCS file: /cvsroot/popfile/engine/POPFile/MQ.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MQ.pm	12 Jul 2003 00:43:20 -0000	1.3
--- MQ.pm	26 Jul 2003 18:28:28 -0000	1.4
***************
*** 94,99 ****
  
                  $waiter->deliver( $type, $message, $parameter );
! 	    }
! 	}
      }
  
--- 94,99 ----
  
                  $waiter->deliver( $type, $message, $parameter );
!             }
!         }
      }