version 1.280, 2003/09/21 21:40:06
|
version 1.282, 2003/10/01 21:13:50
|
Line 160 $Apache::lonxml::usestyle=1;
|
Line 160 $Apache::lonxml::usestyle=1;
|
$Apache::lonxml::style_values=''; |
$Apache::lonxml::style_values=''; |
$Apache::lonxml::style_end_values=''; |
$Apache::lonxml::style_end_values=''; |
|
|
|
#array of ssi calls that need to occur after we are done parsing |
|
@Apache::lonxml::ssi_info=(); |
|
|
|
#should we do the postag variable interpolation |
|
$Apache::lonxml::post_evaluate=1; |
|
|
sub xmlbegin { |
sub xmlbegin { |
my $output=''; |
my $output=''; |
if ($ENV{'browser.mathml'}) { |
if ($ENV{'browser.mathml'}) { |
Line 353 sub xmlparse {
|
Line 359 sub xmlparse {
|
if ($ENV{'request.uri'}) { |
if ($ENV{'request.uri'}) { |
&writeallows($ENV{'request.uri'}); |
&writeallows($ENV{'request.uri'}); |
} |
} |
|
&do_registered_ssi(); |
if ($Apache::lonxml::counter_changed) { &store_counter() } |
if ($Apache::lonxml::counter_changed) { &store_counter() } |
return $finaloutput; |
return $finaloutput; |
} |
} |
Line 473 sub inner_xmlparse {
|
Line 480 sub inner_xmlparse {
|
&Apache::lonxml::error("Unknown token event :$token->[0]:$token->[1]:"); |
&Apache::lonxml::error("Unknown token event :$token->[0]:$token->[1]:"); |
} |
} |
#evaluate variable refs in result |
#evaluate variable refs in result |
if ($result ne "") { |
if ($Apache::lonxml::post_evaluate &&$result ne "") { |
my $extras; |
my $extras; |
if (!$Apache::lonxml::usestyle) { |
if (!$Apache::lonxml::usestyle) { |
$extras=$Apache::lonxml::style_values; |
$extras=$Apache::lonxml::style_values; |
Line 484 sub inner_xmlparse {
|
Line 491 sub inner_xmlparse {
|
$result= &Apache::run::evaluate($result,$safeeval,$extras); |
$result= &Apache::run::evaluate($result,$safeeval,$extras); |
} |
} |
} |
} |
|
$Apache::lonxml::post_evaluate=1; |
|
|
if (($token->[0] eq 'T') || ($token->[0] eq 'C') || ($token->[0] eq 'D') ) { |
if (($token->[0] eq 'T') || ($token->[0] eq 'C') || ($token->[0] eq 'D') ) { |
#Style file definitions should be correct |
#Style file definitions should be correct |
if ($target eq 'tex' && ($Apache::lonxml::usestyle)) { |
if ($target eq 'tex' && ($Apache::lonxml::usestyle)) { |
Line 603 sub setup_globals {
|
Line 612 sub setup_globals {
|
&init_counter(); |
&init_counter(); |
@Apache::lonxml::pwd=(); |
@Apache::lonxml::pwd=(); |
@Apache::lonxml::extlinks=(); |
@Apache::lonxml::extlinks=(); |
|
@Apache::lonxml::ssi_info=(); |
|
$Apache::lonxml::post_evaluate=1; |
if ($target eq 'meta') { |
if ($target eq 'meta') { |
$Apache::lonxml::redirection = 0; |
$Apache::lonxml::redirection = 0; |
$Apache::lonxml::metamode = 1; |
$Apache::lonxml::metamode = 1; |
Line 998 sub writeallows {
|
Line 1009 sub writeallows {
|
&Apache::lonnet::appenv(%httpref); |
&Apache::lonnet::appenv(%httpref); |
} |
} |
|
|
|
sub register_ssi { |
|
my ($url,%form)=@_; |
|
push (@Apache::lonxml::ssi_info,{'url'=>$url,'form'=>\%form}); |
|
return ''; |
|
} |
|
|
|
sub do_registered_ssi { |
|
foreach my $info (@Apache::lonxml::ssi_info) { |
|
my %form=%{ $info->{'form'}}; |
|
my $url=$info->{'url'}; |
|
&Apache::lonnet::ssi($url,%form); |
|
} |
|
} |
# |
# |
# Afterburner handles anchors, highlights and links |
# Afterburner handles anchors, highlights and links |
# |
# |