[popfile-commit] engine/Classifier MailParse.pm,1.91.2.7,1.91.2.8

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

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

Modified Files:
      Tag: v0/18/1
	MailParse.pm 
Log Message:
fix greedy regexp in decode_string

Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.91.2.7
retrieving revision 1.91.2.8
diff -C2 -d -r1.91.2.7 -r1.91.2.8
*** MailParse.pm	23 Jun 2003 20:35:35 -0000	1.91.2.7
--- MailParse.pm	18 Jul 2003 05:24:54 -0000	1.91.2.8
***************
*** 43,47 ****
                    'ugrave'  => 248,     'Ugrave'  => 216,     'uml'     => 168,     'Uuml'    => 220,
                    'uuml'    => 252,     'Yacute'  => 220,     'yacute'  => 252,     'yen'     => 165,
!                   'yuml'    => 254); 
  
  #----------------------------------------------------------------------------
--- 43,47 ----
                    'ugrave'  => 248,     'Ugrave'  => 216,     'uml'     => 168,     'Uuml'    => 220,
                    'uuml'    => 252,     'Yacute'  => 220,     'yacute'  => 252,     'yen'     => 165,
!                   'yuml'    => 254);
  
[...1347 lines suppressed...]
      my ($line, $encoding) = @_;
      $line =~ s/([^\r\n]{100,120} )/$1\r\n/g;
!     $line =~ s/([^ \r\n]{120})/$1\r\n/g;
  
      $line =~ s/</&lt;/g;
***************
*** 1235,1240 ****
  
      $line =~ s/\t/&nbsp;&nbsp;&nbsp;&nbsp;/g;
!     
!     return $line;        
  }
  
--- 1235,1240 ----
  
      $line =~ s/\t/&nbsp;&nbsp;&nbsp;&nbsp;/g;
! 
!     return $line;
  }