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

[Ambrose C. LI]

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

Modified Files:
      Tag: rel_2_2
        TmplTokenizer.pm 
Log Message:
Reverting the patch


Index: TmplTokenizer.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v
retrieving revision 1.35.2.1
retrieving revision 1.35.2.2
diff -C2 -r1.35.2.1 -r1.35.2.2
*** TmplTokenizer.pm    23 Jan 2005 07:05:43 -0000      1.35.2.1
--- TmplTokenizer.pm    24 Jan 2005 07:13:54 -0000      1.35.2.2
***************
*** 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 {
--- 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 {
***************
*** 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;
--- 349,353 ----
        } elsif ($state == STATE_STRING_LITERAL) {
            if ($input[$i] eq parenright) {
!               $output[$j] = [1, $output[$j]->[1], $q, $s];
            }
            $state = 0;