--- loncom/homework/structuretags.pm	2003/05/14 16:49:13	1.173
+++ loncom/homework/structuretags.pm	2003/06/04 14:49:20	1.179
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.173 2003/05/14 16:49:13 albertel Exp $
+# $Id: structuretags.pm,v 1.179 2003/06/04 14:49:20 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -146,8 +146,13 @@ sub setup_rndseed {
 		$ENV{'form.rndseed'}=$rndseed;
 	    }
 	}
-	if ($ENV{'form.resetdata'} eq 'New Problem Variation') {
+	if ($ENV{'form.resetdata'} eq 'New Problem Variation' ||
+	    $ENV{'form.newrandomization'} eq 'New Randomization') {
 	    $rndseed=time;
+	    if ($rndseed eq $ENV{'form.rndseed'}) {
+		srand($rndseed);
+		$rndseed=int(rand(1000000000));
+	    }
 	    $ENV{'form.rndseed'}=$rndseed;
 	}
 	&Apache::lonxml::debug("Setting rndseed to $rndseed");
@@ -177,19 +182,24 @@ sub problem_web_to_edit_header {
     my $result.='<input type="hidden" name="problemmode" value="View" />
              <input type="submit" name="problemmode" value="Edit" />
              <input type="submit" name="problemmode" value="EditXML" />
-             Random Seed:<input type="text" name="rndseed" width="10" value="'.
-	       $rndseed.'" />
-             <input type="submit" name="changerandseed" value="Change" />
+             <input type="submit" name="newrandomization" value="New Randomization" />
              <input type="submit" name="resetdata" value="Reset Submissions" />
+             <nobr><input type="submit" name="changerandseed" value="Change Random Seed To:" />
+              <input type="text" name="rndseed" width="10" value="'.
+	       $rndseed.'"
+           onChange="javascript:document.lonhomework.changerandseed.click()" /></nobr>
              <input type="checkbox" name="showallfoils" ';
     if (defined($ENV{'form.showallfoils'})) { $result.='checked="on"'; }
     $result.= ' />&nbsp;Show&nbsp;All&nbsp;Foils
              <hr />';
     my $numtoanalyze=$ENV{'form.numtoanalyze'};
-    if (!$numtoanalyze) { $numtoanalyze=100; }
-    $result.= '<input type="submit" name="problemmode" value="Answer Distribution" />
+    if (!$numtoanalyze) { $numtoanalyze=20; }
+    $result.= '<input type="submit" name="problemmode" value="Calculate answers" /> for
              <input type="text" name="numtoanalyze" value="'.
-		 $numtoanalyze.'" size="5" /> <hr />';
+		 $numtoanalyze.'" size="5" /> versions of this problem.'.
+		     &Apache::loncommon::help_open_topic("Analyze_Problem",
+						     '',undef,undef,300).
+		     '<hr />';
     return $result;
 }
 
@@ -264,7 +274,9 @@ sub start_problem {
     }
 #initialize globals
     $Apache::inputtags::part='0';
+    @Apache::inputtags::partlist=('0');
     @Apache::inputtags::responselist = ();
+    @Apache::inputtags::importlist = ();
     @Apache::inputtags::previous=();
     @Apache::inputtags::previous_version=();
     $Apache::structuretags::printanswer='No';
@@ -391,6 +403,10 @@ sub start_problem {
 		    "<title>$name</title></head>\n$body_tag_start\n";
 	    }
 	} elsif ($target eq 'tex') {
+	    my $startminipage = '';
+	    if ($ENV{'form.problem_split'} ne 'yes') {
+		$startminipage = '\begin{minipage}{\textwidth}';
+	    }
 	    my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
 	    if ($name eq '') {
 		$name=&Apache::lonnet::EXT('resource.title');
@@ -425,9 +441,9 @@ sub start_problem {
 		print $temp_file "$duedate\n";
 		if (not $ENV{'request.symb'} =~ m/\.page_/) {
 		    if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') {
-			$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent \begin{minipage}{\textwidth}';	
+			$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent '.$startminipage;	
 		    } else {
-			$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm \noindent\begin{minipage}{\textwidth}';
+			$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm \noindent'.$startminipage;
 			if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
 		    }
 		} else {
@@ -435,7 +451,7 @@ sub start_problem {
 		}
 	    } else {
 		if (not $ENV{'request.symb'} =~ m/\.page_/) {
-		    $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent\begin{minipage}{\textwidth}';	
+		    $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent'.$startminipage;	
 		    if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
 		} else {
 		    $result .= '\vskip 1mm \\\\\\\\';
@@ -493,9 +509,13 @@ sub end_problem {
 	    if ($target eq 'web') {
 		$result.=&Apache::lonxml::xmlend();
 	    } elsif ($target eq 'tex') {
-		$result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
+		my $endminipage = '';
+		if ($ENV{'form.problem_split'} ne 'yes') {
+		    $endminipage = '\end{minipage}';
+		}
+		$result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
 		if (not $ENV{'request.symb'} =~ m/\.page_/) {
-		    $result .= '\end{minipage}\end{document} ';
+		    $result .= $endminipage.'\end{document} ';
 		} else {
 		    $result .= '';
 		}
@@ -512,6 +532,7 @@ sub end_problem {
 	}
     } elsif ($target eq 'meta') {
 	if ($Apache::inputtags::part eq '0') {
+	    @Apache::inputtags::response=();
 	    $result=&Apache::response::mandatory_part_meta;
 	}
     } elsif ($target eq 'edit') {
@@ -519,6 +540,9 @@ sub end_problem {
 	$result = &problem_edit_footer();
     }
 
+    if ($ENV{'request.state'} eq 'construct' && $target eq 'web') {
+	&Apache::inputtags::check_for_duplicate_ids();
+    }
     undef(%Apache::lonhomework::history);
     undef(%Apache::lonhomework::results);
     undef($Apache::inputtags::part);
@@ -844,7 +868,8 @@ sub start_part {
     my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
     if ($id eq '') { $id = $Apache::lonxml::curdepth; }
     $Apache::inputtags::part=$id;
-    @Apache::inputtags::responselist = ();
+    push(@Apache::inputtags::partlist,$id);
+    @Apache::inputtags::response=();
     @Apache::inputtags::previous=();
     @Apache::inputtags::previous_version=();
     $Apache::lonhomework::problemstatus=