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

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

version 1.6, 2000/06/29 13:58:23 version 1.8, 2000/06/29 20:27:13
Line 8  package Apache::lonxml; Line 8  package Apache::lonxml;
 use strict;  use strict;
 use HTML::TokeParser;  use HTML::TokeParser;
 use Safe;  use Safe;
   
   sub register {
     my $space;
     my @taglist;
     my $temptag;
     ($space,@taglist) = @_;
     foreach $temptag (@taglist) {
       $Apache::lonxml::alltags{$temptag}=$space;
     }
   }
   
 use Apache::style;  use Apache::style;
 use Apache::lontexconvert;  use Apache::lontexconvert;
 use Apache::londefdef;  
 use Apache::run;  use Apache::run;
   use Apache::londefdef;
   use Apache::scripttag;
 #==================================================   Main subroutine: xmlparse    #==================================================   Main subroutine: xmlparse  
   
 sub xmlparse {  sub xmlparse {
Line 21  sub xmlparse { Line 33  sub xmlparse {
  my $currentstring = '';   my $currentstring = '';
  my $finaloutput = '';    my $finaloutput = ''; 
  my $newarg = '';   my $newarg = '';
  my $tempostring = '';  
  my $tempocont = '';  
  my $safeeval = new Safe;   my $safeeval = new Safe;
  $safeeval->permit("entereval");   $safeeval->permit("entereval");
 #-------------------- Redefinition of the target in the case of compound target  #-------------------- Redefinition of the target in the case of compound target
Line 40  sub xmlparse { Line 50  sub xmlparse {
     
  while ($token = $pars->get_token) {   while ($token = $pars->get_token) {
    if ($token->[0] eq 'T') {     if ($token->[0] eq 'T') {
      $finaloutput .= $token->[1];       $finaloutput .= &Apache::run::evaluate($token->[1],$safeeval,'');
      $tempocont .= $token->[1];  
    } 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]);
 #----------------------------------------- add parameters list to another stack       # add parameters list to another stack
      map {$tempostring .= "$_=$token->[2]->{$_},"} @{$token->[3]};       push (@parstack,&parstring($token));
      push (@parstack,$tempostring);  
      $tempostring = '';  
             
      if (exists $style_for_target{$token->[1]}) {       if (exists $style_for_target{$token->[1]}) {
 #       print "Style for $token->[1] is " .$style_for_target{$token->[1]}."\n";         #basically recurse, but we never got more than one level down so just 
 #---------------------------------------------------- use style file definition         #create the new context here
          my @innerstack = (); 
        $newarg = $style_for_target{$token->[1]};         my @innerparstack = ();
                 # use style file definition
        if (index($newarg,'script') != -1 ) {         $newarg = $style_for_target{$token->[1]};       
  my $pat = HTML::TokeParser->new(\$newarg);         my $pat = HTML::TokeParser->new(\$newarg);
  my $tokenpat = '';         my $tokenpat = '';
  my $partstring = '';         my $partstring = '';
  my $oustring = '';  
  my $outputstring;         while  ($tokenpat = $pat->get_token) {
      if ($tokenpat->[0] eq 'T') {
  while  ($tokenpat = $pat->get_token) {     $partstring = $tokenpat->[1];
    if ($tokenpat->[0] eq 'T') {   } elsif ($tokenpat->[0] eq 'S') {
 #     print "evaluating $tokenpat->[4]\n";     push (@innerstack,$tokenpat->[1]);
      $oustring .= &Apache::run::evaluate($tokenpat->[1],$safeeval);     push (@innerparstack,&parstring($tokenpat));
    } elsif ($tokenpat->[0] eq 'S') {     $partstring = &callsub("start_$tokenpat->[1]", 
      if ($tokenpat->[1] eq 'script') {    $target, $tokenpat, \@innerparstack)
        while  ($tokenpat = $pat->get_token and $tokenpat->[1] ne 'script') {   } elsif ($tokenpat->[0] eq 'E') {
  if ($tokenpat->[0] eq 'S')  {     #clear out any tags that didn't end
    $partstring .=  $tokenpat->[4];     while ($tokenpat->[1] ne $innerstack[$#innerstack] 
  } elsif ($tokenpat->[0] eq 'T') {    && ($#innerstack > 0)) {pop @innerstack;pop @innerparstack;}
    $partstring .=  $tokenpat->[1];     $partstring = &callsub("end_$tokenpat->[1]",
  } elsif ($tokenpat->[0] eq 'E') {    $target, $tokenpat, \@innerparstack)
    $partstring .=  $tokenpat->[2];  
  }  
        }  
          
        map {$partstring =~ s/\$$_/$token->[2]->{$_}/g; } @{$token->[3]};  
 #       print "want to use run\n";         
        &Apache::run::run($partstring,$safeeval);  
          
        $partstring = '';  
      } else {  
 #       print "evaluating $tokenpat->[4]\n";  
        $oustring .= &Apache::run::evaluate($tokenpat->[4],$safeeval);  
      }  
    } elsif ($tokenpat->[0] eq 'E' and $tokenpat->[1] ne 'evaluate') {  
 #     print "hereish\n";  
      $oustring .= $tokenpat->[1];      
    }  
  }   }
  $newarg =  $oustring;   #pass both the variable to the style tag, and the tag we 
        } else {   #are processing inside the <definedtag>
  map {$newarg =~ s/\$$_/$token->[2]->{$_}/g; } @{$token->[3]};   $finaloutput .= &Apache::run::evaluate($partstring,$safeeval,
    $parstack[$#parstack].$innerparstack[$#innerparstack]);
    if ($tokenpat->[0] eq 'E') { pop @innerstack;pop @innerparstack; }
        }         }
        $finaloutput .= $newarg;  
      } else {       } else {
        # use default definition of tag         my $result = &callsub("start_$token->[1]", $target, $token, \@parstack);
        my $sub="start_$token->[1]";         $finaloutput .= &Apache::run::evaluate($result,$safeeval,
        {        $parstack[$#parstack]);
  no strict 'refs';  
  if (defined (&$sub)) {  
    $currentstring = &$sub($target,$token,\@parstack);  
    $finaloutput .= $currentstring;  
    $currentstring = '';  
  } else {  
    $finaloutput .= $token->[4];  
  }  
  use strict 'refs';      
        }  
      }                     }              
    } elsif ($token->[0] eq 'E')  {     } elsif ($token->[0] eq 'E')  {
      # Put here check for correct final tag (to avoid existence of        # Put here check for correct final tag (to avoid existence of 
      # starting tag only)       # starting tag only)
                
      pop @stack;        pop @stack; 
      unless (exists $style_for_target{$token->[1]}) {       unless (exists $style_for_target{$token->[1]}) {
        my $sub="end_$token->[1]";         my $sub="end_$token->[1]";
        {         $finaloutput .= callsub($sub, $target, $token, \@parstack);
  no strict 'refs';  
  if (defined(&$sub)) {  
    $currentstring = &$sub($target,$token,\@parstack);  
    $finaloutput .= $currentstring;  
    $currentstring = '';  
  } else {  
    $finaloutput .= $token->[4];  
  }  
  use strict 'refs';  
        }  
      }       }
      #---- end tag from the style file       #---- end tag from the style file
      if (exists $style_for_target{'/'."$token->[1]"}) {       if (exists $style_for_target{'/'."$token->[1]"}) {
Line 149  sub xmlparse { Line 120  sub xmlparse {
              if ($tokenpat->[1] eq 'script') {               if ($tokenpat->[1] eq 'script') {
                while  ($tokenpat = $pat->get_token and $tokenpat->[1] ne 'script') {                 while  ($tokenpat = $pat->get_token and $tokenpat->[1] ne 'script') {
  if ($tokenpat->[0] eq 'S')  {   if ($tokenpat->[0] eq 'S')  {
      
    $partstring .=  $tokenpat->[4];     $partstring .=  $tokenpat->[4];
  } elsif ($tokenpat->[0] eq 'T') {   } elsif ($tokenpat->[0] eq 'T') {
    $partstring .=  $tokenpat->[1];     $partstring .=  $tokenpat->[1];
Line 191  sub xmlparse { Line 163  sub xmlparse {
  return $finaloutput;   return $finaloutput;
 }  }
   
   sub callsub {
     my ($sub,$target,$token,@parstack)=@_;
     my $currentstring='';
     {
       no strict 'refs';
       if (my $space=$Apache::lonxml::alltags{$token->[1]}) {
         #print "Calling sub $sub in $space \n";
         $sub="$space\:\:$sub";
         $currentstring = &$sub($target,$token,\@parstack);
       } else {
         #print "NOT Calling sub $sub\n";
         if (defined($token->[4])) {
    $currentstring = $token->[4];
         } else {
    $currentstring = $token->[2];
         }
       }
       use strict 'refs';
     }
     return $currentstring;
   }
   
   sub parstring {
     my ($token) = @_;
     my $temp='';
     map {$temp .= "my \$$_=\"$token->[2]->{$_}\";"} @{$token->[3]};
     return $temp;
   }
 1;  1;
 __END__  __END__
Removed from v.1.6  
changed lines
  Added in v.1.8

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