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

[Ambrose Li]

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

Modified Files:
	TmplTokenizer.pm 
Log Message:
Allow trim to return the trimmed whitespace if the caller wants them.


Index: TmplTokenizer.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** TmplTokenizer.pm	17 Feb 2004 05:42:27 -0000	1.7
--- TmplTokenizer.pm	17 Feb 2004 07:26:29 -0000	1.8
***************
*** 405,411 ****
  sub trim ($) {
      my($s) = @_;
!     $s =~ s/^(?:\s|\&nbsp$re_end_entity)+//os;
!     $s =~ s/(?:\s|\&nbsp$re_end_entity)+$//os;
!     return $s;
  }
  
--- 405,410 ----
  sub trim ($) {
      my($s) = @_;
!     $s =~ /^(\s|\&nbsp$re_end_entity)*(.*)(\s|\&nbsp$re_end_entity)*$/os;
!     return wantarray? ($2, $1, $3): $2;
  }