|
From: <jgr...@us...> - 2003-07-27 18:26:18
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv16677/Classifier
Modified Files:
Bayes.pm
Log Message:
Completed tests for the public API in Bayes
Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.173
retrieving revision 1.174
diff -C2 -d -r1.173 -r1.174
*** Bayes.pm 27 Jul 2003 15:42:42 -0000 1.173
--- Bayes.pm 27 Jul 2003 18:26:14 -0000 1.174
***************
*** 1804,1808 ****
my ( $self ) = @_;
! return sort keys %{$self->{magnets__}};
}
--- 1804,1818 ----
my ( $self ) = @_;
! my @buckets;
!
! foreach my $b (sort keys %{$self->{magnets__}}) {
! my @keys = keys %{$self->{magnets__}{$b}};
!
! if ( $#keys >= 0 ) {
! push @buckets, ($b);
! }
! }
!
! return @buckets;
}
***************
*** 1903,1910 ****
sub get_magnet_types
{
! return ( 'from' => 'From',
'to' => 'To',
'subject' => 'Subject',
! 'cc' => 'Cc' );
}
--- 1913,1920 ----
sub get_magnet_types
{
! return ( 'from' => 'From', # PROFILE BLOCK START
'to' => 'To',
'subject' => 'Subject',
! 'cc' => 'Cc' ); # PROFILE BLOCK STOP
}
***************
*** 1925,1928 ****
--- 1935,1954 ----
delete $self->{magnets__}{$bucket}{$type}{$text};
+
+ # Now check to see if there are any magnets left of that type
+
+ my @keys = keys %{$self->{magnets__}{$bucket}{$type}};
+ if ( $#keys == -1 ) {
+ delete $self->{magnets__}{$bucket}{$type};
+
+ # Now check to see if this bucket has any magnets
+
+ @keys = keys %{$self->{magnets__}{$bucket}};
+
+ if ( $#keys == -1 ) {
+ delete $self->{magnets__}{$bucket};
+ }
+ }
+
$self->save_magnets__();
$self->calculate_magnet_count__();
|