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

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

version 1.15, 2000/08/03 18:24:24 version 1.16, 2000/08/03 19:34:11
Line 30  use Apache::scripttag; Line 30  use Apache::scripttag;
 sub xmlparse {  sub xmlparse {
   
  my ($target,$content_file_string,%style_for_target) = @_;   my ($target,$content_file_string,%style_for_target) = @_;
  my $pars = HTML::TokeParser->new(\$content_file_string);   my @pars = ();
    push (@pars,HTML::TokeParser->new(\$content_file_string));
  my $currentstring = '';   my $currentstring = '';
  my $finaloutput = '';    my $finaloutput = ''; 
  my $newarg = '';   my $newarg = '';
    my $result;
  my $safeeval = new Safe;   my $safeeval = new Safe;
  $safeeval->permit("entereval");   $safeeval->permit("entereval");
  $safeeval->permit(":base_math");   $safeeval->permit(":base_math");
Line 41  sub xmlparse { Line 43  sub xmlparse {
   
  ($target, my @tenta) = split('&&',$target);   ($target, my @tenta) = split('&&',$target);
   
 #------------------------- Stack definition (in stack we have all current tags)  
   
  my @stack = ();    my @stack = (); 
  my @parstack = ();   my @parstack = ();
   
 #------------------------------------- Parse input string (content_file_string)  
    
  my $token;   my $token;
     print $#pars;
  while ($token = $pars->get_token) {   while ( $#pars > -1 ) {
    if ($token->[0] eq 'T') {     while ($token = $pars[$#pars]->get_token) {
      $finaloutput .= &Apache::run::evaluate($token->[1],$safeeval,'');       if ($token->[0] eq 'T') {
    } elsif ($token->[0] eq 'S') {         $result=$token->[1];
      # add tag to stack      #       $finaloutput .= &Apache::run::evaluate($token->[1],$safeeval,'');
      push (@stack,$token->[1]);       } elsif ($token->[0] eq 'S') {
      # add parameters list to another stack         # add tag to stack    
      push (@parstack,&parstring($token));         push (@stack,$token->[1]);
               # add parameters list to another stack
      if (exists $style_for_target{$token->[1]}) {         push (@parstack,&parstring($token));
        $finaloutput .= &recurse($style_for_target{$token->[1]},         
  $target,$safeeval,\%style_for_target,         if (exists $style_for_target{$token->[1]}) {
  @parstack);   $finaloutput .= &recurse($style_for_target{$token->[1]},
      } else {    $target,$safeeval,\%style_for_target,
        my $result = &callsub("start_$token->[1]", $target, $token,\@parstack,    @parstack);
      $pars, $safeeval, \%style_for_target);         } else {
        if ($result ne "" ) {   my $result = &callsub("start_$token->[1]", $target, $token,\@parstack,
  $finaloutput .= &Apache::run::evaluate($result,$safeeval,         \@pars, $safeeval, \%style_for_target);
  $parstack[$#parstack]);         }              
        } elsif ($token->[0] eq 'E')  {
          #clear out any tags that didn't end
          while ($token->[1] ne $stack[$#stack] 
         && ($#stack > -1)) {pop @stack;pop @parstack;}
          
          if (exists $style_for_target{'/'."$token->[1]"}) {
    $finaloutput .= &recurse($style_for_target{'/'."$token->[1]"},
     $target,$safeeval,\%style_for_target,
     @parstack);
          } else {
    my $result = &callsub("end_$token->[1]", $target, $token, \@parstack,
          \@pars,$safeeval, \%style_for_target);
        }         }
      }                     }
    } elsif ($token->[0] eq 'E')  {       if ($result ne "" ) {
      #clear out any tags that didn't end         if ( $#parstack > -1 ) { 
      while ($token->[1] ne $stack[$#stack]   
     && ($#stack > 0)) {pop @stack;pop @parstack;}  
   
      if (exists $style_for_target{'/'."$token->[1]"}) {  
        $finaloutput .= &recurse($style_for_target{'/'."$token->[1]"},  
        $target,$safeeval,\%style_for_target,  
  @parstack);  
      } else {  
        my $result = &callsub("end_$token->[1]", $target, $token, \@parstack,  
      $pars,$safeeval, \%style_for_target);  
        if ($result ne "") {  
  $finaloutput .= &Apache::run::evaluate($result,$safeeval,   $finaloutput .= &Apache::run::evaluate($result,$safeeval,
  $parstack[$#parstack]);   $parstack[$#parstack]);
          } else {
    $finaloutput .= &Apache::run::evaluate($result,$safeeval,'');
        }         }
          $result = '';
      }       }
      pop @stack;        if ($token->[0] eq 'E') { pop @stack;pop @parstack; }
      pop @parstack;  
    }     }
      pop @pars;
  }   }
  return $finaloutput;   return $finaloutput;
 }  }
Line 100  sub recurse { Line 101  sub recurse {
   my @innerstack = ();     my @innerstack = (); 
   my @innerparstack = ();    my @innerparstack = ();
   my ($newarg,$target,$safeeval,$style_for_target,@parstack) = @_;    my ($newarg,$target,$safeeval,$style_for_target,@parstack) = @_;
   my $pat = HTML::TokeParser->new(\$newarg);    my @pat = ();
     push (@pat,HTML::TokeParser->new(\$newarg));
   my $tokenpat;    my $tokenpat;
   my $partstring = '';    my $partstring = '';
   my $output='';    my $output='';
   while  ($tokenpat = $pat->get_token) {    my $decls='';
     if ($tokenpat->[0] eq 'T') {    while ( $#pat > -1 ) {
       $partstring = $tokenpat->[1];      while  ($tokenpat = $pat[$#pat]->get_token) {
     } elsif ($tokenpat->[0] eq 'S') {        if ($tokenpat->[0] eq 'T') {
       push (@innerstack,$tokenpat->[1]);   $partstring = $tokenpat->[1];
       push (@innerparstack,&parstring($tokenpat));        } elsif ($tokenpat->[0] eq 'S') {
       $partstring = &callsub("start_$tokenpat->[1]",    push (@innerstack,$tokenpat->[1]);
      $target, $tokenpat, \@innerparstack,   push (@innerparstack,&parstring($tokenpat));
      $pat, $safeeval, $style_for_target);   $partstring = &callsub("start_$tokenpat->[1]", 
     } elsif ($tokenpat->[0] eq 'E') {         $target, $tokenpat, \@innerparstack,
       #clear out any tags that didn't end         \@pat, $safeeval, $style_for_target);
       while ($tokenpat->[1] ne $innerstack[$#innerstack]         } elsif ($tokenpat->[0] eq 'E') {
      && ($#innerstack > 0)) {pop @innerstack;pop @innerparstack;}   #clear out any tags that didn't end
       $partstring = &callsub("end_$tokenpat->[1]",   while ($tokenpat->[1] ne $innerstack[$#innerstack] 
      $target, $tokenpat, \@innerparstack,         && ($#innerstack > -1)) {pop @innerstack;pop @innerparstack;}
      $pat, $safeeval, $style_for_target);   $partstring = &callsub("end_$tokenpat->[1]",
     }         $target, $tokenpat, \@innerparstack,
     #pass both the variable to the style tag, and the tag we          \@pat, $safeeval, $style_for_target);
     #are processing inside the <definedtag>        }
     if ( $partstring ne "" ) {        #pass both the variable to the style tag, and the tag we 
       $output .= &Apache::run::evaluate($partstring,$safeeval,        #are processing inside the <definedtag>
                   $parstack[$#parstack].$innerparstack[$#innerparstack]);        if ( $partstring ne "" ) {
    if ( $#parstack > -1 ) { 
     if ( $#innerparstack > -1 ) { 
       $decls= $parstack[$#parstack].$innerparstack[$#innerparstack];
     } else {
       $decls= $parstack[$#parstack];
     }
    } else {
     if ( $#innerparstack > -1 ) { 
       $decls=$innerparstack[$#innerparstack];
     } else {
       $decls='';
     }
    }
    $output .= &Apache::run::evaluate($partstring,$safeeval,$decls);
    $partstring = '';
         }
         if ($tokenpat->[0] eq 'E') { pop @innerstack;pop @innerparstack; }
     }      }
     if ($tokenpat->[0] eq 'E') { pop @innerstack;pop @innerparstack; }      pop @pat;
   }    }
   return $output;    return $output;
 }  }
Line 140  sub callsub { Line 159  sub callsub {
     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,$style);        $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.15  
changed lines
  Added in v.1.16

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