[BACK]Return to style.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/style.pm between versions 1.13 and 1.14

version 1.13, 2001/11/29 19:03:58 version 1.14, 2002/10/16 20:37:46
Line 77  sub styleparser { Line 77  sub styleparser {
  if ($stoken->[0] eq 'T') {   if ($stoken->[0] eq 'T') {
     $current_value .= $stoken->[1];      $current_value .= $stoken->[1];
  } elsif ($stoken->[0] eq 'S') {   } elsif ($stoken->[0] eq 'S') {
     my $number = &testkey($stoken->[0],$stoken->[1],@keys);      my $number=-1;
       if ($stoken->[1] ne "$current_key") {
    $number = &testkey($stoken->[0],$stoken->[1],@keys);
       }
     if ($number != -1) {      if ($number != -1) {
  $current_value .= &testvalue($number,$stoken->[0],$stoken->[2],@values);   $current_value .= &testvalue($number,$stoken->[0],$stoken->[2],@values);
     } else {      } else {
  $current_value .= $stoken->[4];   $current_value .= $stoken->[4];
     }       }
         } else {          } else {
     my $number = &testkey($stoken->[0],$stoken->[1],@keys);      my $number=-1;
       if (('/'.$stoken->[1]) ne "$current_key") {
    $number = &testkey($stoken->[0],$stoken->[1],@keys);
       }
     if ($number != -1) {      if ($number != -1) {
  $current_value .= &testvalue($number,$stoken->[0],$stoken->[2],@values);   $current_value .= &testvalue($number,$stoken->[0],$stoken->[2],@values);
     } else {      } else {
  $current_value .= $stoken->[2];   $current_value .= $stoken->[2];
     }       }
         }          }
       }
   
   
     }   
  }   }
         $current_value =~ s/\n//g;          $current_value =~ s/\n//g;
 ###########  ###########
Line 150  sub testvalue { Line 153  sub testvalue {
     my ($number,$zeroth,$second,@values) = @_;         my ($number,$zeroth,$second,@values) = @_;   
     my $current_content = $values[$number];      my $current_content = $values[$number];
     if ($zeroth eq 'S') {      if ($zeroth eq 'S') {
     my %tempo_hash = %$second;   my %tempo_hash = %$second;
     while ((my $current_k,my $current_v) = each %tempo_hash) {   while ((my $current_k,my $current_v) = each %tempo_hash) {
         $current_content =~ s/\$$current_k/$current_v/g;      $current_content =~ s/\$$current_k/$current_v/g;
     }   }
     } elsif ($zeroth eq 'E') {      } elsif ($zeroth eq 'E') {
         $current_content = $values[$number];   $current_content = $values[$number];
     }      }
     return $current_content;      return $current_content;
 }  }
Removed from v.1.13  
changed lines
  Added in v.1.14

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>