--- loncom/homework/caparesponse/caparesponse.pm	2003/04/21 20:59:02	1.95
+++ loncom/homework/caparesponse/caparesponse.pm	2003/07/28 18:29:05	1.107
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.95 2003/04/21 20:59:02 albertel Exp $
+# $Id: caparesponse.pm,v 1.107 2003/07/28 18:29:05 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -79,6 +79,16 @@ sub start_numericalresponse {
 	$result=&Apache::response::meta_package_write('numericalresponse');
     } elsif ($target eq 'answer' || $target eq 'grade') {
 	&Apache::response::reset_params();
+    } elsif ($target eq 'web') {
+	my $partid = $Apache::inputtags::part;
+	my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit');
+	&Apache::lonxml::debug("Got unit $hideunit for $partid $id");
+	#no way to enter units, with radio buttons
+	if (lc($hideunit) eq "yes") {
+	    my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
+						    $safeeval);
+	    if ($unit =~ /\S/) { $result.=" (in $unit) "; }
+	}
     }
     return $result;
 }
@@ -124,8 +134,10 @@ sub end_numericalresponse {
 		&Apache::lonxml::debug("current $response");
 		my $expression="&caparesponse_check_list('".$response."','".
 		    $$parstack[-1];
+		my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit');
 		#no way to enter units, with radio buttons
-		if ($Apache::lonhomework::type eq 'exam') {
+		if ($Apache::lonhomework::type eq 'exam' ||
+		    lc($hideunit) eq "yes") {
 		    $expression.=';my $unit=undef;';
 		}
 		foreach my $key (keys(%Apache::inputtags::params)) {
@@ -138,6 +150,10 @@ sub end_numericalresponse {
 		    $expression.=';my $type="float";';
 		}
 		$expression.="');";
+		my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
+		&Apache::lonxml::debug('answer is'.join(':',@answer));
+		@{$safeeval->varglob('CAPARESPONSE_CHECK_LIST_answer')}=@answer;
+		
 		$result = &Apache::run::run($expression,$safeeval);
 		my ($awards) = split /:/ , $result;
 		($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
@@ -153,7 +169,10 @@ sub end_numericalresponse {
 						     $safeeval);
 	my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
 	my $status = $Apache::inputtags::status['-1'];
-	if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" || $ENV{'form.texaward'} eq 'SHOW_ANSWER') {
+	if (   ($award =~ /^correct/
+                && lc($Apache::lonhomework::problemstatus) ne 'no')
+             || $status eq "SHOW_ANSWER"
+             || $ENV{'form.texaward'} eq 'SHOW_ANSWER') {
 	    my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,
 							 $safeeval);
 	    my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
@@ -228,7 +247,7 @@ sub end_numericalresponse {
                            </textarea></font> <br /><br />';
 		}
 	    } elsif ($target eq 'tex') {
-		if (defined $unit and $Apache::lonhomework::type eq 'exam') {
+		if ((defined $unit) and ($unit=~/\S/) and ($Apache::lonhomework::type eq 'exam')) {
 		    $result.=' \textit{(in} \verb|'.$unit.'|\textit{)} ';
 		}
 		if ($$tagstack[-1] eq 'numericalresponse') {
@@ -294,7 +313,7 @@ sub end_numericalresponse {
 	    if ($Apache::inputtags::params{'sig'}) {
 		($sighigh,$siglow)=&get_sigrange($Apache::inputtags::params{'sig'});
 	    }
-	    if ($fmt) {
+	    if ($fmt && $$tagstack[-1] eq 'numericalresponse') {
 		$ans = sprintf('%.'.$fmt,$ans);
 		if ($high) {
 		    $high=sprintf('%.'.$fmt,$high);
@@ -302,8 +321,14 @@ sub end_numericalresponse {
 		}
 	    }
 	    if ($target eq 'answer') {
-		if ($high) { $ans.=' ['.$low.','.$high.']'; }
-		if ($sighigh) { $ans.= " Sig <i>$siglow - $sighigh</i>"; }
+		if ($high && $$tagstack[-1] eq 'numericalresponse') { $ans.=' ['.$low.','.$high.']'; }
+		if ($sighigh && $$tagstack[-1] eq 'numericalresponse') {
+		    if ($ENV{'form.answer_output_mode'} eq 'tex') {
+			$ans.= " Sig $siglow - $sighigh";
+		    } else {
+			$ans.= " Sig <i>$siglow - $sighigh</i>";
+		    }
+		}
 		$result.=&Apache::response::answer_part($$tagstack[-1],$ans);
 	    } elsif ($target eq 'analyze') {
 		push (@{ $Apache::lonhomework::analyze{"$part_id.answer"} }, $ans);
@@ -313,16 +338,21 @@ sub end_numericalresponse {
 		}
 	    }
 	}
-	if ($unit) {
+	if (defined($unit) and ($unit ne '') and
+	    $$tagstack[-1] eq 'numericalresponse') {
 	    if ($target eq 'answer') {
-		$result.=&Apache::response::answer_part($$tagstack[-1],
-							"Unit: <b>$unit</b>");
+		if ($ENV{'form.answer_output_mode'} eq 'tex') {
+		    $result.=&Apache::response::answer_part($$tagstack[-1],
+							    " Unit: $unit ");
+		} else {
+		    $result.=&Apache::response::answer_part($$tagstack[-1],
+							    "Unit: <b>$unit</b>");
+		}
 	    } elsif ($target eq 'analyze') {
-		push (@{ $Apache::lonhomework::analyze{"$part_id.unit"} },
-		      $unit);
+		push (@{ $Apache::lonhomework::analyze{"$part_id.unit"} }, $unit);
 	    }
 	}
-	if ($type || $token->[1] eq 'stringresponse') {
+	if ($type || $$tagstack[-1] eq 'stringresponse') {
 	    my $string='Case Insensitive';
 	    if ($type eq 'mc') {
 		$string='Multiple Choice';
@@ -334,10 +364,15 @@ sub end_numericalresponse {
 		$string='Formula';
 	    }
 	    if ($target eq 'answer') {
-		$result.=&Apache::response::answer_part($$tagstack[-1],
-							'<b>'.$string.'</b>');
+		if ($ENV{'form.answer_output_mode'} eq 'tex') {
+		    $result.=&Apache::response::answer_part($$tagstack[-1],
+							  "\\textbf{$string}");
+		} else {
+		    $result.=&Apache::response::answer_part($$tagstack[-1],
+							    "<b>$string</b>");
+		}
 	    } elsif ($target eq 'analyze') {
-		push (@{ $Apache::lonhomework::analyze{"$part_id.type"} },
+		push (@{ $Apache::lonhomework::analyze{"$part_id.str_type"} },
 		      $type);
 	    }
 	}
@@ -463,7 +498,9 @@ sub start_stringresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
     if ($target eq 'meta') {
+	&Apache::response::start_response($parstack,$safeeval);
 	$result=&Apache::response::meta_package_write('stringresponse');
+	&Apache::response::end_response();
     } else {
 	$result.=&start_numericalresponse(@_);
     }
@@ -478,7 +515,9 @@ sub start_formularesponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
     if ($target eq 'meta') {
+	&Apache::response::start_response($parstack,$safeeval);
 	$result=&Apache::response::meta_package_write('formularesponse');
+	&Apache::response::end_response();
     } else {
 	$result.=&start_numericalresponse(@_);
     }