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

Diff for /loncom/xml/lonxml.pm between versions 1.11 and 1.13

version 1.11, 2000/07/18 21:27:10 version 1.13, 2000/07/25 21:28:22
Line 8  package Apache::lonxml; Line 8  package Apache::lonxml;
 use strict;  use strict;
 use HTML::TokeParser;  use HTML::TokeParser;
 use Safe;  use Safe;
   use Opcode;
   
 sub register {  sub register {
   my $space;    my $space;
Line 35  sub xmlparse { Line 36  sub xmlparse {
  my $newarg = '';   my $newarg = '';
  my $safeeval = new Safe;   my $safeeval = new Safe;
  $safeeval->permit("entereval");   $safeeval->permit("entereval");
    $safeeval->permit(":base_math");
 #-------------------- Redefinition of the target in the case of compound target  #-------------------- Redefinition of the target in the case of compound target
   
  ($target, my @tenta) = split('&&',$target);   ($target, my @tenta) = split('&&',$target);
Line 87  sub xmlparse { Line 89  sub xmlparse {
  }   }
  #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>
  $finaloutput .= &Apache::run::evaluate($partstring,$safeeval,   if ($partstring ne "" ) {
      $finaloutput .= &Apache::run::evaluate($partstring,$safeeval,
  $parstack[$#parstack].$innerparstack[$#innerparstack]);   $parstack[$#parstack].$innerparstack[$#innerparstack]);
    }
  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);       $pars, $safeeval);
        $finaloutput .= &Apache::run::evaluate($result,$safeeval,         if ($result ne "" ) {
       $parstack[$#parstack]);   $finaloutput .= &Apache::run::evaluate($result,$safeeval,
    $parstack[$#parstack]);
          }
      }                     }              
    } elsif ($token->[0] eq 'E')  {     } elsif ($token->[0] eq 'E')  {
      #clear out any tags that didn't end       #clear out any tags that didn't end
Line 112  sub xmlparse { Line 118  sub xmlparse {
                 
        while  ($tokenpat = $pat->get_token) {         while  ($tokenpat = $pat->get_token) {
  if ($tokenpat->[0] eq 'T') {   if ($tokenpat->[0] eq 'T') {
    $partstring .= $tokenpat->[1];     $partstring = $tokenpat->[1];
  } 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 129  sub xmlparse { Line 135  sub xmlparse {
  }   }
  #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>
  $finaloutput .= &Apache::run::evaluate($partstring,$safeeval,   if ( $partstring ne "" ) {
      $finaloutput .= &Apache::run::evaluate($partstring,$safeeval,
  $parstack[$#parstack].$innerparstack[$#innerparstack]);   $parstack[$#parstack].$innerparstack[$#innerparstack]);
    }
  if ($tokenpat->[0] eq 'E') { pop @innerstack;pop @innerparstack; }   if ($tokenpat->[0] eq 'E') { pop @innerstack;pop @innerparstack; }
        }         }
      } else {       } else {
        my $result = &callsub("end_$token->[1]", $target, $token, \@parstack,         my $result = &callsub("end_$token->[1]", $target, $token, \@parstack,
      $pars,$safeeval);       $pars,$safeeval);
        $finaloutput .= &Apache::run::evaluate($result,$safeeval,         if ($result ne "") {
       $parstack[$#parstack]);   $finaloutput .= &Apache::run::evaluate($result,$safeeval,
    $parstack[$#parstack]);
          }
      }       }
      pop @stack;        pop @stack; 
      pop @parstack;       pop @parstack;
Line 156  sub callsub { Line 166  sub callsub {
       $sub="$space\:\:$sub";        $sub="$space\:\:$sub";
       $currentstring = &$sub($target,$token,\@$parstack,$parser,$safeeval);        $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])) {
  $currentstring = $token->[4];   $currentstring = $token->[4];
       } else {        } else {
Removed from v.1.11  
changed lines
  Added in v.1.13

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