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

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

version 1.7, 2000/06/29 18:52:54 version 1.8, 2000/06/29 20:27:13
Line 33  sub xmlparse { Line 33  sub xmlparse {
  my $currentstring = '';   my $currentstring = '';
  my $finaloutput = '';    my $finaloutput = ''; 
  my $newarg = '';   my $newarg = '';
  my $tempostring = '';  
  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 56  sub xmlparse { Line 55  sub xmlparse {
      # 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 .= "my \$$_=\"$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 
          #create the new context here
          my @innerstack = (); 
          my @innerparstack = ();
        # use style file definition         # use style file definition
          $newarg = $style_for_target{$token->[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) {         while  ($tokenpat = $pat->get_token) {
  if ($tokenpat->[0] eq 'T') {   if ($tokenpat->[0] eq 'T') {
    $partstring = $tokenpat->[1];     $partstring = $tokenpat->[1];
  } elsif ($tokenpat->[0] eq 'S') {   } elsif ($tokenpat->[0] eq 'S') {
    my $sub="start_$tokenpat->[1]";     push (@innerstack,$tokenpat->[1]);
    $partstring = &callsub($sub, $target, $tokenpat, \@parstack)     push (@innerparstack,&parstring($tokenpat));
      $partstring = &callsub("start_$tokenpat->[1]", 
     $target, $tokenpat, \@innerparstack)
  } elsif ($tokenpat->[0] eq 'E') {   } elsif ($tokenpat->[0] eq 'E') {
    my $sub="end_$tokenpat->[1]";     #clear out any tags that didn't end
    $partstring = &callsub($sub, $target, $tokenpat, \@parstack)     while ($tokenpat->[1] ne $innerstack[$#innerstack] 
     && ($#innerstack > 0)) {pop @innerstack;pop @innerparstack;}
      $partstring = &callsub("end_$tokenpat->[1]",
     $target, $tokenpat, \@innerparstack)
  }   }
         # generate the my mechanism   #pass both the variable to the style tag, and the tag we 
  # map {$partstring =~ s/\$$_/$token->[2]->{$_}/g; } @{$token->[3]};   #are processing inside the <definedtag>
  print "Temp: $parstack[$#parstack]\n";   $finaloutput .= &Apache::run::evaluate($partstring,$safeeval,
  $oustring .= &Apache::run::evaluate($partstring,$safeeval,$parstack[$#parstack]);   $parstack[$#parstack].$innerparstack[$#innerparstack]);
    if ($tokenpat->[0] eq 'E') { pop @innerstack;pop @innerparstack; }
        }         }
        $finaloutput .= $oustring;  
      } else {       } else {
        my $sub="start_$token->[1]";         my $result = &callsub("start_$token->[1]", $target, $token, \@parstack);
        #print "use default definition of tag $sub\n";         $finaloutput .= &Apache::run::evaluate($result,$safeeval,
        my $result = &callsub($sub, $target, $token, \@parstack);        $parstack[$#parstack]);
        $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        # Put here check for correct final tag (to avoid existence of 
Line 185  sub callsub { Line 185  sub callsub {
   return $currentstring;    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.7  
changed lines
  Added in v.1.8

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