[Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.35,1.35.2.1

[Ambrose C. LI]

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

Modified Files:
      Tag: rel_2_2
	TmplTokenizer.pm 
Log Message:
This should fix bug 913


Index: TmplTokenizer.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v
retrieving revision 1.35
retrieving revision 1.35.2.1
diff -C2 -r1.35 -r1.35.2.1
*** TmplTokenizer.pm	30 Dec 2004 06:53:13 -0000	1.35
--- TmplTokenizer.pm	23 Jan 2005 07:05:43 -0000	1.35.2.1
***************
*** 342,346 ****
  	    $state = $input[$i] eq parenleft ? STATE_PARENLEFT : 0;
  	} elsif ($state == STATE_PARENLEFT) {
! 	    if ($input[$i] =~ /^(['"])(.*)\1$/s) {
  		($state, $j, $q, $s) = (STATE_STRING_LITERAL, $#output, $1, $2);
  	    } else {
--- 342,346 ----
  	    $state = $input[$i] eq parenleft ? STATE_PARENLEFT : 0;
  	} elsif ($state == STATE_PARENLEFT) {
! 	    if ($input[$i] =~ /^(['"])\s*(.*)\1$/s) {
  		($state, $j, $q, $s) = (STATE_STRING_LITERAL, $#output, $1, $2);
  	    } else {
***************
*** 349,353 ****
  	} elsif ($state == STATE_STRING_LITERAL) {
  	    if ($input[$i] eq parenright) {
! 		$output[$j] = [1, $output[$j]->[1], $q, $s];
  	    }
  	    $state = 0;
--- 349,354 ----
  	} elsif ($state == STATE_STRING_LITERAL) {
  	    if ($input[$i] eq parenright) {
! 		my $candidate = $output[$j]->[1];
! 		$output[$j] = [1, $candidate, $q, $s];
  	    }
  	    $state = 0;