version 1.14, 2000/08/02 16:47:53
|
version 1.15, 2000/08/03 18:24:24
|
Line 60 sub xmlparse {
|
Line 60 sub xmlparse {
|
push (@parstack,&parstring($token)); |
push (@parstack,&parstring($token)); |
|
|
if (exists $style_for_target{$token->[1]}) { |
if (exists $style_for_target{$token->[1]}) { |
#basically recurse, but we never got more than one level down so just |
$finaloutput .= &recurse($style_for_target{$token->[1]}, |
#create the new context here |
$target,$safeeval,\%style_for_target, |
my @innerstack = (); |
@parstack); |
my @innerparstack = (); |
|
# use style file definition |
|
$newarg = $style_for_target{$token->[1]}; |
|
my $pat = HTML::TokeParser->new(\$newarg); |
|
my $tokenpat = ''; |
|
my $partstring = ''; |
|
|
|
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 "" ) { |
|
$finaloutput .= &Apache::run::evaluate($partstring,$safeeval, |
|
$parstack[$#parstack].$innerparstack[$#innerparstack]); |
|
} |
|
if ($tokenpat->[0] eq 'E') { pop @innerstack;pop @innerparstack; } |
|
} |
|
} else { |
} else { |
my $result = &callsub("start_$token->[1]", $target, $token,\@parstack, |
my $result = &callsub("start_$token->[1]", $target, $token,\@parstack, |
$pars, $safeeval, \%style_for_target); |
$pars, $safeeval, \%style_for_target); |
Line 109 sub xmlparse {
|
Line 77 sub xmlparse {
|
&& ($#stack > 0)) {pop @stack;pop @parstack;} |
&& ($#stack > 0)) {pop @stack;pop @parstack;} |
|
|
if (exists $style_for_target{'/'."$token->[1]"}) { |
if (exists $style_for_target{'/'."$token->[1]"}) { |
my @innerstack = (); |
$finaloutput .= &recurse($style_for_target{'/'."$token->[1]"}, |
my @innerparstack = (); |
$target,$safeeval,\%style_for_target, |
$newarg = $style_for_target{'/'."$token->[1]"}; |
@parstack); |
my $pat = HTML::TokeParser->new(\$newarg); |
|
my $tokenpat; |
|
my $partstring = ''; |
|
|
|
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 "" ) { |
|
$finaloutput .= &Apache::run::evaluate($partstring,$safeeval, |
|
$parstack[$#parstack].$innerparstack[$#innerparstack]); |
|
} |
|
if ($tokenpat->[0] eq 'E') { pop @innerstack;pop @innerparstack; } |
|
} |
|
} else { |
} else { |
my $result = &callsub("end_$token->[1]", $target, $token, \@parstack, |
my $result = &callsub("end_$token->[1]", $target, $token, \@parstack, |
$pars,$safeeval, \%style_for_target); |
$pars,$safeeval, \%style_for_target); |
Line 156 sub xmlparse {
|
Line 95 sub xmlparse {
|
return $finaloutput; |
return $finaloutput; |
} |
} |
|
|
|
sub recurse { |
|
|
|
my @innerstack = (); |
|
my @innerparstack = (); |
|
my ($newarg,$target,$safeeval,$style_for_target,@parstack) = @_; |
|
my $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]); |
|
} |
|
if ($tokenpat->[0] eq 'E') { pop @innerstack;pop @innerparstack; } |
|
} |
|
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=''; |