--- loncom/xml/lonxml.pm 2001/05/30 17:42:15 1.82 +++ loncom/xml/lonxml.pm 2001/06/16 18:34:31 1.96 @@ -9,6 +9,9 @@ # 5/10 Scott Harrison # 5/26 Gerd Kortemeyer # 5/27 H. K. Ng +# 6/2,6/3,6/8,6/9 Gerd Kortemeyer +# 6/12,6/13 H. K. Ng +# 6/16 Gerd Kortemeyer package Apache::lonxml; use vars @@ -18,6 +21,7 @@ use HTML::TokeParser; use Safe; use Safe::Hole; use Math::Cephes qw(:trigs :hypers :bessels erf erfc); +use Math::Random qw(:all); use Opcode; sub register { @@ -98,26 +102,110 @@ 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)'); + menu.switchbutton + (9,1,'sbkm.gif','set','bookmark','set_bookmark()'); + menu.switchbutton + (9,2,'vbkm.gif','view','bookmark','edit_bookmarks()'); + menu.switchbutton + (9,3,'anot.gif','anno-','tations','annotate()'); + $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.clearbut(7,1); + menu.clearbut(7,2); + menu.clearbut(7,3); + menu.menucltim=menu.setTimeout( + 'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+ + 'clearbut(9,1);clearbut(9,2);clearbut(9,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() { @@ -136,29 +224,9 @@ sub printalltags { } sub xmlparse { - my ($target,$content_file_string,$safeinit,%style_for_target) = @_; - if ($target eq 'meta') { - $Apache::lonxml::redirection = 0; - $Apache::lonxml::metamode = 1; - $Apache::lonxml::evaluate = 1; - $Apache::lonxml::import = 0; - } elsif ($target eq 'grade') { - &startredirection; - $Apache::lonxml::metamode = 0; - $Apache::lonxml::evaluate = 1; - $Apache::lonxml::import = 1; - } elsif ($target eq 'modified') { - $Apache::lonxml::redirection = 0; - $Apache::lonxml::metamode = 0; - $Apache::lonxml::evaluate = 0; - $Apache::lonxml::import = 0; - } else { - $Apache::lonxml::redirection = 0; - $Apache::lonxml::metamode = 0; - $Apache::lonxml::evaluate = 1; - $Apache::lonxml::import = 1; - } + + &setup_globals($target); #&printalltags(); my @pars = (); @Apache::lonxml::pwd=(); @@ -203,8 +271,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 @@ -225,8 +293,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]:"); @@ -287,9 +355,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] @@ -297,9 +365,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]:"); } @@ -332,16 +400,12 @@ 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, - $safeeval,$style); - } my $tag=$token->[1]; my $space=$Apache::lonxml::alltags{$tag}; if (!$space) { @@ -353,8 +417,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) { @@ -365,7 +430,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]"); @@ -388,6 +453,36 @@ sub callsub { return $currentstring; } +sub setup_globals { + my ($target)=@_; + if ($target eq 'meta') { + $Apache::lonxml::redirection = 0; + $Apache::lonxml::metamode = 1; + $Apache::lonxml::evaluate = 1; + $Apache::lonxml::import = 0; + } elsif ($target eq 'grade') { + &startredirection; + $Apache::lonxml::metamode = 0; + $Apache::lonxml::evaluate = 1; + $Apache::lonxml::import = 1; + } elsif ($target eq 'modified') { + $Apache::lonxml::redirection = 0; + $Apache::lonxml::metamode = 0; + $Apache::lonxml::evaluate = 0; + $Apache::lonxml::import = 0; + } elsif ($target eq 'edit') { + $Apache::lonxml::redirection = 0; + $Apache::lonxml::metamode = 0; + $Apache::lonxml::evaluate = 0; + $Apache::lonxml::import = 0; + } else { + $Apache::lonxml::redirection = 0; + $Apache::lonxml::metamode = 0; + $Apache::lonxml::evaluate = 1; + $Apache::lonxml::import = 1; + } +} + sub init_safespace { my ($target,$safeeval,$safehole,$safeinit) = @_; $safeeval->permit("entereval"); @@ -415,10 +510,31 @@ sub init_safespace { $safehole->wrap(\&Math::Cephes::y1,$safeeval,'&y1'); $safehole->wrap(\&Math::Cephes::yn,$safeeval,'&yn'); $safehole->wrap(\&Math::Cephes::yv,$safeeval,'&yv'); - + $safehole->wrap(\&Math::Random::random_beta,$safeeval,'&math_random_beta'); + $safehole->wrap(\&Math::Random::random_chi_square,$safeeval,'&math_random_chi_square'); + $safehole->wrap(\&Math::Random::random_exponential,$safeeval,'&math_random_exponential'); + $safehole->wrap(\&Math::Random::random_f,$safeeval,'&math_random_f'); + $safehole->wrap(\&Math::Random::random_gamma,$safeeval,'&math_random_gamma'); + $safehole->wrap(\&Math::Random::random_multivariate_normal,$safeeval,'&math_random_multivariate_normal'); + $safehole->wrap(\&Math::Random::random_multinomial,$safeeval,'&math_random_multinomial'); + $safehole->wrap(\&Math::Random::random_noncentral_chi_square,$safeeval,'&math_random_noncentral_chi_square'); + $safehole->wrap(\&Math::Random::random_noncentral_f,$safeeval,'&math_random_noncentral_f'); + $safehole->wrap(\&Math::Random::random_normal,$safeeval,'&math_random_normal'); + $safehole->wrap(\&Math::Random::random_permutation,$safeeval,'&math_random_permutation'); + $safehole->wrap(\&Math::Random::random_permuted_index,$safeeval,'&math_random_permuted_index'); + $safehole->wrap(\&Math::Random::random_uniform,$safeeval,'&math_random_uniform'); + $safehole->wrap(\&Math::Random::random_poisson,$safeeval,'&math_random_poisson'); + $safehole->wrap(\&Math::Random::random_uniform_integer,$safeeval,'&math_random_uniform_integer'); + $safehole->wrap(\&Math::Random::random_negative_binomial,$safeeval,'&math_random_negative_binomial'); + $safehole->wrap(\&Math::Random::random_binomial,$safeeval,'&math_random_binomial'); + $safehole->wrap(\&Math::Random::random_seed_from_phrase,$safeeval,'&random_seed_from_phrase'); + $safehole->wrap(\&Math::Random::random_set_seed_from_phrase,$safeeval,'&random_set_seed_from_phrase'); + $safehole->wrap(\&Math::Random::random_get_seed,$safeeval,'&random_get_seed'); + $safehole->wrap(\&Math::Random::random_set_seed,$safeeval,'&random_set_seed'); + #need to inspect this class of ops # $safeeval->deny(":base_orig"); - $safeinit .= ';$external::target='.$target.';'; + $safeinit .= ';$external::target="'.$target.'";'; $safeinit .= ';$external::randomseed='.&Apache::lonnet::rndseed().';'; &Apache::run::run($safeinit,$safeeval); } @@ -704,7 +820,7 @@ ENDNOTFOUND sub debug { if ($Apache::lonxml::debug eq 1) { - print "DEBUG:".$_[0]."
\n"; + print("DEBUG:".$_[0]."
\n"); } } @@ -736,6 +852,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; @@ -745,11 +869,13 @@ sub register_insert { my $line = $data[$i]; if ( $line =~ /^\#/ || $line =~ /^\s*\n/) { next; } if ( $line =~ /TABLE/ ) { last; } - my ($tag,$descrip,$function,$show) = split(/,/, $line); + my ($tag,$descrip,$color,$function,$show) = split(/,/, $line); $insertlist{"$tagnum.tag"} = $tag; $insertlist{"$tagnum.description"} = $descrip; + $insertlist{"$tagnum.color"} = $color; $insertlist{"$tagnum.function"} = $function; $insertlist{"$tagnum.show"}= $show; + $insertlist{"$tag.num"}=$tagnum; $tagnum++; } $i++; #skipping TABLE line