[popfile-commit] engine/Services IMAP.pm,1.24,1.25

[Manni H. <man...@us...>]

Update of /cvsroot/popfile/engine/Services
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8266/Services

Modified Files:
	IMAP.pm 
Log Message:
Fix stupid bug in train_on_archive__

Index: IMAP.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Services/IMAP.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** IMAP.pm	20 Feb 2006 02:15:25 -0000	1.24
--- IMAP.pm	29 Jul 2006 17:11:33 -0000	1.25
***************
*** 259,263 ****
                  $self->connect_folders__();
  
!                 # Reset the hash containing the hash values we have seen the 
                  # last time through service.
                  $self->{hash_values__} = ();
--- 259,263 ----
                  $self->connect_folders__();
  
!                 # Reset the hash containing the hash values we have seen the
                  # last time through service.
                  $self->{hash_values__} = ();
***************
*** 2091,2100 ****
  
      my ( $status_message, $error_message );
!     
      # connection details
      if ( $name eq 'imap_0_connection_details' ) {
          if ( defined $$form{update_imap_0_connection_details} ) {
              my $something_happened = 0;
!             
              if ( $$form{imap_hostname} ne '' ) {
                  $self->user_config_( 1, 'hostname', $$form{imap_hostname} );
--- 2091,2100 ----
  
      my ( $status_message, $error_message );
! 
      # connection details
      if ( $name eq 'imap_0_connection_details' ) {
          if ( defined $$form{update_imap_0_connection_details} ) {
              my $something_happened = 0;
! 
              if ( $$form{imap_hostname} ne '' ) {
                  $self->user_config_( 1, 'hostname', $$form{imap_hostname} );
***************
*** 2128,2135 ****
                  $error_message = $$language{Imap_PasswordError};
              }
!             
              $status_message = $$language{Imap_ConnectionDetailsUpdated} if $something_happened;
          }
!         
          return ( $status_message, $error_message );
      }
--- 2128,2135 ----
                  $error_message = $$language{Imap_PasswordError};
              }
! 
              $status_message = $$language{Imap_ConnectionDetailsUpdated} if $something_happened;
          }
! 
          return ( $status_message, $error_message );
      }
***************
*** 2253,2257 ****
                  $error_message = $$language{Imap_UpdateError3};
              }
!             
              unless ( defined $error_message ) {
                  $status_message = $$language{Imap_UpdateOK};
--- 2253,2257 ----
                  $error_message = $$language{Imap_UpdateError3};
              }
! 
              unless ( defined $error_message ) {
                  $status_message = $$language{Imap_UpdateOK};
***************
*** 2283,2291 ****
                  $error_message = $$language{Imap_IntervalError};
              }
!             
              unless ( defined $error_message ) {
                  $status_message = $$language{Imap_OptionsUpdated};
              }
!             
          }
          return ( $status_message, $error_message );
--- 2283,2291 ----
                  $error_message = $$language{Imap_IntervalError};
              }
! 
              unless ( defined $error_message ) {
                  $status_message = $$language{Imap_OptionsUpdated};
              }
! 
          }
          return ( $status_message, $error_message );
***************
*** 2319,2326 ****
  
      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};
  
--- 2319,2322 ----
***************
*** 2329,2332 ****
--- 2325,2332 ----
          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 messages in folder $folder to bucket $bucket." );