popfile-commit

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

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

Modified Files:
      Tag: b0_22_2
	IMAP.pm 
Log Message:
we must not reclassify magnetzied messages!

Index: IMAP.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Services/IMAP.pm,v
retrieving revision 1.9.4.17
retrieving revision 1.9.4.18
diff -C2 -d -r1.9.4.17 -r1.9.4.18
*** IMAP.pm	1 Dec 2007 21:11:27 -0000	1.9.4.17
--- IMAP.pm	2 Dec 2007 09:35:09 -0000	1.9.4.18
***************
*** 1149,1153 ****
  
      if ( $slot ne '' ) {
!         my ( $id, $from, $to, $cc, $subject, $date, $hash, $inserted, $bucket, $reclassified ) =
                      $self->history()->get_slot_fields( $slot );
  
--- 1149,1153 ----
  
      if ( $slot ne '' ) {
!         my ( $id, $from, $to, $cc, $subject, $date, $hash, $inserted, $bucket, $reclassified, undef, $magnetized ) =
                      $self->history()->get_slot_fields( $slot );
  
***************
*** 1163,1180 ****
          $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." );
          }
      }
--- 1163,1188 ----
          $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." );
          }
      }