--- loncom/xml/lonxml.pm 2001/05/28 18:27:46 1.80 +++ loncom/xml/lonxml.pm 2001/06/08 20:01:45 1.88 @@ -9,6 +9,7 @@ # 5/10 Scott Harrison # 5/26 Gerd Kortemeyer # 5/27 H. K. Ng +# 6/2,6/3,6/8 Gerd Kortemeyer package Apache::lonxml; use vars @@ -17,8 +18,7 @@ use strict; use HTML::TokeParser; use Safe; use Safe::Hole; -use Math::Trig; -use Math::Cephes qw(j0 j1 jn jv y0 y1 yn yv); +use Math::Cephes qw(:trigs :hypers :bessels erf erfc); use Opcode; sub register { @@ -99,26 +99,100 @@ sub fontsettings() { } sub registerurl { - return (< // BEGIN LON-CAPA Internal + function LONCAPAreg() { - if (window.location.pathname!="/res/adm/pages/menu.html") { menu=window.open("","LONCAPAmenu"); + menu.clearTimeout(menu.menucltim); menu.currentURL=window.location.pathname; menu.currentStale=0; - } + menu.clearbut(3,1); + menu.switchbutton + (8,1,'eval.gif','evaluate','this','gopost("/adm/evaluate",currentURL)'); + menu.switchbutton + (8,2,'fdbk.gif','feedback','on this','gopost("/adm/feedback",currentURL)'); + menu.switchbutton + (8,3,'prt.gif','prepare','printout','gopost("/adm/printout",currentURL)'); + menu.switchbutton + (2,1,'back.gif','backward','','gopost("/adm/flip","back:"+currentURL)'); + menu.switchbutton + (2,3,'forw.gif','forward','','gopost("/adm/flip","forward:"+currentURL)'); + $hwkadd } - + function LONCAPAstale() { - if (window.location.pathname!="/res/adm/pages/menu.html") { menu=window.open("","LONCAPAmenu"); menu.currentStale=1; - } + menu.switchbutton + (3,1,'reload.gif','return','location','go(currentURL)'); + menu.menucltim=menu.setTimeout( + 'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);', + 2000); + + } + +// END LON-CAPA Internal + +ENDREGTHIS + + } else { + return (< +// BEGIN LON-CAPA Internal + + function LONCAPAreg() { + menu=window.open("","LONCAPAmenu"); + menu.currentStale=1; + menu.clearbut(2,1); + menu.clearbut(2,3); + menu.clearbut(8,1); + menu.clearbut(8,2); + menu.clearbut(8,3); + if (menu.currentURL) { + menu.switchbutton + (3,1,'reload.gif','return','location','go(currentURL)'); + } else { + menu.clearbut(3,1); + } } + + function LONCAPAstale() { + } + // END LON-CAPA Internal -ENDSCRIPT +ENDDONOTREGTHIS + + } } sub loadevents() { @@ -173,62 +247,7 @@ sub xmlparse { my $safeeval = new Safe; my $safehole = new Safe::Hole; - $safeeval->permit("entereval"); - $safeeval->permit(":base_math"); - $safeeval->permit("sort"); - $safeeval->deny(":base_io"); -# $safe->share_from('Math::Trig',['acsc','asin','acos','atan']); - $safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT'); - $safehole->wrap(\&Math::Trig::acsc,$safeeval,'&acsc'); - $safehole->wrap(\&Math::Trig::acosec,$safeeval,'&acosec'); - $safehole->wrap(\&Math::Trig::asec,$safeeval,'&asec'); - $safehole->wrap(\&Math::Trig::acot,$safeeval,'&acot'); - $safehole->wrap(\&Math::Trig::acotan,$safeeval,'&acotan'); - $safehole->wrap(\&Math::Trig::acsch,$safeeval,'&acsch'); - $safehole->wrap(\&Math::Trig::acosech,$safeeval,'&acosech'); - $safehole->wrap(\&Math::Trig::asech,$safeeval,'&asech'); - $safehole->wrap(\&Math::Trig::acoth,$safeeval,'&acoth'); - $safehole->wrap(\&Math::Trig::acotanh,$safeeval,'&acotanh'); - $safehole->wrap(\&Math::Trig::asin,$safeeval,'&asin'); - $safehole->wrap(\&Math::Trig::acos,$safeeval,'&acos'); - $safehole->wrap(\&Math::Trig::atan,$safeeval,'&atan'); - $safehole->wrap(\&Math::Trig::asinh,$safeeval,'&asinh'); - $safehole->wrap(\&Math::Trig::acosh,$safeeval,'&acosh'); - $safehole->wrap(\&Math::Trig::atanh,$safeeval,'&atanh'); - $safehole->wrap(\&Math::Trig::atan2,$safeeval,'&atan2'); - $safehole->wrap(\&Math::Trig::csc,$safeeval,'&csc'); - $safehole->wrap(\&Math::Trig::cosec,$safeeval,'&cosec'); - $safehole->wrap(\&Math::Trig::sec,$safeeval,'&sec'); - $safehole->wrap(\&Math::Trig::cot,$safeeval,'&cot'); - $safehole->wrap(\&Math::Trig::cotan,$safeeval,'&cotan'); - $safehole->wrap(\&Math::Trig::csch,$safeeval,'&csch'); - $safehole->wrap(\&Math::Trig::cosech,$safeeval,'&cosech'); - $safehole->wrap(\&Math::Trig::sech,$safeeval,'&sech'); - $safehole->wrap(\&Math::Trig::coth,$safeeval,'&coth'); - $safehole->wrap(\&Math::Trig::cotanh,$safeeval,'&cptanh'); - $safehole->wrap(\&Math::Trig::deg2rad,$safeeval,'°2rad'); - $safehole->wrap(\&Math::Trig::deg2grad,$safeeval,'°2grad'); - $safehole->wrap(\&Math::Trig::grad2deg,$safeeval,'&grad2deg'); - $safehole->wrap(\&Math::Trig::grad2rad,$safeeval,'&grad2rad'); - $safehole->wrap(\&Math::Trig::rad2deg,$safeeval,'&rad2deg'); - $safehole->wrap(\&Math::Trig::rad2grad,$safeeval,'&rad2grad'); - $safehole->wrap(\&Math::Trig::pi,$safeeval,'&pi'); - $safehole->wrap(\&Math::Cephes::erf,$safeeval,'&erf'); - $safehole->wrap(\&Math::Cephes::erfc,$safeeval,'&erfc'); - $safehole->wrap(\&Math::Cephes::j0,$safeeval,'&j0'); - $safehole->wrap(\&Math::Cephes::j1,$safeeval,'&j1'); - $safehole->wrap(\&Math::Cephes::jn,$safeeval,'&jn'); - $safehole->wrap(\&Math::Cephes::jv,$safeeval,'&jv'); - $safehole->wrap(\&Math::Cephes::y0,$safeeval,'&y0'); - $safehole->wrap(\&Math::Cephes::y1,$safeeval,'&y1'); - $safehole->wrap(\&Math::Cephes::yn,$safeeval,'&yn'); - $safehole->wrap(\&Math::Cephes::yv,$safeeval,'&yv'); - -#need to inspect this class of ops -# $safeeval->deny(":base_orig"); - $safeinit .= ';$external::target='.$target.';'; - $safeinit .= ';$external::randomseed='.&Apache::lonnet::rndseed().';'; - &Apache::run::run($safeinit,$safeeval); + &init_safespace($target,$safeeval,$safehole,$safeinit); #-------------------- Redefinition of the target in the case of compound target ($target, my @tenta) = split('&&',$target); @@ -259,8 +278,8 @@ sub xmlparse { $safeeval,\%style_for_target,@parstack); } } else { - $result = &callsub("start_$token->[1]", $target, $token,\@parstack, - \@pars, $safeeval, \%style_for_target); + $result = &callsub("start_$token->[1]", $target, $token, \@stack, + \@parstack, \@pars, $safeeval, \%style_for_target); } } elsif ($token->[0] eq 'E') { #clear out any tags that didn't end @@ -281,8 +300,8 @@ sub xmlparse { } } else { - $result = &callsub("end_$token->[1]", $target, $token, \@parstack, - \@pars,$safeeval, \%style_for_target); + $result = &callsub("end_$token->[1]", $target, $token, \@stack, + \@parstack, \@pars,$safeeval, \%style_for_target); } } else { &Apache::lonxml::error("Unknown token event :$token->[0]:$token->[1]:"); @@ -343,9 +362,9 @@ sub recurse { push (@innerstack,$tokenpat->[1]); push (@innerparstack,&parstring($tokenpat)); &increasedepth($tokenpat); - $partstring = &callsub("start_$tokenpat->[1]", - $target, $tokenpat, \@innerparstack, - \@pat, $safeeval, $style_for_target); + $partstring = &callsub("start_$tokenpat->[1]", $target, $tokenpat, + \@innerstack, \@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] @@ -353,9 +372,9 @@ sub recurse { &Apache::lonxml::warning("Unbalanced tags in resource $innerstack['-1']"); pop @innerstack;pop @innerparstack;&decreasedepth($tokenpat); } - $partstring = &callsub("end_$tokenpat->[1]", - $target, $tokenpat, \@innerparstack, - \@pat, $safeeval, $style_for_target); + $partstring = &callsub("end_$tokenpat->[1]", $target, $tokenpat, + \@innerstack, \@innerparstack, \@pat, + $safeeval, $style_for_target); } else { &Apache::lonxml::error("Unknown token event :$tokenpat->[0]:$tokenpat->[1]:"); } @@ -388,14 +407,15 @@ sub recurse { } sub callsub { - my ($sub,$target,$token,$parstack,$parser,$safeeval,$style)=@_; + my ($sub,$target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $currentstring=''; my $nodefault; { my $sub1; no strict 'refs'; if ($target eq 'edit' && $token->[0] eq 'S') { - $currentstring = &Apache::edit::tag_start($target,$token,$parstack,$parser, + $currentstring = &Apache::edit::tag_start($target,$token,$tagstack, + $parstack,$parser, $safeeval,$style); } my $tag=$token->[1]; @@ -409,8 +429,9 @@ sub callsub { #&Apache::lonxml::debug("Calling sub $sub in $space $metamode
\n"); $sub1="$space\:\:$sub"; $Apache::lonxml::curdepth=join('_',@Apache::lonxml::depthcounter); - ($currentstring,$nodefault) = &$sub1($target,$token,$parstack,$parser, - $safeeval,$style); + ($currentstring,$nodefault) = &$sub1($target,$token,$tagstack, + $parstack,$parser,$safeeval, + $style); } else { #&Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode
\n"); if ($metamode <1) { @@ -421,7 +442,7 @@ sub callsub { } } } - &Apache::lonxml::debug("nodefalt:$nodefault:"); +# &Apache::lonxml::debug("nodefalt:$nodefault:"); if ($currentstring eq '' && $nodefault eq '') { if ($target eq 'edit') { &Apache::lonxml::debug("doing default edit for $token->[1]"); @@ -444,6 +465,41 @@ sub callsub { return $currentstring; } +sub init_safespace { + my ($target,$safeeval,$safehole,$safeinit) = @_; + $safeeval->permit("entereval"); + $safeeval->permit(":base_math"); + $safeeval->permit("sort"); + $safeeval->deny(":base_io"); + $safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT'); + + $safehole->wrap(\&Math::Cephes::asin,$safeeval,'&asin'); + $safehole->wrap(\&Math::Cephes::acos,$safeeval,'&acos'); + $safehole->wrap(\&Math::Cephes::atan,$safeeval,'&atan'); + $safehole->wrap(\&Math::Cephes::sinh,$safeeval,'&sinh'); + $safehole->wrap(\&Math::Cephes::cosh,$safeeval,'&cosh'); + $safehole->wrap(\&Math::Cephes::tanh,$safeeval,'&tanh'); + $safehole->wrap(\&Math::Cephes::asinh,$safeeval,'&asinh'); + $safehole->wrap(\&Math::Cephes::acosh,$safeeval,'&acosh'); + $safehole->wrap(\&Math::Cephes::atanh,$safeeval,'&atanh'); + $safehole->wrap(\&Math::Cephes::erf,$safeeval,'&erf'); + $safehole->wrap(\&Math::Cephes::erfc,$safeeval,'&erfc'); + $safehole->wrap(\&Math::Cephes::j0,$safeeval,'&j0'); + $safehole->wrap(\&Math::Cephes::j1,$safeeval,'&j1'); + $safehole->wrap(\&Math::Cephes::jn,$safeeval,'&jn'); + $safehole->wrap(\&Math::Cephes::jv,$safeeval,'&jv'); + $safehole->wrap(\&Math::Cephes::y0,$safeeval,'&y0'); + $safehole->wrap(\&Math::Cephes::y1,$safeeval,'&y1'); + $safehole->wrap(\&Math::Cephes::yn,$safeeval,'&yn'); + $safehole->wrap(\&Math::Cephes::yv,$safeeval,'&yv'); + +#need to inspect this class of ops +# $safeeval->deny(":base_orig"); + $safeinit .= ';$external::target='.$target.';'; + $safeinit .= ';$external::randomseed='.&Apache::lonnet::rndseed().';'; + &Apache::run::run($safeinit,$safeeval); +} + sub startredirection { $Apache::lonxml::redirection++; push (@Apache::lonxml::outputstack, ''); @@ -757,6 +813,14 @@ sub warning { } } +sub get_param { + my ($param,$parstack,$safeeval,$context) = @_; + if ( ! $context ) { $context = -1; } + my $args =''; + if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; } + return &Apache::run::run("{$args;".'return $'.$param.'}',$safeeval); #' +} + sub register_insert { my @data = split /\n/, &Apache::lonnet::getfile('/home/httpd/lonTabs/insertlist.tab'); my $i;