[popfile-commit] engine/Classifier Bayes.pm,1.215,1.216 MailParse.pm,1.171,1.172

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

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

Modified Files:
	Bayes.pm MailParse.pm 
Log Message:
Merge patch that fixes a Japanese magnet parsing bug

Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.215
retrieving revision 1.216
diff -C2 -d -r1.215 -r1.216
*** Bayes.pm	27 Oct 2003 21:33:05 -0000	1.215
--- Bayes.pm	28 Oct 2003 17:28:02 -0000	1.216
***************
*** 239,242 ****
--- 239,246 ----
      my ( $self ) = @_;
  
+     # Pass in the current interface language for language specific parsing
+ 
+     $self->{parser__}->{lang__}  = $self->module_config_( 'html', 'language' );
+ 
      $self->{unclassified__} = log( $self->config_( 'unclassified_weight' ) );
      $self->load_word_matrix_();

Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.171
retrieving revision 1.172
diff -C2 -d -r1.171 -r1.172
*** MailParse.pm	28 Oct 2003 01:06:46 -0000	1.171
--- MailParse.pm	28 Oct 2003 17:28:02 -0000	1.172
***************
*** 1585,1589 ****
          # These headers at least can be decoded
  
!         $argument = $self->decode_string( $argument );
  
          if ( $header =~ /^From$/i )  {
--- 1585,1589 ----
          # These headers at least can be decoded
  
!         $argument = $self->decode_string( $argument , $self->{lang__} );
  
          if ( $header =~ /^From$/i )  {
***************
*** 1619,1623 ****
  
          $prefix = 'subject';
!         $argument = $self->decode_string( $argument );
          $self->{subject__} = $argument if ( ( $self->{subject__} eq '' ) );
      }
--- 1619,1623 ----
  
          $prefix = 'subject';
!         $argument = $self->decode_string( $argument, $self->{lang__} );
          $self->{subject__} = $argument if ( ( $self->{subject__} eq '' ) );
      }
***************
*** 1684,1688 ****
      # Some headers should never be RFC 2047 decoded
  
!     $argument = $self->decode_string($argument) unless ($header =~ /^(Received|Content\-Type|Content\-Disposition)$/i);
  
      if ( $header =~ /^Content-Disposition$/i ) {
--- 1684,1688 ----
      # Some headers should never be RFC 2047 decoded
  
!     $argument = $self->decode_string($argument, $self->{lang__}) unless ($header =~ /^(Received|Content\-Type|Content\-Disposition)$/i);
  
      if ( $header =~ /^Content-Disposition$/i ) {