--- loncom/homework/structuretags.pm	2003/05/13 20:38:55	1.171
+++ loncom/homework/structuretags.pm	2003/06/18 22:12:34	1.186
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.171 2003/05/13 20:38:55 sakharuk Exp $
+# $Id: structuretags.pm,v 1.186 2003/06/18 22:12:34 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,9 +43,9 @@ BEGIN {
 
 sub start_web {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-    my $bodytext=&Apache::lonxml::get_all_text("/web",$parser);
-    if ($target eq 'web') {
-	return $bodytext;
+    if (!($target eq 'web' || $target eq 'edit' || $target eq 'modified' ||
+	  $target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) {
+	my $bodytext=&Apache::lonxml::get_all_text("/web",$parser);
     }
     return '';
 }
@@ -56,9 +56,10 @@ sub end_web {
 
 sub start_tex {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-    my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);
-    if ($target eq 'tex') {
-	return $bodytext.' ';
+    if (!($target eq 'tex' || $target eq 'edit' || $target eq 'modified' ||
+	  $target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) {
+	&Apache::lonxml::debug("tex 1");
+	my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);
     }
     return '';
 }
@@ -146,9 +147,16 @@ 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;
+	    delete($ENV{'form.resetdata'});
+	    delete($ENV{'form.newrandomization'});
 	}
 	&Apache::lonxml::debug("Setting rndseed to $rndseed");
 	&Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);
@@ -177,19 +185,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;
 }
 
@@ -253,18 +266,19 @@ ENDCHECKOUT
 sub start_problem {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 
-    $Apache::lonhomework::parsing_a_problem=1;
-    # meta is called from lonpublisher, which doesn't uses the normal
-    # lonhomework method of parsing the file which means that inputtags 
-    # won't get reset
-    if ( $Apache::inputtags::part ne '' && $target != 'meta' ) {
-	&Apache::lonxml::error('Only one problem allowed in a .problem file');
-	my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
+    if ( $Apache::inputtags::part ne '' ||
+	 $Apache::lonhomework::parsing_a_problem) {
+	&Apache::lonxml::error('Only one &lt;problem&gt; allowed in a .problem file');
+	#my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
 	return '';
     }
+
+    $Apache::lonhomework::parsing_a_problem=1;
 #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';
@@ -333,7 +347,7 @@ sub start_problem {
 		    '<input type="submit" name="resetdata"
                              value="New Problem Variation" />'.
 		    '<input type="hidden" name="username"
-                             value="'.$ENV{'form.username'}.'" />';
+                             value="'.$ENV{'form.username'}.'" /> <br />';
 	}
 	($status,$accessmsg) = &Apache::lonhomework::check_access('0');
 	push (@Apache::inputtags::status,$status);
@@ -391,6 +405,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 +443,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 +453,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 \\\\\\\\';
@@ -480,8 +498,9 @@ sub end_problem {
 	    ($target eq 'answer') || ($target eq 'tex')
 	   ) {
 	    if ($status eq 'CAN_ANSWER') {
-		if ($target ne 'tex') {
-		    if ($ENV{'form.print_answer'} ne 'yes') {$result.="</form></body>\n";}
+		if ($target ne 'tex' &&
+		    $ENV{'form.answer_output_mode'} ne 'tex') {
+		    $result.="</form></body>\n";
 		}
 	    } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' ||
 		     $status eq 'UNCHECKEDOUT' ) {
@@ -492,9 +511,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 .= '';
 		}
@@ -504,14 +527,14 @@ sub end_problem {
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::results);
 	    &finalize_storage();
 	}
-	if ($target eq 'answer' && ($ENV{'request.state'} eq 'construct') ) {
-	    if ($ENV{'form.print_answer'} ne 'yes') {
-		$result.='</html>'; #normally we get it from xmlend, but in CSTR
-		                    # we always show answer mode too.
-	    }
+	if ($target eq 'answer' && ($ENV{'request.state'} eq 'construct')
+	    && $ENV{'form.answer_output_mode'} ne 'tex') {
+	    $result.='</html>'; # normally we get it from xmlend, but in CSTR
+	                        # we always show answer mode too.
 	}
     } 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 +542,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);
@@ -619,26 +645,7 @@ sub start_languageblock {
 
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
 	$target eq 'tex' || $target eq 'analyze') {
-	my $include = $token->[2]->{'include'};
-	my $exclude = $token->[2]->{'exclude'};
-        my %languages=&Apache::loncommon::display_languages();
-        $result='1';
-	if ($include) {
-            $result='';
-            foreach (split(/\,/,$include)) {
-                if ($languages{$_}) { $result='1'; }
-            }
-	}
-        if ($exclude) {
-            foreach (split(/\,/,$exclude)) {
-                if ($languages{$_}) { $result='0'; }
-            }
-	}
-	if ( ! $result ) {
-	    my $skip=&Apache::lonxml::get_all_text("/languageblock",$parser);
-	    &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
-	}
-	$result='';
+	&Apache::lonxml::startredirection();
     } elsif ($target eq 'edit') {
 	$result .=&Apache::edit::tag_start($target,$token);
 	$result .=&Apache::edit::text_arg('Include Language:','include',
@@ -658,7 +665,31 @@ sub start_languageblock {
 sub end_languageblock {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;
-    if ($target eq "edit") {
+
+    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'analyze') {
+	my $text=&Apache::lonxml::endredirection();
+	my $include= &Apache::lonxml::get_param('include',$parstack,$safeeval);
+	my $exclude= &Apache::lonxml::get_param('exclude',$parstack,$safeeval);
+	my %languages=&Apache::loncommon::display_languages();
+	$result='1';
+	if ($include) {
+	    $result='';
+	    foreach (split(/\,/,$include)) {
+		if ($languages{$_}) { $result='1'; }
+	    }
+	}
+	if ($exclude) {
+	    foreach (split(/\,/,$exclude)) {
+		if ($languages{$_}) { $result='0'; }
+	    }
+	}
+	if ( ! $result ) {
+	    $result='';
+	} else {
+	    $result=$text;
+	}
+    } elsif ($target eq "edit") {
 	$result.= &Apache::edit::tag_end($target,$token,'');
     }
     return $result;
@@ -844,7 +875,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=
@@ -909,6 +941,8 @@ sub end_part {
 							$target);
 	if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';}
 	$result=$gradestatus;
+    } elsif ($target eq 'edit') {
+	$result=&Apache::edit::end_table();
     }
     pop @Apache::inputtags::status;
     $Apache::inputtags::part='';