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

Diff for /loncom/xml/lonxml.pm between versions 1.60 and 1.61

version 1.60, 2001/03/23 22:08:05 version 1.61, 2001/03/26 15:42:05
Line 97  sub xmlparse { Line 97  sub xmlparse {
  while ( $#pars > -1 ) {   while ( $#pars > -1 ) {
    while ($token = $pars[$#pars]->get_token) {     while ($token = $pars[$#pars]->get_token) {
      if (($token->[0] eq 'T') || ($token->[0] eq 'C') || ($token->[0] eq 'D') ) {       if (($token->[0] eq 'T') || ($token->[0] eq 'C') || ($token->[0] eq 'D') ) {
        if (!$metamode) { $result=$token->[1]; }         if ($metamode<1) { $result=$token->[1]; }
      } elsif ($token->[0] eq 'PI') {       } elsif ($token->[0] eq 'PI') {
        if (!$metamode) { $result=$token->[2]; }         if ($metamode<1) { $result=$token->[2]; }
      } elsif ($token->[0] eq 'S') {       } elsif ($token->[0] eq 'S') {
        # add tag to stack             # add tag to stack    
        push (@stack,$token->[1]);         push (@stack,$token->[1]);
Line 107  sub xmlparse { Line 107  sub xmlparse {
        push (@parstack,&parstring($token));         push (@parstack,&parstring($token));
        &increasedepth($token);                &increasedepth($token);       
        if (exists $style_for_target{$token->[1]}) {         if (exists $style_for_target{$token->[1]}) {
  if ($metamode) {   if ($Apache::lonxml::redirection) {
    $result = $style_for_target{$token->[1]};  
  } elsif ($Apache::lonxml::redirection) {  
    $Apache::lonxml::outputstack['-1'] .=       $Apache::lonxml::outputstack['-1'] .=  
      &recurse($style_for_target{$token->[1]},$target,$safeeval,       &recurse($style_for_target{$token->[1]},$target,$safeeval,
       \%style_for_target,@parstack);        \%style_for_target,@parstack);
Line 129  sub xmlparse { Line 127  sub xmlparse {
        }         }
                 
        if (exists $style_for_target{'/'."$token->[1]"}) {         if (exists $style_for_target{'/'."$token->[1]"}) {
  if ($metamode) {   if ($Apache::lonxml::redirection) {
    $result = $style_for_target{$token->[1]};  
  } elsif ($Apache::lonxml::redirection) {  
    $Apache::lonxml::outputstack['-1'] .=       $Apache::lonxml::outputstack['-1'] .=  
      &recurse($style_for_target{'/'."$token->[1]"},       &recurse($style_for_target{'/'."$token->[1]"},
       $target,$safeeval,\%style_for_target,@parstack);        $target,$safeeval,\%style_for_target,@parstack);
Line 191  sub recurse { Line 187  sub recurse {
   while ( $#pat > -1 ) {    while ( $#pat > -1 ) {
     while  ($tokenpat = $pat[$#pat]->get_token) {      while  ($tokenpat = $pat[$#pat]->get_token) {
       if (($tokenpat->[0] eq 'T') || ($tokenpat->[0] eq 'C') || ($tokenpat->[0] eq 'D') ) {        if (($tokenpat->[0] eq 'T') || ($tokenpat->[0] eq 'C') || ($tokenpat->[0] eq 'D') ) {
  $partstring = $tokenpat->[1];   if ($metamode<1) { $partstring=$tokenpat->[1]; }
       } elsif ($tokenpat->[0] eq 'PI') {        } elsif ($tokenpat->[0] eq 'PI') {
  $partstring = $tokenpat->[2];   if ($metamode<1) { $partstring=$tokenpat->[2]; }
       } elsif ($tokenpat->[0] eq 'S') {        } elsif ($tokenpat->[0] eq 'S') {
  push (@innerstack,$tokenpat->[1]);   push (@innerstack,$tokenpat->[1]);
  push (@innerparstack,&parstring($tokenpat));   push (@innerparstack,&parstring($tokenpat));
Line 260  sub callsub { Line 256  sub callsub {
      $safeeval,$style);       $safeeval,$style);
     } else {      } else {
       #&Apache::lonxml::debug("NOT Calling sub $sub in $space<br />\n");        #&Apache::lonxml::debug("NOT Calling sub $sub in $space<br />\n");
       if (defined($token->[4]) && !$metamode) {        if (defined($token->[4]) && ($metamode < '1')) {
  $currentstring .= $token->[4];   $currentstring .= $token->[4];
       } else {        } else {
  $currentstring .= $token->[2];   $currentstring .= $token->[2];
       }        }
     }      }
     if ($target eq 'edit' && $token->[0] eq 'E') {      if ($target eq 'edit' && $token->[0] eq 'E') {
       $currentstring = &Apache::edit::tag_end($target,$token,$parstack,$parser,        $currentstring .= &Apache::edit::tag_end($target,$token,$parstack,$parser,
  $safeeval,$style);   $safeeval,$style);
     }      }
     use strict 'refs';      use strict 'refs';
Removed from v.1.60  
changed lines
  Added in v.1.61

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