version 1.29, 2000/10/26 14:01:40
|
version 1.32, 2000/11/06 14:32:35
|
Line 29 use Apache::scripttag;
|
Line 29 use Apache::scripttag;
|
@Apache::lonxml::pwd=(); |
@Apache::lonxml::pwd=(); |
$Apache::lonxml::outputstack = ''; |
$Apache::lonxml::outputstack = ''; |
$Apache::lonxml::redirection = 1; |
$Apache::lonxml::redirection = 1; |
|
$Apache::lonxml::textredirection = 1; |
|
$Apache::lonxml::on_offimport = 0; |
|
|
sub xmlparse { |
sub xmlparse { |
|
|
my ($target,$content_file_string,$safeinit,%style_for_target) = @_; |
my ($target,$content_file_string,$safeinit,%style_for_target) = @_; |
|
if ($target eq 'meta') |
|
{$Apache::lonxml::textredirection = 0; |
|
$Apache::lonxml::on_offimport = 1; |
|
} |
my @pars = (); |
my @pars = (); |
@Apache::lonxml::pwd=(); |
@Apache::lonxml::pwd=(); |
my $pwd=$ENV{'request.filename'}; |
my $pwd=$ENV{'request.filename'}; |
Line 63 sub xmlparse {
|
Line 69 sub xmlparse {
|
while ( $#pars > -1 ) { |
while ( $#pars > -1 ) { |
while ($token = $pars[$#pars]->get_token) { |
while ($token = $pars[$#pars]->get_token) { |
if ($token->[0] eq 'T') { |
if ($token->[0] eq 'T') { |
$result=$token->[1]; |
if ($Apache::lonxml::textredirection == 1) {$result=$token->[1];} |
# $finaloutput .= &Apache::run::evaluate($token->[1],$safeeval,''); |
# $finaloutput .= &Apache::run::evaluate($token->[1],$safeeval,''); |
} elsif ($token->[0] eq 'S') { |
} elsif ($token->[0] eq 'S') { |
|
# if ($target eq 'meta' and $token->[2]->{metaout} eq 'ON') {$Apache::lonxml::textredirection = 1;} |
# 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 |
Line 88 sub xmlparse {
|
Line 95 sub xmlparse {
|
\@pars, $safeeval, \%style_for_target); |
\@pars, $safeeval, \%style_for_target); |
} |
} |
} elsif ($token->[0] eq 'E') { |
} elsif ($token->[0] eq 'E') { |
|
# if ($target eq 'meta') {$Apache::lonxml::textredirection = 0;} |
#clear out any tags that didn't end |
#clear out any tags that didn't end |
while ($token->[1] ne $stack[$#stack] |
while ($token->[1] ne $stack[$#stack] |
&& ($#stack > -1)) {pop @stack;pop @parstack;&decreasedepth($token);} |
&& ($#stack > -1)) {pop @stack;pop @parstack;&decreasedepth($token);} |
Line 150 sub recurse {
|
Line 158 sub recurse {
|
while ( $#pat > -1 ) { |
while ( $#pat > -1 ) { |
while ($tokenpat = $pat[$#pat]->get_token) { |
while ($tokenpat = $pat[$#pat]->get_token) { |
if ($tokenpat->[0] eq 'T') { |
if ($tokenpat->[0] eq 'T') { |
$partstring = $tokenpat->[1]; |
if ($Apache::lonxml::textredirection == 1) {$partstring = $tokenpat->[1];} |
} elsif ($tokenpat->[0] eq 'S') { |
} elsif ($tokenpat->[0] eq 'S') { |
push (@innerstack,$tokenpat->[1]); |
push (@innerstack,$tokenpat->[1]); |
push (@innerparstack,&parstring($tokenpat)); |
push (@innerparstack,&parstring($tokenpat)); |