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

Diff for /loncom/xml/lonxml.pm between versions 1.14 and 1.18

version 1.14, 2000/08/02 16:47:53 version 1.18, 2000/08/11 14:24:50
Line 29  use Apache::scripttag; Line 29  use Apache::scripttag;
   
 sub xmlparse {  sub xmlparse {
   
  my ($target,$content_file_string,%style_for_target) = @_;   my ($target,$content_file_string,$safeinit,%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");
    if ( $safeinit ne '') {&Apache::run::run($safeinit,$safeeval);}
 #-------------------- 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);
   
 #------------------------- Stack definition (in stack we have all current tags)  
   
  my @stack = ();    my @stack = (); 
  my @parstack = ();   my @parstack = ();
    &initdepth;
 #------------------------------------- Parse input string (content_file_string)  
    
  my $token;   my $token;
     while ( $#pars > -1 ) {
  while ($token = $pars->get_token) {     while ($token = $pars[$#pars]->get_token) {
    if ($token->[0] eq 'T') {       if ($token->[0] eq 'T') {
      $finaloutput .= &Apache::run::evaluate($token->[1],$safeeval,'');         $result=$token->[1];
    } elsif ($token->[0] eq 'S') {  #       $finaloutput .= &Apache::run::evaluate($token->[1],$safeeval,'');
      # add tag to stack           } elsif ($token->[0] eq 'S') {
      push (@stack,$token->[1]);         # add tag to stack    
      # add parameters list to another stack         push (@stack,$token->[1]);
      push (@parstack,&parstring($token));         # add parameters list to another stack
               push (@parstack,&parstring($token));
      if (exists $style_for_target{$token->[1]}) {         &increasedepth();       
        #basically recurse, but we never got more than one level down so just          if (exists $style_for_target{$token->[1]}) {
        #create the new context here   $finaloutput .= &recurse($style_for_target{$token->[1]},
        my @innerstack = ();     $target,$safeeval,\%style_for_target,
        my @innerparstack = ();    @parstack);
        # use style file definition         } else {
        $newarg = $style_for_target{$token->[1]};          $result = &callsub("start_$token->[1]", $target, $token,\@parstack,
        my $pat = HTML::TokeParser->new(\$newarg);         \@pars, $safeeval, \%style_for_target);
        my $tokenpat = '';         }              
        my $partstring = '';       } elsif ($token->[0] eq 'E')  {
          #clear out any tags that didn't end
        while  ($tokenpat = $pat->get_token) {         while ($token->[1] ne $stack[$#stack] 
  if ($tokenpat->[0] eq 'T') {        && ($#stack > -1)) {pop @stack;pop @parstack;&decreasedepth;}
    $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 "" ) {  
    $finaloutput .= &Apache::run::evaluate($partstring,$safeeval,  
  $parstack[$#parstack].$innerparstack[$#innerparstack]);  
  }  
  if ($tokenpat->[0] eq 'E') { pop @innerstack;pop @innerparstack; }  
        }  
      } else {  
        my $result = &callsub("start_$token->[1]", $target, $token,\@parstack,  
      $pars, $safeeval, \%style_for_target);  
        if ($result ne "" ) {  
  $finaloutput .= &Apache::run::evaluate($result,$safeeval,  
  $parstack[$#parstack]);  
        }  
      }                
    } elsif ($token->[0] eq 'E')  {  
      #clear out any tags that didn't end  
      while ($token->[1] ne $stack[$#stack]   
     && ($#stack > 0)) {pop @stack;pop @parstack;}  
   
      if (exists $style_for_target{'/'."$token->[1]"}) {  
        my @innerstack = ();   
        my @innerparstack = ();  
        $newarg = $style_for_target{'/'."$token->[1]"};  
        my $pat = HTML::TokeParser->new(\$newarg);  
        my $tokenpat;  
        my $partstring = '';  
                 
        while  ($tokenpat = $pat->get_token) {         if (exists $style_for_target{'/'."$token->[1]"}) {
  if ($tokenpat->[0] eq 'T') {   $finaloutput .= &recurse($style_for_target{'/'."$token->[1]"},
    $partstring = $tokenpat->[1];    $target,$safeeval,\%style_for_target,
  } elsif ($tokenpat->[0] eq 'S') {    @parstack);
    push (@innerstack,$tokenpat->[1]);         } else {
    push (@innerparstack,&parstring($tokenpat));   $result = &callsub("end_$token->[1]", $target, $token, \@parstack,
    $partstring = &callsub("start_$tokenpat->[1]",          \@pars,$safeeval, \%style_for_target);
   $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 "" ) {  
    $finaloutput .= &Apache::run::evaluate($partstring,$safeeval,  
  $parstack[$#parstack].$innerparstack[$#innerparstack]);  
  }  
  if ($tokenpat->[0] eq 'E') { pop @innerstack;pop @innerparstack; }  
        }         }
      } else {       }
        my $result = &callsub("end_$token->[1]", $target, $token, \@parstack,       if ($result ne "" ) {
      $pars,$safeeval, \%style_for_target);         if ( $#parstack > -1 ) { 
        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;&decreasedepth;}
      pop @parstack;  
    }     }
      pop @pars;
  }   }
  return $finaloutput;   return $finaloutput;
 }  }
   
   sub recurse {
     
     my @innerstack = (); 
     my @innerparstack = ();
     my ($newarg,$target,$safeeval,$style_for_target,@parstack) = @_;
     my @pat = ();
     push (@pat,HTML::TokeParser->new(\$newarg));
     my $tokenpat;
     my $partstring = '';
     my $output='';
     my $decls='';
     while ( $#pat > -1 ) {
       while  ($tokenpat = $pat[$#pat]->get_token) {
         if ($tokenpat->[0] eq 'T') {
    $partstring = $tokenpat->[1];
         } elsif ($tokenpat->[0] eq 'S') {
    push (@innerstack,$tokenpat->[1]);
    push (@innerparstack,&parstring($tokenpat));
    &increasedepth();
    $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 > -1)) {pop @innerstack;pop @innerparstack;
    &decreasedepth;}
    $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 "" ) {
    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;
    &decreasedepth;}
       }
       pop @pat;
     }
     return $output;
   }
   
 sub callsub {  sub callsub {
   my ($sub,$target,$token,$parstack,$parser,$safeeval,$style)=@_;    my ($sub,$target,$token,$parstack,$parser,$safeeval,$style)=@_;
   my $currentstring='';    my $currentstring='';
Line 164  sub callsub { Line 163  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);        $Apache::lonxml::curdepth=join('_',@Apache::lonxml::depthcounter);
         $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 178  sub callsub { Line 179  sub callsub {
   return $currentstring;    return $currentstring;
 }  }
   
   sub initdepth {
     @Apache::lonxml::depthcounter=();
     $Apache::lonxml::depth=-1;
     $Apache::lonxml::olddepth=-1;
   }
   
   sub increasedepth {
     if ($Apache::lonxml::depth<$Apache::lonxml::olddepth-1) {
       $#Apache::lonxml::depthcounter--;
       $Apache::lonxml::olddepth=$Apache::lonxml::depth;
     }
     $Apache::lonxml::depth++;
     $Apache::lonxml::depthcounter[$Apache::lonxml::depth]++;
     if ($Apache::lonxml::depthcounter[$Apache::lonxml::depth]==1) {
       $Apache::lonxml::olddepth=$Apache::lonxml::depth;
     }
   }
   
   sub decreasedepth {
     $Apache::lonxml::depth--;
   }
   
 sub parstring {  sub parstring {
   my ($token) = @_;    my ($token) = @_;
   my $temp='';    my $temp='';
Removed from v.1.14  
changed lines
  Added in v.1.18

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