--- loncom/xml/lonxml.pm	2001/06/03 18:33:54	1.86
+++ loncom/xml/lonxml.pm	2001/06/12 21:10:22	1.91
@@ -9,7 +9,7 @@
 # 5/10 Scott Harrison
 # 5/26 Gerd Kortemeyer
 # 5/27 H. K. Ng
-# 6/2,6/3 Gerd Kortemeyer
+# 6/2,6/3,6/8,6/9 Gerd Kortemeyer
 
 package Apache::lonxml; 
 use vars 
@@ -19,6 +19,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 {
@@ -100,8 +101,32 @@ sub fontsettings() {
 
 sub registerurl {
     if ($ENV{'REQUEST_URI'}!~/^\/(res\/)*adm\//) {
+        my $hwkadd='';
+        if ($ENV{'REQUEST_URI'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
+	    if (&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {
+		$hwkadd.=(<<ENDSUBM);
+                     menu.switchbutton
+           (7,1,'subm.gif','view sub','missions',
+                'gocmd("/adm/grades","submission")');
+ENDSUBM
+            }
+	    if (&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) {
+		$hwkadd.=(<<ENDGRDS);
+                     menu.switchbutton
+           (7,2,'pgrd.gif','problem','grades',
+                'gocmd("/adm/grades","viewgrades")');
+ENDGRDS
+            }
+	    if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
+		$hwkadd.=(<<ENDPARM);
+                     menu.switchbutton
+           (7,3,'pparm.gif','problem','parms',
+                'gocmd("/adm/parmset","set")');
+ENDPARM
+            }
+	}
 	return (<<ENDREGTHIS);
-
+     
 <script language="JavaScript">
 // BEGIN LON-CAPA Internal
 
@@ -121,6 +146,7 @@ sub registerurl {
        (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() {
@@ -128,11 +154,14 @@ sub registerurl {
           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);',
 			  2000);
 
-    }
+      }
 
 // END LON-CAPA Internal
 </script>
@@ -186,7 +215,7 @@ sub printalltags {
 }
 
 sub xmlparse {
-
+#    $Apache::lonxml::debug=1;
  my ($target,$content_file_string,$safeinit,%style_for_target) = @_;
  if ($target eq 'meta') {
    $Apache::lonxml::redirection = 0;
@@ -467,10 +496,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);
 }