--- loncom/xml/lonxml.pm 2000/08/03 18:24:24 1.15
+++ loncom/xml/lonxml.pm 2000/08/03 19:34:11 1.16
@@ -30,10 +30,12 @@ use Apache::scripttag;
sub xmlparse {
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 $finaloutput = '';
my $newarg = '';
+ my $result;
my $safeeval = new Safe;
$safeeval->permit("entereval");
$safeeval->permit(":base_math");
@@ -41,56 +43,55 @@ sub xmlparse {
($target, my @tenta) = split('&&',$target);
-#------------------------- Stack definition (in stack we have all current tags)
-
my @stack = ();
my @parstack = ();
-
-#------------------------------------- Parse input string (content_file_string)
-
my $token;
-
- while ($token = $pars->get_token) {
- if ($token->[0] eq 'T') {
- $finaloutput .= &Apache::run::evaluate($token->[1],$safeeval,'');
- } elsif ($token->[0] eq 'S') {
- # add tag to stack
- push (@stack,$token->[1]);
- # add parameters list to another stack
- push (@parstack,&parstring($token));
-
- if (exists $style_for_target{$token->[1]}) {
- $finaloutput .= &recurse($style_for_target{$token->[1]},
- $target,$safeeval,\%style_for_target,
- @parstack);
- } 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]);
+ print $#pars;
+ while ( $#pars > -1 ) {
+ while ($token = $pars[$#pars]->get_token) {
+ if ($token->[0] eq 'T') {
+ $result=$token->[1];
+# $finaloutput .= &Apache::run::evaluate($token->[1],$safeeval,'');
+ } elsif ($token->[0] eq 'S') {
+ # add tag to stack
+ push (@stack,$token->[1]);
+ # add parameters list to another stack
+ push (@parstack,&parstring($token));
+
+ if (exists $style_for_target{$token->[1]}) {
+ $finaloutput .= &recurse($style_for_target{$token->[1]},
+ $target,$safeeval,\%style_for_target,
+ @parstack);
+ } else {
+ my $result = &callsub("start_$token->[1]", $target, $token,\@parstack,
+ \@pars, $safeeval, \%style_for_target);
+ }
+ } 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') {
- #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]"}) {
- $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 "") {
+ }
+ if ($result ne "" ) {
+ if ( $#parstack > -1 ) {
$finaloutput .= &Apache::run::evaluate($result,$safeeval,
$parstack[$#parstack]);
+ } else {
+ $finaloutput .= &Apache::run::evaluate($result,$safeeval,'');
}
+ $result = '';
}
- pop @stack;
- pop @parstack;
+ if ($token->[0] eq 'E') { pop @stack;pop @parstack; }
}
+ pop @pars;
}
return $finaloutput;
}
@@ -100,34 +101,52 @@ sub recurse {
my @innerstack = ();
my @innerparstack = ();
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 $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]);
+ 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));
+ $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;}
+ $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; }
}
- if ($tokenpat->[0] eq 'E') { pop @innerstack;pop @innerparstack; }
+ pop @pat;
}
return $output;
}
@@ -140,7 +159,8 @@ sub callsub {
if (my $space=$Apache::lonxml::alltags{$token->[1]}) {
#print "Calling sub $sub in $space \n";
$sub="$space\:\:$sub";
- $currentstring = &$sub($target,$token,\@$parstack,$parser,$safeeval,$style);
+ $currentstring = &$sub($target,$token,$parstack,$parser,
+ $safeeval,$style);
} else {
#print "NOT Calling sub $sub\n";
if (defined($token->[4])) {