version 1.13, 2000/07/25 21:28:22
|
version 1.14, 2000/08/02 16:47:53
|
Line 78 sub xmlparse {
|
Line 78 sub xmlparse {
|
push (@innerparstack,&parstring($tokenpat)); |
push (@innerparstack,&parstring($tokenpat)); |
$partstring = &callsub("start_$tokenpat->[1]", |
$partstring = &callsub("start_$tokenpat->[1]", |
$target, $tokenpat, \@innerparstack, |
$target, $tokenpat, \@innerparstack, |
$pat, $safeeval); |
$pat, $safeeval, \%style_for_target); |
} elsif ($tokenpat->[0] eq 'E') { |
} elsif ($tokenpat->[0] eq 'E') { |
#clear out any tags that didn't end |
#clear out any tags that didn't end |
while ($tokenpat->[1] ne $innerstack[$#innerstack] |
while ($tokenpat->[1] ne $innerstack[$#innerstack] |
&& ($#innerstack > 0)) {pop @innerstack;pop @innerparstack;} |
&& ($#innerstack > 0)) {pop @innerstack;pop @innerparstack;} |
$partstring = &callsub("end_$tokenpat->[1]", |
$partstring = &callsub("end_$tokenpat->[1]", |
$target, $tokenpat, \@innerparstack, |
$target, $tokenpat, \@innerparstack, |
$pat, $safeeval); |
$pat, $safeeval, \%style_for_target); |
} |
} |
#pass both the variable to the style tag, and the tag we |
#pass both the variable to the style tag, and the tag we |
#are processing inside the <definedtag> |
#are processing inside the <definedtag> |
Line 97 sub xmlparse {
|
Line 97 sub xmlparse {
|
} |
} |
} else { |
} else { |
my $result = &callsub("start_$token->[1]", $target, $token,\@parstack, |
my $result = &callsub("start_$token->[1]", $target, $token,\@parstack, |
$pars, $safeeval); |
$pars, $safeeval, \%style_for_target); |
if ($result ne "" ) { |
if ($result ne "" ) { |
$finaloutput .= &Apache::run::evaluate($result,$safeeval, |
$finaloutput .= &Apache::run::evaluate($result,$safeeval, |
$parstack[$#parstack]); |
$parstack[$#parstack]); |
Line 124 sub xmlparse {
|
Line 124 sub xmlparse {
|
push (@innerparstack,&parstring($tokenpat)); |
push (@innerparstack,&parstring($tokenpat)); |
$partstring = &callsub("start_$tokenpat->[1]", |
$partstring = &callsub("start_$tokenpat->[1]", |
$target, $tokenpat, \@innerparstack, |
$target, $tokenpat, \@innerparstack, |
$pat, $safeeval); |
$pat, $safeeval, \%style_for_target); |
} elsif ($tokenpat->[0] eq 'E') { |
} elsif ($tokenpat->[0] eq 'E') { |
#clear out any tags that didn't end |
#clear out any tags that didn't end |
while ($tokenpat->[1] ne $innerstack[$#innerstack] |
while ($tokenpat->[1] ne $innerstack[$#innerstack] |
&& ($#innerstack > 0)) {pop @innerstack;pop @innerparstack;} |
&& ($#innerstack > 0)) {pop @innerstack;pop @innerparstack;} |
$partstring = &callsub("end_$tokenpat->[1]", |
$partstring = &callsub("end_$tokenpat->[1]", |
$target, $tokenpat, \@innerparstack, |
$target, $tokenpat, \@innerparstack, |
$pat, $safeeval); |
$pat, $safeeval, \%style_for_target); |
} |
} |
#pass both the variable to the style tag, and the tag we |
#pass both the variable to the style tag, and the tag we |
#are processing inside the <definedtag> |
#are processing inside the <definedtag> |
Line 143 sub xmlparse {
|
Line 143 sub xmlparse {
|
} |
} |
} else { |
} else { |
my $result = &callsub("end_$token->[1]", $target, $token, \@parstack, |
my $result = &callsub("end_$token->[1]", $target, $token, \@parstack, |
$pars,$safeeval); |
$pars,$safeeval, \%style_for_target); |
if ($result ne "") { |
if ($result ne "") { |
$finaloutput .= &Apache::run::evaluate($result,$safeeval, |
$finaloutput .= &Apache::run::evaluate($result,$safeeval, |
$parstack[$#parstack]); |
$parstack[$#parstack]); |
Line 157 sub xmlparse {
|
Line 157 sub xmlparse {
|
} |
} |
|
|
sub callsub { |
sub callsub { |
my ($sub,$target,$token,$parstack,$parser,$safeeval)=@_; |
my ($sub,$target,$token,$parstack,$parser,$safeeval,$style)=@_; |
my $currentstring=''; |
my $currentstring=''; |
{ |
{ |
no strict 'refs'; |
no strict 'refs'; |
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); |
$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])) { |