--- loncom/xml/lonxml.pm 2001/06/02 19:55:46 1.85 +++ loncom/xml/lonxml.pm 2001/07/03 20:58:27 1.99 @@ -9,7 +9,9 @@ # 5/10 Scott Harrison # 5/26 Gerd Kortemeyer # 5/27 H. K. Ng -# 6/2 Gerd Kortemeyer +# 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 @@ -19,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 { @@ -67,9 +70,12 @@ $evaluate = 1; # data structure for eidt mode, determines what tags can go into what other tags %insertlist=(); -#stores the list of active tag namespaces +# stores the list of active tag namespaces @namespace=(); +# has the dynamic menu been updated to know about this resource +$Apache::lonxml::registered=0; + sub xmlbegin { my $output=''; if ($ENV{'browser.mathml'}) { @@ -99,12 +105,40 @@ 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); @@ -118,11 +152,41 @@ sub registerurl { (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); @@ -130,13 +194,22 @@ sub registerurl { menu.clearbut(8,1); menu.clearbut(8,2); menu.clearbut(8,3); - menu.switchbutton - (3,1,'reload.gif','return','location','go(currentURL)'); - } + 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() { @@ -155,29 +228,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=(); @@ -229,7 +282,7 @@ sub xmlparse { #clear out any tags that didn't end while ($token->[1] ne $stack[$#stack] && ($#stack > -1)) { &Apache::lonxml::warning("Unbalanced tags in resource $stack['-1']"); - pop @stack;pop @parstack;&decreasedepth($token); + &end_tag(\@stack,\@parstack,$token); } if (exists $style_for_target{'/'."$token->[1]"}) { @@ -266,7 +319,7 @@ sub xmlparse { $result = ''; } if ($token->[0] eq 'E') { - pop @stack;pop @parstack;&decreasedepth($token); + &end_tag(\@stack,\@parstack,$token); } } pop @pars; @@ -314,7 +367,7 @@ sub recurse { while ($tokenpat->[1] ne $innerstack[$#innerstack] && ($#innerstack > -1)) { &Apache::lonxml::warning("Unbalanced tags in resource $innerstack['-1']"); - pop @innerstack;pop @innerparstack;&decreasedepth($tokenpat); + &end_tag(\@innerstack,\@innerparstack,$tokenpat); } $partstring = &callsub("end_$tokenpat->[1]", $target, $tokenpat, \@innerstack, \@innerparstack, \@pat, @@ -357,11 +410,6 @@ sub callsub { { my $sub1; no strict 'refs'; - if ($target eq 'edit' && $token->[0] eq 'S') { - $currentstring = &Apache::edit::tag_start($target,$token,$tagstack, - $parstack,$parser, - $safeeval,$style); - } my $tag=$token->[1]; my $space=$Apache::lonxml::alltags{$tag}; if (!$space) { @@ -369,38 +417,47 @@ sub callsub { $sub=~tr/A-Z/a-z/; $space=$Apache::lonxml::alltags{$tag} } - if ($space) { - #&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,$tagstack, - $parstack,$parser,$safeeval, - $style); - } else { - #&Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode
\n"); - if ($metamode <1) { - if (defined($token->[4]) && ($metamode < 1)) { - $currentstring = $token->[4]; - } else { - $currentstring = $token->[2]; + + my $deleted=0; + $Apache::lonxml::curdepth=join('_',@Apache::lonxml::depthcounter); + if (($token->[0] eq 'S') && ($target eq 'modified')) { + $deleted=&Apache::edit::handle_delete($space,$target,$token,$tagstack, + $parstack,$parser,$safeeval, + $style); + } + if (!$deleted) { + if ($space) { + #&Apache::lonxml::debug("Calling sub $sub in $space $metamode
\n"); + $sub1="$space\:\:$sub"; + ($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) { + if (defined($token->[4]) && ($metamode < 1)) { + $currentstring = $token->[4]; + } else { + $currentstring = $token->[2]; + } } } - } -# &Apache::lonxml::debug("nodefalt:$nodefault:"); - if ($currentstring eq '' && $nodefault eq '') { - if ($target eq 'edit') { - &Apache::lonxml::debug("doing default edit for $token->[1]"); - if ($token->[0] eq 'S') { - $currentstring = &Apache::edit::tag_start($target,$token); - } elsif ($token->[0] eq 'E') { - $currentstring = &Apache::edit::tag_end($target,$token); - } - } elsif ($target eq 'modified') { - if ($token->[0] eq 'S') { - $currentstring = $token->[4]; - $currentstring.=&Apache::edit::handle_insert(); - } else { - $currentstring = $token->[2]; + # &Apache::lonxml::debug("nodefalt:$nodefault:"); + if ($currentstring eq '' && $nodefault eq '') { + if ($target eq 'edit') { + &Apache::lonxml::debug("doing default edit for $token->[1]"); + if ($token->[0] eq 'S') { + $currentstring = &Apache::edit::tag_start($target,$token); + } elsif ($token->[0] eq 'E') { + $currentstring = &Apache::edit::tag_end($target,$token); + } + } elsif ($target eq 'modified') { + if ($token->[0] eq 'S') { + $currentstring = $token->[4]; + $currentstring.=&Apache::edit::handle_insert(); + } else { + $currentstring = $token->[2]; + } } } } @@ -409,6 +466,37 @@ sub callsub { return $currentstring; } +sub setup_globals { + my ($target)=@_; + $Apache::lonxml::registered = 0; + 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"); @@ -436,10 +524,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); } @@ -458,6 +567,13 @@ sub endredirection { pop @Apache::lonxml::outputstack; } +sub end_tag { + my ($tagstack,$parstack,$token)=@_; + pop(@$tagstack); + pop(@$parstack); + &decreasedepth($token); +} + sub initdepth { @Apache::lonxml::depthcounter=(); $Apache::lonxml::depth=-1; @@ -725,7 +841,7 @@ ENDNOTFOUND sub debug { if ($Apache::lonxml::debug eq 1) { - print "DEBUG:".$_[0]."
\n"; + print("DEBUG:".$_[0]."
\n"); } } @@ -774,11 +890,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 @@ -797,6 +915,11 @@ sub register_insert { $tagnum++; } } + +sub description { + my ($token)=@_; + return $insertlist{$insertlist{"$token->[1].num"}.'.description'}; +} 1; __END__