[popfile-commit] engine/UI HTML.pm,1.332,1.333

[Sam S. <ssc...@us...>]

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

Modified Files:
	HTML.pm 
Log Message:
Refactor history_reclassify to move the reclassification logic into the API.
Expose new reclassify API via XMLRPC.


Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.332
retrieving revision 1.333
diff -C2 -d -r1.332 -r1.333
*** HTML.pm	20 Jan 2005 14:53:18 -0000	1.332
--- HTML.pm	22 Jan 2005 03:01:33 -0000	1.333
***************
*** 1761,1765 ****
  
      # Check whether the user requested any changes to the per-bucket settings
!     
      if ( defined($self->{form_}{bucket_settings}) ) {
          my @parameters = qw/subject xtc xpl quarantine/;
--- 1761,1765 ----
  
      # Check whether the user requested any changes to the per-bucket settings
! 
      if ( defined($self->{form_}{bucket_settings}) ) {
          my @parameters = qw/subject xtc xpl quarantine/;
***************
*** 1768,1777 ****
                  my $bucket_param = $self->get_bucket_parameter__( $bucket, $variable );
                  my $form_param = ( $self->{form_}{"${bucket}_$variable"} ) ? 1 : 0;
!                 
                  if ( $form_param ne $bucket_param ) {
                      $self->set_bucket_parameter__( $bucket, $variable, $form_param );
                  }
              }
!         
              # Since color isn't coded binary and only used for non-pseudo buckets,
              # we have to handle it separately
--- 1768,1777 ----
                  my $bucket_param = $self->get_bucket_parameter__( $bucket, $variable );
                  my $form_param = ( $self->{form_}{"${bucket}_$variable"} ) ? 1 : 0;
! 
                  if ( $form_param ne $bucket_param ) {
                      $self->set_bucket_parameter__( $bucket, $variable, $form_param );
                  }
              }
! 
              # Since color isn't coded binary and only used for non-pseudo buckets,
              # we have to handle it separately
***************
*** 1779,1783 ****
                  my $bucket_color = $self->get_bucket_parameter__( $bucket, 'color' );
                  my $form_color = $self->{form_}{"${bucket}_color"};
!                 
                  if ( $form_color ne $bucket_color ) {
                      $self->set_bucket_parameter__( $bucket, 'color', $form_color );
--- 1779,1783 ----
                  my $bucket_color = $self->get_bucket_parameter__( $bucket, 'color' );
                  my $form_color = $self->{form_}{"${bucket}_color"};
! 
                  if ( $form_color ne $bucket_color ) {
                      $self->set_bucket_parameter__( $bucket, 'color', $form_color );
***************
*** 1786,1790 ****
          }
      }
!     
      my @corpus_data;
      foreach my $bucket ( @buckets ) {
--- 1786,1790 ----
          }
      }
! 
      my @corpus_data;
      foreach my $bucket ( @buckets ) {
***************
*** 2100,2114 ****
          }
  
!         my %work;
  
          while ( my ( $slot, $newbucket ) = each %messages ) {
-             push @{$work{$newbucket}},
-                 $self->history_()->get_slot_file( $slot );
-             my @fields = $self->history_()->get_slot_fields( $slot);
-             my $bucket = $fields[8];
-             $self->classifier_()->reclassified(
-                 $self->{api_session__}, $bucket, $newbucket, 0 );
-             $self->history_()->change_slot_classification(
-                  $slot, $newbucket, $self->{api_session__}, 0);
              $self->{feedback}{$slot} = sprintf(
                   $self->{language__}{History_ChangedTo},
--- 2100,2106 ----
          }
  
!         $self->classifier_()->reclassify( $self->{api_session__}, %messages );
  
          while ( my ( $slot, $newbucket ) = each %messages ) {
              $self->{feedback}{$slot} = sprintf(
                   $self->{language__}{History_ChangedTo},
***************
*** 2116,2127 ****
                       $self->{api_session__}, $newbucket ), $newbucket );
          }
- 
-         # At this point the work hash maps the buckets to lists of
-         # files to reclassify, so run through them doing bulk updates
- 
-         foreach my $newbucket (keys %work) {
-             $self->classifier_()->add_messages_to_bucket(
-                 $self->{api_session__}, $newbucket, @{$work{$newbucket}} );
-         }
      }
  }
--- 2108,2111 ----