[popfile-commit] engine/Classifier Bayes.pm,1.135,1.136 MailParse.pm,1.115,1.116

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

Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv12139

Modified Files:
	Bayes.pm MailParse.pm 
Log Message:
compact quickmagnets display, add entire From header data to quickmagnets

Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.135
retrieving revision 1.136
diff -C2 -d -r1.135 -r1.136
*** Bayes.pm	21 Apr 2003 20:53:58 -0000	1.135
--- Bayes.pm	25 Apr 2003 07:02:05 -0000	1.136
***************
*** 631,661 ****
  
      if ($self->{wordscores__} && defined($ui) ) {
!         my @qm = @{$self->{parser__}->quickmagnets()};
          my %language    = $ui->language();
          my $session_key = $ui->session_key();
  
!         if ( $#qm >= 0 ) {
              my @buckets = $self->get_buckets();
              my $i = 0;
!             $self->{scores__} .= "<form action=\"/magnets\" method=\"POST\">\n";
              $self->{scores__} .= "<input type=\"hidden\" name=\"session\" value=\"$session_key\" />";
!             $self->{scores__} .= "<input type=\"hidden\" name=\"count\" value=\"" . ($#qm+1) . "\" />";
              $self->{scores__} .= "<hr><b>$language{QuickMagnets}</b><p>\n<table class=\"top20Words\">\n<tr>\n<th scope=\"col\">$language{Magnet}</th>\n<th>$language{Magnet_Always}</th>\n";
  
!             while ( $#qm >= 0 ) {
!                 my $type = shift @qm;
!                 my $text = shift @qm;
!                 $i += 1;
! 
!                 $self->{scores__} .= "<tr><td scope=\"col\">$type: $text</td><td>";
!                 $self->{scores__} .= "<input type=\"hidden\" name=\"type$i\" id=\"magnetsAddType\" value=\"$type\"/>";
!                 $self->{scores__} .= "<input type=\"hidden\" name=\"text$i\" id=\"magnetsAddText\" value=\"$text\"/>";
!                 $self->{scores__} .= "<select name=\"bucket$i\" id=\"magnetsAddBucket\">\n<option value=\"\"></option>\n";
! 
!                 foreach my $bucket (@buckets) {
!                     $self->{scores__} .= "<option value=\"$bucket\">$bucket</option>\n";
!                 }
! 
!                 $self->{scores__} .= "</select></td></tr>";
  	    }
  
--- 631,673 ----
  
      if ($self->{wordscores__} && defined($ui) ) {
!         my %qm = %{$self->{parser__}->quickmagnets()};
!         my $mlen = scalar(keys %{$self->{parser__}->quickmagnets()});
          my %language    = $ui->language();
          my $session_key = $ui->session_key();
  
!         if ( $mlen >= 0 ) {
              my @buckets = $self->get_buckets();
              my $i = 0;
!             $self->{scores__} .= "<form action=\"/magnets\" method=\"get\">\n";
              $self->{scores__} .= "<input type=\"hidden\" name=\"session\" value=\"$session_key\" />";
!             $self->{scores__} .= "<input type=\"hidden\" name=\"count\" value=\"" . ($mlen + 1) . "\" />";
              $self->{scores__} .= "<hr><b>$language{QuickMagnets}</b><p>\n<table class=\"top20Words\">\n<tr>\n<th scope=\"col\">$language{Magnet}</th>\n<th>$language{Magnet_Always}</th>\n";
+             
+             my %types = get_magnet_types();
+            
+             foreach my $type ( keys %types ) {
  
!                 if (defined $qm{$type})
!                 {
!                     $i += 1;
!     
!                     
!                     $self->{scores__} .= "<tr><td scope=\"col\">$type: ";
!                     $self->{scores__} .= "<select name=\"text$i\" id=\"\">\n";
!                     
!                     foreach my $magnet ( 0 .. $#{$qm{$type}} ) {
!                         $self->{scores__} .= "<option>" . Classifier::MailParse::splitline(@{$qm{$type}}[$magnet], 0) . "</option>\n";
!                     }
!                     $self->{scores__} .= "</select>\n";                
!                     $self->{scores__} .= "</td><td>";
!                     $self->{scores__} .= "<input type=\"hidden\" name=\"type$i\" id=\"magnetsAddType\" value=\"$type\"/>";                
!                     $self->{scores__} .= "<select name=\"bucket$i\" id=\"magnetsAddBucket\">\n<option value=\"\"></option>\n";
!     
!                     foreach my $bucket (@buckets) {
!                         $self->{scores__} .= "<option value=\"$bucket\">$bucket</option>\n";
!                     }
!     
!                     $self->{scores__} .= "</select></td></tr>";
!                 }                
  	    }
  

Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** MailParse.pm	20 Apr 2003 22:19:06 -0000	1.115
--- MailParse.pm	25 Apr 2003 07:02:06 -0000	1.116
***************
*** 64,68 ****
      # a magnet type to a magnet string, e.g. from => po...@jg...
  
!     $self->{quickmagnets__}      = ();
  
      # These store the current HTML background color and font color to
--- 64,68 ----
      # a magnet type to a magnet string, e.g. from => po...@jg...
  
!     $self->{quickmagnets__}      = {};
  
      # These store the current HTML background color and font color to
***************
*** 181,185 ****
  
          if ( $prefix =~ /(from|to|cc|subject)/i ) {
!             push @{$self->{quickmagnets__}}, ($prefix, $word);
          }
  
--- 181,185 ----
  
          if ( $prefix =~ /(from|to|cc|subject)/i ) {
!             push @{$self->{quickmagnets__}{$prefix}}, $word;
          }
  
***************
*** 1171,1179 ****
              $self->{from__} = $argument if ( $self->{from__} eq '' ) ;
              $prefix = 'from';
          }
  
          if ( $header =~ /^To$/i ) {
              $prefix = 'to';
!             $self->{to__} = $argument if ( $self->{to__} eq '' );
          }
  
--- 1171,1180 ----
              $self->{from__} = $argument if ( $self->{from__} eq '' ) ;
              $prefix = 'from';
+             push @{$self->{quickmagnets__}{$prefix}}, $argument if ($argument ne '');
          }
  
          if ( $header =~ /^To$/i ) {
              $prefix = 'to';
!             $self->{to__} = $argument if ( $self->{to__} eq '' );            
          }