POPFile - Automatic Email Classification

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

Modified Files:
	IMAP.pm 
Log Message:
Make training available from UI.

Index: IMAP.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Services/IMAP.pm,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** IMAP.pm	29 Jul 2006 17:11:33 -0000	1.25
--- IMAP.pm	29 Jul 2006 19:44:11 -0000	1.26
***************
*** 170,173 ****
--- 170,177 ----
                                           'imap-options.thtml',
                                           $self );
+     $self->register_configuration_item_( 'configuration',
+                                          'imap_6_training',
+                                          'imap-do-training.thtml',
+                                          $self );
  
      # Set the time stamp for the last update to the current time
***************
*** 2070,2073 ****
--- 2074,2082 ----
          $templ->param( IMAP_interval => $self->user_config_( 1, 'update_interval' ) );
      }
+ 
+     # Switch the module to training mode
+     if ( $name eq 'imap_6_training' ) {
+         $templ->param( imap_currently_training => $self->user_config_( 1, 'training_mode' ) );
+     }
  }
  
***************
*** 2292,2297 ****
      }
  
  
!     $self->SUPER::validate_item( $name, $templ, $language, $form );
  }
  
--- 2301,2318 ----
      }
  
+     if ( $name eq 'imap_6_training' ) {
  
!         if ( defined $$form{do_imap_training} ) {
!             $self->user_config_( 1, 'training_mode', 1 );
!             return ( $$language{Imap_DoingTraining}, undef );
!         }
!         else {
!             return ( undef, undef );
!         }
!     }
! 
!     # If we end up here, we forgot to validate some item.
!     $self->log_( 0, "A configuration item has been left unvalidated: $name" );
!     return ( undef, "The item $name is not implemented." );
  }
  
***************
*** 2366,2369 ****
--- 2387,2392 ----
      # And disable training mode so we won't do this again the next time service is called.
      $self->user_config_( 1, 'training_mode', 0 );
+ 
+     $self->log_( 0, "Training finished." );
  }

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

Modified Files:
	Deutsch.msg English.msg 
Log Message:
Make training available from UI.

Index: Deutsch.msg
===================================================================
RCS file: /cvsroot/popfile/engine/languages/Deutsch.msg,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** Deutsch.msg	20 Feb 2006 02:08:27 -0000	1.37
--- Deutsch.msg	29 Jul 2006 19:44:12 -0000	1.38
***************
*** 402,405 ****
--- 402,407 ----
  Imap_WatchedFoldersUpdated              Liste der überwachten Ordner wurde aktualisiert.
  Imap_WatchedFolderRemoved               Ordner '%s' wurde aus der Liste der überwachten Ordner entfernt
+ Imap_DoingTraining                      Das IMAP Module wird das Training jetzt anhand Ihrer archivierten Nachrichten starten. Je nach der Größe des Archivs und der Geschwindigkeit der Verbindung zum Server, kann diese einige Zeit dauern, während der die Benutzeroberfläche nicht reagieren wird.
+ Imap_DoTraining                         Training anhand archivierter Mail.
  
  Shutdown_Message                        POPFile wurde beendet

Index: English.msg
===================================================================
RCS file: /cvsroot/popfile/engine/languages/English.msg,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** English.msg	23 Feb 2006 12:23:14 -0000	1.102
--- English.msg	29 Jul 2006 19:44:12 -0000	1.103
***************
*** 415,418 ****
--- 415,420 ----
  Imap_WatchedFoldersUpdated              Updated the list of watched folders
  Imap_WatchedFolderRemoved               Removed folder '%s' from list of watched folders
+ Imap_DoingTraining                      The IMAP module is now going to start training on your message archive. The POPFile UI will remain unresponsive until training is completed. Depending on the size of your archive and the speed of the connection to the IMAP server, this may take a while.
+ Imap_DoTraining                         Train from existing mail archive.
  
  Shutdown_Message                        POPFile has shut down

Update of /cvsroot/popfile/engine/skins/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29412/skins/default

Added Files:
	imap-do-training.thtml 
Log Message:
Make training available from UI.

--- NEW FILE: imap-do-training.thtml ---
<!--  This is the output of template imap-update-mailbox-list.thtml -->
<TMPL_IF NAME="imap_currently_training">

    <p>
        <TMPL_VAR NAME="Localize_Imap_DoingTraining">
    </p>

<TMPL_ELSE>

<form action="<TMPL_VAR NAME="Configuration_Action">" method="post">
    <label for="imap_do_training" class="configurationLabel">
        <TMPL_VAR NAME="Localize_Imap_DoTraining">
    </label>
    <input id="imap_do_training" type="submit" class="submit" name="do_imap_training" value="<TMPL_VAR NAME="Localize_Imap_Now">" />
</form>

</TMPL_IF>
<hr width="60%" align="center" />

<!-- End of template imap-do-training.thtml -->

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." );