[popfile-commit] engine/Classifier Bayes.pm,1.210,1.211

[<jgr...@us...>]

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

Modified Files:
	Bayes.pm 
Log Message:
Merge Junya patch that fixes problems I introduced when I 'cleaned up' the Japanese/Korean code

Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.210
retrieving revision 1.211
diff -C2 -d -r1.210 -r1.211
*** Bayes.pm	14 Oct 2003 16:15:26 -0000	1.210
--- Bayes.pm	14 Oct 2003 16:18:25 -0000	1.211
***************
*** 870,886 ****
      my ( $self, $noattype, $bucket, $type ) = @_;
  
!     for my $magnet (sort keys %{$self->{magnets__}{$bucket}{$type}}) {
!         my $regex;
  
!         $regex = $magnet;
!         $regex =~ s/@/__POPFILE_AT__/g;
!         $regex =~ s/\$/__POPFILE_DOLLAR__/g;
  
!         if ( $noattype =~ m/\Q$regex\E/i ) {
!             $self->{scores__}        = '';
!             $self->{magnet_used__}   = 1;
!             $self->{magnet_detail__} = "$type: $magnet";
  
!             return 1;
          }
      }
--- 870,905 ----
      my ( $self, $noattype, $bucket, $type ) = @_;
  
!     if ( $self->module_config_( 'html', 'language' ) =~ /^Nihongo|Korean$/ ) {
!         no locale;
!         for my $magnet (sort keys %{$self->{magnets__}{$bucket}{$type}}) {
!             my $regex;
  
!             $regex = $magnet;
!             $regex =~ s/@/__POPFILE_AT__/g;
!             $regex =~ s/\$/__POPFILE_DOLLAR__/g;
  
!             if ( $noattype =~ m/\Q$regex\E/i ) {
!                 $self->{scores__}        = '';
!                 $self->{magnet_used__}   = 1;
!                 $self->{magnet_detail__} = "$type: $magnet";
  
!                 return 1;
!             }
!         }
!     }else{
!         for my $magnet (sort keys %{$self->{magnets__}{$bucket}{$type}}) {
!             my $regex;
! 
!             $regex = $magnet;
!             $regex =~ s/@/__POPFILE_AT__/g;
!             $regex =~ s/\$/__POPFILE_DOLLAR__/g;
! 
!             if ( $noattype =~ m/\Q$regex\E/i ) {
!                 $self->{scores__}        = '';
!                 $self->{magnet_used__}   = 1;
!                 $self->{magnet_detail__} = "$type: $magnet";
! 
!                 return 1;
!             }
          }
      }
***************
*** 940,949 ****
              # Disable the locale in Korean mode, too.
  
!             if ( $self->module_config_( 'html', 'language' ) =~ /^Nihongo|Korean$/ ) {
!                 no locale;
!                 return $bucket if ( $self->magnet_match__( $noattype, $bucket, $type ) );
!             } else {
!                 return $bucket if ( $self->magnet_match__( $noattype, $bucket, $type ) );
!             }
          }
      }
--- 959,963 ----
              # Disable the locale in Korean mode, too.
  
!             return $bucket if ( $self->magnet_match__( $noattype, $bucket, $type ) );
          }
      }