--- loncom/xml/lonxml.pm 2003/09/27 04:15:26 1.266.2.2 +++ loncom/xml/lonxml.pm 2003/08/04 14:30:34 1.267 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # XML Parser Module # -# $Id: lonxml.pm,v 1.266.2.2 2003/09/27 04:15:26 albertel Exp $ +# $Id: lonxml.pm,v 1.267 2003/08/04 14:30:34 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -158,9 +158,6 @@ $Apache::lonxml::usestyle=1; $Apache::lonxml::style_values=''; $Apache::lonxml::style_end_values=''; -#array of ssi calls that need to occur after we are done parsing -@Apache::lonxml::ssi_info=(); - sub xmlbegin { my $output=''; if ($ENV{'browser.mathml'}) { @@ -454,7 +451,6 @@ sub xmlparse { if ($ENV{'request.uri'}) { &writeallows($ENV{'request.uri'}); } - &do_registered_ssi(); if ($Apache::lonxml::counter_changed) { &store_counter() } return $finaloutput; } @@ -496,6 +492,7 @@ sub latex_special_symbols { $current_token=~s/(>|<)/\$$1\$/g; #more or less if ($current_token=~m/\d%/) {$current_token =~ s/(\d)%/$1\\%/g;} #percent after digit if ($current_token=~m/\s%/) {$current_token =~ s/(\s)%/$1\\%/g;} #persent after space + if ($current_token eq '%.') {$current_token = '\%.';} #persent at the end of statement } return $current_token; } @@ -703,7 +700,6 @@ sub setup_globals { &init_counter(); @Apache::lonxml::pwd=(); @Apache::lonxml::extlinks=(); - @Apache::lonxml::ssi_info=(); if ($target eq 'meta') { $Apache::lonxml::redirection = 0; $Apache::lonxml::metamode = 1; @@ -1054,7 +1050,7 @@ sub parstring { my $val=$token->[2]->{$_}; $val =~ s/([\%\@\\\"\'])/\\$1/g; #if ($val =~ m/^[\%\@]/) { $val="\\".$val; } - $temp .= "my \$$_=\"$val\";" + $temp .= "my \$$_=\"$val\";"; } } return $temp; @@ -1077,19 +1073,6 @@ sub writeallows { &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 # @@ -1461,7 +1444,7 @@ sub whichuser { my ($symb,$courseid,$domain,$name,$publicuser); if (defined($ENV{'form.grade_symb'})) { my $tmp_courseid=$ENV{'form.grade_courseid'}; - my $allowed=&Apache::lonnet::allowed('vgr',$tmp_courseid); + my $allowed=&Apache::lonnet::allowed('mgr',$tmp_courseid); if ($allowed) { $symb=$ENV{'form.grade_symb'}; $courseid=$ENV{'form.grade_courseid'};