[Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.8,1.9

[Ambrose Li]

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21841

Modified Files:
	TmplTokenizer.pm 
Log Message:
The previous change was wrong.


Index: TmplTokenizer.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** TmplTokenizer.pm	17 Feb 2004 07:26:29 -0000	1.8
--- TmplTokenizer.pm	17 Feb 2004 07:45:17 -0000	1.9
***************
*** 404,410 ****
  
  sub trim ($) {
!     my($s) = @_;
!     $s =~ /^(\s|\&nbsp$re_end_entity)*(.*)(\s|\&nbsp$re_end_entity)*$/os;
!     return wantarray? ($2, $1, $3): $2;
  }
  
--- 404,413 ----
  
  sub trim ($) {
!     my($s0) = @_;
!     my $l0 = length $s0;
!     my $s = $s0;
!     $s =~ s/^(\s|\&nbsp$re_end_entity)+//os; my $l1 = $l0 - length $s;
!     $s =~ s/(\s|\&nbsp$re_end_entity)+$//os; my $l2 = $l0 - $l1 - length $s;
!     return wantarray? (substr($s0, 0, $l1), $s, substr($s0, $l0 - $l2)): $s;
  }