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

Diff for /loncom/xml/lonxml.pm between versions 1.9 and 1.10

version 1.9, 2000/07/05 18:04:45 version 1.10, 2000/07/14 19:11:03
Line 75  sub xmlparse { Line 75  sub xmlparse {
    push (@innerstack,$tokenpat->[1]);     push (@innerstack,$tokenpat->[1]);
    push (@innerparstack,&parstring($tokenpat));     push (@innerparstack,&parstring($tokenpat));
    $partstring = &callsub("start_$tokenpat->[1]",      $partstring = &callsub("start_$tokenpat->[1]", 
   $target, $tokenpat, \@innerparstack)    $target, $tokenpat, \@innerparstack,
     $pat, $safeeval);
  } elsif ($tokenpat->[0] eq 'E') {   } elsif ($tokenpat->[0] eq 'E') {
    #clear out any tags that didn't end     #clear out any tags that didn't end
    while ($tokenpat->[1] ne $innerstack[$#innerstack]      while ($tokenpat->[1] ne $innerstack[$#innerstack] 
   && ($#innerstack > 0)) {pop @innerstack;pop @innerparstack;}    && ($#innerstack > 0)) {pop @innerstack;pop @innerparstack;}
    $partstring = &callsub("end_$tokenpat->[1]",     $partstring = &callsub("end_$tokenpat->[1]",
   $target, $tokenpat, \@innerparstack)    $target, $tokenpat, \@innerparstack,
     $pat, $safeeval);
  }   }
  #pass both the variable to the style tag, and the tag we    #pass both the variable to the style tag, and the tag we 
  #are processing inside the <definedtag>   #are processing inside the <definedtag>
Line 90  sub xmlparse { Line 92  sub xmlparse {
  if ($tokenpat->[0] eq 'E') { pop @innerstack;pop @innerparstack; }   if ($tokenpat->[0] eq 'E') { pop @innerstack;pop @innerparstack; }
        }         }
      } else {       } else {
        my $result = &callsub("start_$token->[1]", $target, $token, \@parstack);         my $result = &callsub("start_$token->[1]", $target, $token,\@parstack,
        $pars, $safeeval);
        $finaloutput .= &Apache::run::evaluate($result,$safeeval,         $finaloutput .= &Apache::run::evaluate($result,$safeeval,
       $parstack[$#parstack]);        $parstack[$#parstack]);
      }                     }              
Line 114  sub xmlparse { Line 117  sub xmlparse {
    push (@innerstack,$tokenpat->[1]);     push (@innerstack,$tokenpat->[1]);
    push (@innerparstack,&parstring($tokenpat));     push (@innerparstack,&parstring($tokenpat));
    $partstring = &callsub("start_$tokenpat->[1]",      $partstring = &callsub("start_$tokenpat->[1]", 
   $target, $tokenpat, \@innerparstack)    $target, $tokenpat, \@innerparstack,
     $pat, $safeeval);
  } elsif ($tokenpat->[0] eq 'E') {   } elsif ($tokenpat->[0] eq 'E') {
    #clear out any tags that didn't end     #clear out any tags that didn't end
    while ($tokenpat->[1] ne $innerstack[$#innerstack]      while ($tokenpat->[1] ne $innerstack[$#innerstack] 
   && ($#innerstack > 0)) {pop @innerstack;pop @innerparstack;}    && ($#innerstack > 0)) {pop @innerstack;pop @innerparstack;}
    $partstring = &callsub("end_$tokenpat->[1]",     $partstring = &callsub("end_$tokenpat->[1]",
   $target, $tokenpat, \@innerparstack)    $target, $tokenpat, \@innerparstack,
     $pat, $safeeval);
  }   }
  #pass both the variable to the style tag, and the tag we    #pass both the variable to the style tag, and the tag we 
  #are processing inside the <definedtag>   #are processing inside the <definedtag>
Line 129  sub xmlparse { Line 134  sub xmlparse {
  if ($tokenpat->[0] eq 'E') { pop @innerstack;pop @innerparstack; }   if ($tokenpat->[0] eq 'E') { pop @innerstack;pop @innerparstack; }
        }         }
      } else {       } else {
        my $result = &callsub("start_$token->[1]", $target, $token, \@parstack);         my $result = &callsub("end_$token->[1]", $target, $token, \@parstack,
        $pars,$safeeval);
        $finaloutput .= &Apache::run::evaluate($result,$safeeval,         $finaloutput .= &Apache::run::evaluate($result,$safeeval,
       $parstack[$#parstack]);        $parstack[$#parstack]);
      }       }
Line 141  sub xmlparse { Line 147  sub xmlparse {
 }  }
   
 sub callsub {  sub callsub {
   my ($sub,$target,$token,@parstack)=@_;    my ($sub,$target,$token,$parstack,$parser,$safeeval)=@_;
   my $currentstring='';    my $currentstring='';
   {    {
     no strict 'refs';      no strict 'refs';
     if (my $space=$Apache::lonxml::alltags{$token->[1]}) {      if (my $space=$Apache::lonxml::alltags{$token->[1]}) {
       #print "Calling sub $sub in $space \n";        #print "Calling sub $sub in $space \n";
       $sub="$space\:\:$sub";        $sub="$space\:\:$sub";
       $currentstring = &$sub($target,$token,\@parstack);        $currentstring = &$sub($target,$token,\@$parstack,$parser,$safeeval);
     } else {      } else {
       #print "NOT Calling sub $sub\n";        #print "NOT Calling sub $sub\n";
       if (defined($token->[4])) {        if (defined($token->[4])) {
Removed from v.1.9  
changed lines
  Added in v.1.10

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