Update of /cvsroot/popfile/engine/Services
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv692
Modified Files:
Tag: b0_22_2
IMAP.pm
Log Message:
Backport bugfix to 0.22
Index: IMAP.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Services/IMAP.pm,v
retrieving revision 1.9.4.2
retrieving revision 1.9.4.3
diff -C2 -d -r1.9.4.2 -r1.9.4.3
*** IMAP.pm 10 Feb 2006 15:31:20 -0000 1.9.4.2
--- IMAP.pm 6 Nov 2006 15:05:53 -0000 1.9.4.3
***************
*** 274,278 ****
$self->connect_folders__();
! # Reset the hash containing the hash values we have seen the
# last time through service.
$self->{hash_values__} = ();
--- 274,278 ----
$self->connect_folders__();
! # Reset the hash containing the hash values we have seen the
# last time through service.
$self->{hash_values__} = ();
***************
*** 294,297 ****
--- 294,300 ----
if ( $@ =~ /The connection to the IMAP server was lost/ ) {
$self->log_( 0, $@ );
+
+ # If we caught an exception, we better reset training_mode
+ $self->config_( 'training_mode', 0 );
}
# If we didn't die but somebody else did, we have empathy.
***************
*** 1098,1101 ****
--- 1101,1106 ----
# No! commit suicide.
$self->log_( 0, "Got a folder ($imap_or_folder) with no attached socket in say!" );
+ my ($package, $filename, $line, $subroutine, $hasargs, $wantarray, $evaltext, $is_require, $hints, $bitmask) = caller 1;
+ $self->log_( 0, "Got this after being called by $subroutine." );
die( "The connection to the IMAP server was lost. Could not talk to the server." );
}
***************
*** 2310,2324 ****
foreach my $folder ( keys %{$self->{folders__}} ) {
-
- # Set uidnext value to 1. We will train on all messages.
- $self->uid_next__( $folder, 1 );
- my @uids = $self->get_new_message_list( $folder );
my $bucket = $self->{folders__}{$folder}{output};
!
# Skip pseudobuckets and the INBOX
next if $self->{classifier__}->is_pseudo_bucket( $self->{api_session__}, $bucket );
next if $folder eq 'INBOX';
! $self->log_( 0, "Training on messages in folder $folder to bucket $bucket." );
foreach my $msg ( @uids ) {
--- 2315,2329 ----
foreach my $folder ( keys %{$self->{folders__}} ) {
my $bucket = $self->{folders__}{$folder}{output};
!
# Skip pseudobuckets and the INBOX
next if $self->{classifier__}->is_pseudo_bucket( $self->{api_session__}, $bucket );
next if $folder eq 'INBOX';
! # Set uidnext value to 1. We will train on all messages.
! $self->uid_next__( $folder, 1 );
! my @uids = $self->get_new_message_list( $folder );
!
! $self->log_( 0, "Training on " . ( scalar @uids ) . " messages in folder $folder to bucket $bucket." );
foreach my $msg ( @uids ) {
|
