--- loncom/homework/structuretags.pm	2002/11/10 15:39:37	1.134
+++ loncom/homework/structuretags.pm	2002/11/22 19:46:36	1.138
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.134 2002/11/10 15:39:37 albertel Exp $
+# $Id: structuretags.pm,v 1.138 2002/11/22 19:46:36 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -118,10 +118,12 @@ sub page_start {
   return ($result,$head_tag_start,$body_tag_start,$form_tag_start);
 }
 
+use Time::HiRes();
 sub get_resource_name {
   my ($parstack,$safeeval)=@_;
-  my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval);
-  if ($name eq '') { 
+  my $name=&Apache::lonnet::gettitle();
+  &Apache::lonnet::logthis("Got $name");
+  if ($name eq '') {
     $name=&Apache::lonnet::EXT('resource.title');
     if ($name eq 'con_lost') { $name = ''; }
   }
@@ -138,6 +140,7 @@ sub setup_rndseed {
       $rndseed=time;
       $ENV{'form.rndseed'}=$rndseed;
     }
+    &Apache::lonxml::debug("Setting rndseed to $rndseed");
     &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);
   }
   return $rndseed;
@@ -149,13 +152,13 @@ sub problem_edit_header {
        <input type="submit" name="problemmode" value="Discard Edits and View" />
        <input type="submit" name="problemmode" value="EditXML" />
        <input type="submit" name="Undo" value="undo" /> <hr />
-       <input type="submit" name="submit" value="Submit Changes" />
-       <input type="submit" name="submit" value="Submit Changes and View" /><br /><p>&nbsp;</p>
+       <input type="submit" name="submit" value="Submit Changes and Edit" />
+       <input type="submit" name="submit" value="Submit Changes and View" /><br /><p>&nbsp;</p><table border="0"><tr><td bgcolor="#DDDDDD">
       ';
 }
 
 sub problem_edit_footer {
-  return '<br /><input type="submit" name="submit" value="Submit Changes and Edit" />
+  return '</td></tr></table><br /><input type="submit" name="submit" value="Submit Changes and Edit" />
     <input type="submit" name="submit" value="Submit Changes and View" />';
 }
 
@@ -174,10 +177,9 @@ sub problem_web_to_edit_header {
              <hr />';
   my $numtoanalyze=$ENV{'form.numtoanalyze'};
   if (!$numtoanalyze) { $numtoanalyze=100; }
-  #DISABLED for now.
-  #$result.= '<input type="submit" name="problemmode" value="Answer Distribution" />
-#             <input type="text" name="numtoanalyze" value="'.
-#		 $numtoanalyze.'" size="5" /> <hr />';
+  $result.= '<input type="submit" name="problemmode" value="Answer Distribution" />
+             <input type="text" name="numtoanalyze" value="'.
+	       $numtoanalyze.'" size="5" /> <hr />';
   return $result;
 }
 
@@ -281,6 +283,7 @@ sub start_problem {
     &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
   if ($target eq 'tex' and $ENV{'request.symb'} =~ m/\.page_/) { $result = '';}
 
+  if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval); }
   if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
     #handle exam checkout
     if ($Apache::lonhomework::type eq 'exam') {
@@ -501,6 +504,9 @@ sub start_block {
 	if ($code) {
 	    $code =~ s/\"//g;
 	    $code .=';return $condition;';
+	    if (!$Apache::lonxml::default_homework_loaded) {
+		&Apache::lonxml::default_homework_load($safeeval);
+	    }
 	    $result = &Apache::run::run($code,$safeeval);
 	    &Apache::lonxml::debug("block :$code: returned :$result:");
 	} else {
@@ -536,6 +542,9 @@ sub start_while {
   $code .=';return $condition;';
 
   push( @Apache::structuretags::whileconds, $code); 
+  if (!$Apache::lonxml::default_homework_loaded) {
+      &Apache::lonxml::default_homework_load($safeeval);
+  }
   my $result = &Apache::run::run($code,$safeeval);
   my $bodytext=$$parser[$#$parser]->get_text("/while");
   push( @Apache::structuretags::whilebody, $bodytext);