Update of /cvsroot/popfile/engine
In directory sc8-pr-cvs1:/tmp/cvs-serv16442a
Modified Files:
popfile.pl
Log Message:
Tidy up code
Index: popfile.pl
===================================================================
RCS file: /cvsroot/popfile/engine/popfile.pl,v
retrieving revision 1.212
retrieving revision 1.213
diff -C2 -d -r1.212 -r1.213
*** popfile.pl 12 Jul 2003 12:44:28 -0000 1.212
--- popfile.pl 17 Jul 2003 20:12:16 -0000 1.213
***************
*** 4,10 ****
# popfile.pl --- Message analyzer and sorter
#
! # Acts as a server and client designed to sit between a real mail/news client and a real mail
# news server using POP3. Inserts an extra header X-Text-Classification: into the header to
! # tell the client which category the message belongs in.
#
# Copyright (c) 2001-2003 John Graham-Cumming
--- 4,10 ----
# popfile.pl --- Message analyzer and sorter
#
! # Acts as a server and client designed to sit between a real mail/news client and a real mail/
# news server using POP3. Inserts an extra header X-Text-Classification: into the header to
! # tell the client which category the message belongs in and much more...
#
# Copyright (c) 2001-2003 John Graham-Cumming
***************
*** 14,34 ****
use strict;
use locale;
use POPFile::Loader;
! #
! #
! # MAIN
! #
! #
my $POPFile = POPFile::Loader->new();
! $POPFile->debug(1);
$POPFile->CORE_loader_init();
!
! my ( $major_version, $minor_version, $build_version ) = ( 0, 20, 0 );
!
! $POPFile->CORE_version($major_version, $minor_version, $build_version);
# Redefine POPFile's signals
--- 14,31 ----
use strict;
use locale;
+
use POPFile::Loader;
! # POPFile is actually loaded by the POPFile::Loader object which does all
! # the work
my $POPFile = POPFile::Loader->new();
! # Indicate that we should create output on STDOUT (the POPFile
! # load sequence) and initialize with the version
+ $POPFile->debug(1);
$POPFile->CORE_loader_init();
! $POPFile->CORE_version(0, 20, 0);
# Redefine POPFile's signals
***************
*** 38,67 ****
# Create the main objects that form the core of POPFile. Consists of the configuration
# modules, the classifier, the UI (currently HTML based), platform specific code,
! # and the POP3 proxy.
$POPFile->CORE_load();
-
- # Make sure each component knows about all the components it needs to know about
-
$POPFile->CORE_link_components();
-
- # Initialize everything
-
$POPFile->CORE_initialize();
-
- # Handle configuration options
-
$POPFile->CORE_config();
-
- # Start each module
-
$POPFile->CORE_start();
! # MAIN
$POPFile->CORE_service();
! # cleanup
$POPFile->CORE_stop();
! # ---------------------------------------------------------------------------------------------
--- 35,55 ----
# Create the main objects that form the core of POPFile. Consists of the configuration
# modules, the classifier, the UI (currently HTML based), platform specific code,
! # and the POP3 proxy. The link the components together, intialize them all, load
! # the configuration from disk, start the modules running
$POPFile->CORE_load();
$POPFile->CORE_link_components();
$POPFile->CORE_initialize();
$POPFile->CORE_config();
$POPFile->CORE_start();
! # This is the main POPFile loop that services requests, it will exit only when we
! # need to exit
$POPFile->CORE_service();
! # Shutdown every POPFile module
$POPFile->CORE_stop();
!
! # END
|
