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

Diff for /loncom/xml/lonxml.pm between versions 1.12 and 1.15

version 1.12, 2000/07/20 15:37:54 version 1.15, 2000/08/03 18:24:24
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 58  sub xmlparse { Line 60  sub xmlparse {
      push (@parstack,&parstring($token));       push (@parstack,&parstring($token));
             
      if (exists $style_for_target{$token->[1]}) {       if (exists $style_for_target{$token->[1]}) {
        #basically recurse, but we never got more than one level down so just          $finaloutput .= &recurse($style_for_target{$token->[1]},
        #create the new context here   $target,$safeeval,\%style_for_target,
        my @innerstack = ();    @parstack);
        my @innerparstack = ();  
        # use style file definition  
        $newarg = $style_for_target{$token->[1]};         
        my $pat = HTML::TokeParser->new(\$newarg);  
        my $tokenpat = '';  
        my $partstring = '';  
   
        while  ($tokenpat = $pat->get_token) {  
  if ($tokenpat->[0] eq 'T') {  
    $partstring = $tokenpat->[1];  
  } elsif ($tokenpat->[0] eq 'S') {  
    push (@innerstack,$tokenpat->[1]);  
    push (@innerparstack,&parstring($tokenpat));  
    $partstring = &callsub("start_$tokenpat->[1]",   
   $target, $tokenpat, \@innerparstack,  
   $pat, $safeeval);  
  } elsif ($tokenpat->[0] eq 'E') {  
    #clear out any tags that didn't end  
    while ($tokenpat->[1] ne $innerstack[$#innerstack]   
   && ($#innerstack > 0)) {pop @innerstack;pop @innerparstack;}  
    $partstring = &callsub("end_$tokenpat->[1]",  
   $target, $tokenpat, \@innerparstack,  
   $pat, $safeeval);  
  }  
  #pass both the variable to the style tag, and the tag we   
  #are processing inside the <definedtag>  
  $finaloutput .= &Apache::run::evaluate($partstring,$safeeval,  
  $parstack[$#parstack].$innerparstack[$#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, \%style_for_target);
        $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 103  sub xmlparse { Line 77  sub xmlparse {
     && ($#stack > 0)) {pop @stack;pop @parstack;}      && ($#stack > 0)) {pop @stack;pop @parstack;}
   
      if (exists $style_for_target{'/'."$token->[1]"}) {       if (exists $style_for_target{'/'."$token->[1]"}) {
        my @innerstack = ();          $finaloutput .= &recurse($style_for_target{'/'."$token->[1]"},
        my @innerparstack = ();         $target,$safeeval,\%style_for_target,
        $newarg = $style_for_target{'/'."$token->[1]"};   @parstack);
   
 #       print "qqq: $token->[1],$newarg\n";  
   
        my $pat = HTML::TokeParser->new(\$newarg);  
        my $tokenpat;  
        my $partstring = '';  
          
        while  ($tokenpat = $pat->get_token) {  
  if ($tokenpat->[0] eq 'T') {  
    $partstring = $tokenpat->[1];  
  } elsif ($tokenpat->[0] eq 'S') {  
    push (@innerstack,$tokenpat->[1]);  
    push (@innerparstack,&parstring($tokenpat));  
    $partstring = &callsub("start_$tokenpat->[1]",   
   $target, $tokenpat, \@innerparstack,  
   $pat, $safeeval);  
  } elsif ($tokenpat->[0] eq 'E') {  
    #clear out any tags that didn't end  
    while ($tokenpat->[1] ne $innerstack[$#innerstack]   
   && ($#innerstack > 0)) {pop @innerstack;pop @innerparstack;}  
    $partstring = &callsub("end_$tokenpat->[1]",  
   $target, $tokenpat, \@innerparstack,  
   $pat, $safeeval);  
  }  
  #pass both the variable to the style tag, and the tag we   
  #are processing inside the <definedtag>  
  $finaloutput .= &Apache::run::evaluate($partstring,$safeeval,  
  $parstack[$#parstack].$innerparstack[$#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, \%style_for_target);
        $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 149  sub xmlparse { Line 95  sub xmlparse {
  return $finaloutput;   return $finaloutput;
 }  }
   
   sub recurse {
     
     my @innerstack = (); 
     my @innerparstack = ();
     my ($newarg,$target,$safeeval,$style_for_target,@parstack) = @_;
     my $pat = HTML::TokeParser->new(\$newarg);
     my $tokenpat;
     my $partstring = '';
     my $output='';
     while  ($tokenpat = $pat->get_token) {
       if ($tokenpat->[0] eq 'T') {
         $partstring = $tokenpat->[1];
       } elsif ($tokenpat->[0] eq 'S') {
         push (@innerstack,$tokenpat->[1]);
         push (@innerparstack,&parstring($tokenpat));
         $partstring = &callsub("start_$tokenpat->[1]", 
        $target, $tokenpat, \@innerparstack,
        $pat, $safeeval, $style_for_target);
       } elsif ($tokenpat->[0] eq 'E') {
         #clear out any tags that didn't end
         while ($tokenpat->[1] ne $innerstack[$#innerstack] 
        && ($#innerstack > 0)) {pop @innerstack;pop @innerparstack;}
         $partstring = &callsub("end_$tokenpat->[1]",
        $target, $tokenpat, \@innerparstack,
        $pat, $safeeval, $style_for_target);
       }
       #pass both the variable to the style tag, and the tag we 
       #are processing inside the <definedtag>
       if ( $partstring ne "" ) {
         $output .= &Apache::run::evaluate($partstring,$safeeval,
                     $parstack[$#parstack].$innerparstack[$#innerparstack]);
       }
       if ($tokenpat->[0] eq 'E') { pop @innerstack;pop @innerparstack; }
     }
     return $output;
   }
   
 sub callsub {  sub callsub {
   my ($sub,$target,$token,$parstack,$parser,$safeeval)=@_;    my ($sub,$target,$token,$parstack,$parser,$safeeval,$style)=@_;
   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,$parser,$safeeval);        $currentstring = &$sub($target,$token,\@$parstack,$parser,$safeeval,$style);
     } 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.12  
changed lines
  Added in v.1.15

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