[popfile-commit] engine/Services IMAP.pm,1.27,1.28

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

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

Modified Files:
	IMAP.pm 
Log Message:
IMAP tests now finish and no failed tests are reported. Next step: Look at the coverage report.

Index: IMAP.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Services/IMAP.pm,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** IMAP.pm	1 Dec 2007 23:49:57 -0000	1.27
--- IMAP.pm	2 Dec 2007 13:08:37 -0000	1.28
***************
*** 1088,1092 ****
  
      if ( $slot ne '' ) {
!         my ( $id, $from, $to, $cc, $subject, $date, $hash, $inserted, $bucket, $reclassified ) =
                      $self->history_()->get_slot_fields( $slot );
  
--- 1088,1092 ----
  
      if ( $slot ne '' ) {
!         my ( $id, $from, $to, $cc, $subject, $date, $hash, $inserted, $bucket, $reclassified, undef, $magnetized ) =
                      $self->history_()->get_slot_fields( $slot );
  
***************
*** 1102,1119 ****
          $self->log_( 2, "bucket:        $bucket" );
          $self->log_( 2, "reclassified:  $reclassified" );
  
!         # We must not reclassify a reclassified message
!         if ( ! $reclassified ) {
  
!             # new and old bucket must be different
!             if ( $new_bucket ne $bucket ) {
!                 return $bucket;
              }
              else {
!                 $self->log_( 1, "Will not reclassify to same bucket ($new_bucket)." );
              }
          }
          else {
!             $self->log_( 1, "The message was already reclassified." );
          }
      }
--- 1102,1127 ----
          $self->log_( 2, "bucket:        $bucket" );
          $self->log_( 2, "reclassified:  $reclassified" );
+         $self->log_( 2, "magnetized:    $magnetized" );
  
!         # We cannot reclassify magnetized messages
!         if ( ! $magnetized ) {
  
!             # We must not reclassify a reclassified message
!             if ( ! $reclassified ) {
! 
!                 # new and old bucket must be different
!                 if ( $new_bucket ne $bucket ) {
!                     return $bucket;
!                 }
!                 else {
!                     $self->log_( 1, "Will not reclassify to same bucket ($new_bucket)." );
!                 }
              }
              else {
!                 $self->log_( 1, "The message was already reclassified." );
              }
          }
          else {
!             $self->log_( 1, "The message was classified using a manget and cannot be reclassified." );
          }
      }
***************
*** 1405,1409 ****
          }
          else {
!             $self->config_( 'use_ssl', 0 );
              if ( $use_ssl_now ) {
                  $something_happened = 1;
--- 1413,1417 ----
          }
          else {
!             $self->user_config_( 1, 'use_ssl', 0 );
              if ( $use_ssl_now ) {
                  $something_happened = 1;