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

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

version 1.8, 2000/06/29 20:27:13 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 18  sub register { Line 19  sub register {
     $Apache::lonxml::alltags{$temptag}=$space;      $Apache::lonxml::alltags{$temptag}=$space;
   }    }
 }  }
                                        
 use Apache::style;  use Apache::style;
 use Apache::lontexconvert;  use Apache::lontexconvert;
 use Apache::run;  use Apache::run;
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)  
  } 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)  
  }  
  #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,
        $finaloutput .= &Apache::run::evaluate($result,$safeeval,       $pars, $safeeval, \%style_for_target);
       $parstack[$#parstack]);         if ($result ne "" ) {
    $finaloutput .= &Apache::run::evaluate($result,$safeeval,
    $parstack[$#parstack]);
          }
      }                     }              
    } elsif ($token->[0] eq 'E')  {     } elsif ($token->[0] eq 'E')  {
      # Put here check for correct final tag (to avoid existence of        #clear out any tags that didn't end
      # starting tag only)       while ($token->[1] ne $stack[$#stack] 
            && ($#stack > 0)) {pop @stack;pop @parstack;}
      pop @stack;   
      unless (exists $style_for_target{$token->[1]}) {  
        my $sub="end_$token->[1]";  
        $finaloutput .= callsub($sub, $target, $token, \@parstack);  
      }  
      #---- end tag from the style file  
      if (exists $style_for_target{'/'."$token->[1]"}) {       if (exists $style_for_target{'/'."$token->[1]"}) {
        $newarg = $style_for_target{'/'."$token->[1]"};         $finaloutput .= &recurse($style_for_target{'/'."$token->[1]"},
        if (index($newarg,'script') != -1 ) {         $target,$safeeval,\%style_for_target,
          my $pat = HTML::TokeParser->new(\$newarg);   @parstack);
          my $tokenpat;       } else {
          my $partstring = '';         my $result = &callsub("end_$token->[1]", $target, $token, \@parstack,
          my $oustring = '';       $pars,$safeeval, \%style_for_target);
          my $outputstring;         if ($result ne "") {
      $finaloutput .= &Apache::run::evaluate($result,$safeeval,
          while  ($tokenpat = $pat->get_token) {   $parstack[$#parstack]);
    if ($tokenpat->[0] eq 'T') {  
      $oustring .= $tokenpat->[1];  
    } elsif ($tokenpat->[0] eq 'S') {  
              if ($tokenpat->[1] eq 'script') {  
                while  ($tokenpat = $pat->get_token and $tokenpat->[1] ne 'script') {  
  if ($tokenpat->[0] eq 'S')  {  
      
    $partstring .=  $tokenpat->[4];  
  } elsif ($tokenpat->[0] eq 'T') {  
    $partstring .=  $tokenpat->[1];  
  } elsif ($tokenpat->[0] eq 'E') {  
    $partstring .=  $tokenpat->[2];  
  }  
        }  
          
                my @tempor_list = split(',',$parstack[$#parstack]);  
                my @te_kl = ();  
                my %tempor_hash = ();  
                map {(my $onete,my $twote) = split('=',$_); push (@te_kl,$onete);   
                     $tempor_hash{$onete} = $twote} @tempor_list;  
                map {$partstring =~ s/\$$_/$tempor_hash{$_}/g; } @te_kl;   
        print "want to use run\n";  
                &Apache::run::run($partstring,$safeeval);  
          
                $partstring = '';  
      } elsif ($tokenpat->[1] eq 'evaluate') {  
        $outputstring = &Apache::run::evaluate($tokenpat->[2]{expression},$safeeval);  
        $oustring .=  $outputstring;  
      } else {  
        $oustring .= $tokenpat->[4];   
      }  
    } elsif ($tokenpat->[0] eq 'E' and $tokenpat->[1] ne 'evaluate') {  
              $oustring .= $tokenpat->[1];      
    }  
          }  
  $newarg =  $oustring;  
        } else {  
          my @very_temp = split(',',$parstack[$#parstack]);  
          map {my @ret= split('=',$_); $newarg =~ s/\$$ret[0]/$ret[1]/g; } @very_temp;  
        }         }
          
        $finaloutput .= $newarg;   
      }       }
        pop @stack; 
      pop @parstack;       pop @parstack;
    }     }
  }   }
  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)=@_;    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);        $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])) {
Line 193  sub parstring { Line 162  sub parstring {
 }  }
 1;  1;
 __END__  __END__
   
   
   
   
   
Removed from v.1.8  
changed lines
  Added in v.1.15

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>
500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.