--- loncom/homework/caparesponse/caparesponse.pm	2005/07/14 05:50:33	1.176
+++ loncom/homework/caparesponse/caparesponse.pm	2005/12/06 10:01:57	1.184
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.176 2005/07/14 05:50:33 albertel Exp $
+# $Id: caparesponse.pm,v 1.184 2005/12/06 10:01:57 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,11 +36,104 @@ BEGIN {
     &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse','formularesponse'));
 }
 
+my %answer;
+my $cur_name;
+sub start_answer {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $result;
+    $cur_name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
+    if ($cur_name =~ /^\s*$/) { $cur_name = $Apache::lonxml::curdepth; }
+    my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval);
+    if (!defined($type) && $tagstack->[-2] eq 'answergroup') {
+	$type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2);
+    }
+    if (!defined($type)) { $type = 'ordered' };
+    $answer{$cur_name}= { 'type' => $type,
+			  'answers' => [] };
+    return $result;
+}
+
+sub end_answer {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $result;
+    undef($cur_name);
+    return $result;
+}
+
+sub start_answergroup {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $result;
+    my $id = $Apache::inputtags::response[-1];
+    my $dis = &Apache::lonxml::get_param('answerdisplay',$parstack,$safeeval);
+    if (defined($dis)) { $Apache::inputtags::answertxt{$id}=$dis; }
+    return $result;
+}
+
+sub end_answergroup {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $result;
+    return $result;
+}
+
+sub start_value {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    my $result;
+    if ( $target eq 'web' || $target eq 'tex' ||
+	 $target eq 'grade' || $target eq 'webgrade' ||
+	 $target eq 'answer' || $target eq 'analyze' ) {
+	my $bodytext = &Apache::lonxml::get_all_text("/value",$parser,$style);
+	$bodytext = &Apache::run::evaluate($bodytext,$safeeval,
+					   $$parstack[-1]);
+	push(@{ $answer{$cur_name}{'answers'} },$bodytext);
+    }
+    return $result;
+}
+
+sub end_value {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $result;
+    return $result;
+}
+
+sub start_array {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    my $result;
+    if ( $target eq 'web' || $target eq 'tex' ||
+	 $target eq 'grade' || $target eq 'webgrade' ||
+	 $target eq 'answer' || $target eq 'analyze' ) {
+	my $bodytext = &Apache::lonxml::get_all_text("/array",$parser,$style);
+	my @values = &Apache::run::evaluate($bodytext,$safeeval,
+					    $$parstack[-1]);
+	push(@{ $answer{$cur_name}{'answers'} },@values);
+    }
+    return $result;
+}
+
+sub end_array {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $result;
+    return $result;
+}
+
+sub start_unit {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $result;
+    return $result;
+}
+
+sub end_unit {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $result;
+    return $result;
+}
+
 sub start_numericalresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    &Apache::lonxml::register('Apache::caparesponse',('answer','answergroup','value','array','unit'));
     my $id = &Apache::response::start_response($parstack,$safeeval);
     my $result;
-    undef %{$safeeval->varglob('LONCAPA::CAPAresponse_args')};
+    undef(%answer);
+    undef(%{$safeeval->varglob('LONCAPA::CAPAresponse_args')});
     if ($target eq 'edit') {
 	$result.=&Apache::edit::tag_start($target,$token);
 	$result.=&Apache::edit::text_arg('Answer:','answer',$token);
@@ -155,14 +248,31 @@ sub check_submission {
     }
     my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
     &Apache::lonxml::debug('answer is'.join(':',@answer));
-    @{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=@answer;
-    
-    my ($result,@msgs) = 
-	&Apache::run::run("&caparesponse_check_list()",$safeeval);
-    &Apache::lonxml::debug('msgs are'.join(':',@msgs));
-    my ($awards)=split(/:/,$result);
-    my @awards= split(/,/,$awards);
-    return(\@awards,\@msgs);
+    if (@answer && defined($answer[0])) {
+	$answer{'INTERNAL'}= {'type' => 'ordered',
+			      'answers' => \@answer };
+    }
+    #FIXME would be nice if we could save name so we know who graded him
+    #correct
+    my (%results,@final_awards,@final_msgs,@names);
+    foreach my $name (keys(%answer)) {
+	&Apache::lonxml::debug(" doing $name with ".join(':',@{ $answer{$name}{'answers'} }));
+	@{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=@{ $answer{$name}{'answers'} };
+	my ($result,@msgs) = 
+	    &Apache::run::run("&caparesponse_check_list()",$safeeval);
+	&Apache::lonxml::debug('msgs are '.join(':',@msgs));
+	my ($awards)=split(/:/,$result);
+	my @awards= split(/,/,$awards);
+	my ($ad, $msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);
+	$results{$name}= [$ad,$msg];
+	push(@final_awards,$ad);
+	push(@final_msgs,$msg);
+	push(@names,$name);
+    }
+    my ($ad, $msg, $name) = &Apache::inputtags::finalizeawards(\@final_awards,
+							       \@final_msgs,
+							       \@names,1);
+    return($ad,$msg);
 }
 
 sub end_numericalresponse {
@@ -185,26 +295,19 @@ sub end_numericalresponse {
 	} else {
 	    my $response = &Apache::response::getresponse();
 	    if ( $response =~ /[^\s]/) {
-		my $ad;
 		my %previous = &Apache::response::check_for_previous($response,$partid,$id);
 		&Apache::lonxml::debug("submitted a $response<br>\n");
 		&Apache::lonxml::debug($$parstack[-1] . "\n<br>");
 		
 		if ( &Apache::response::submitted('scantron')) {
-		    my $number_of_bubbles = &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.numbubbles');
-		    if (!$number_of_bubbles) { $number_of_bubbles=8; }
-		    my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
-		    my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
-		    my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);
-		    if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); }
-		    my ($values,$display)=&make_numerical_bubbles($number_of_bubbles,$target,$answers[0],$formats[0],\@incorrect,$safeeval);
+		    my ($values,$display)=&make_numerical_bubbles($partid,$id,
+						  $target,$parstack,$safeeval);
 		    $response=$values->[$response];
 		}
 		$Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
-		my ($awards,$msgs)=&check_submission($response,$partid,$id,
-						     $tag,$parstack,$safeeval);
+		my ($ad,$msg)=&check_submission($response,$partid,$id,
+						$tag,$parstack,$safeeval);
 
-		($ad,my $msg) = &Apache::inputtags::finalizeawards($awards,$msgs);
 		&Apache::lonxml::debug('ad is'.$ad);
 		if ($ad eq 'SIG_FAIL') {
 		    my ($sig_u,$sig_l)=
@@ -231,22 +334,12 @@ sub end_numericalresponse {
 	my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
 	my $status = $Apache::inputtags::status['-1'];
 	if ($Apache::lonhomework::type eq 'exam') {
-	    my $number_of_bubbles = &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.numbubbles');
-	    if ($Apache::inputtags::params{'numbubbles'}) {
-		$number_of_bubbles = $Apache::inputtags::params{'numbubbles'};
-	    }
-	    if (!$number_of_bubbles) { $number_of_bubbles=8; }
-	    
-	    my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,
-							 $safeeval);
+	    my ($bubble_values,$bubble_display)=
+		&make_numerical_bubbles($partid,$id,$target,$parstack,
+					$safeeval);
+	    my $number_of_bubbles = scalar(@{ $bubble_values });
 	    my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
 						    $safeeval);
-	    my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);
-	    if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); }
-	    my ($bubble_values,$bubble_display)=
-		&make_numerical_bubbles($number_of_bubbles,
-					$target,$answers[0],
-					$formats[0],\@incorrect,$safeeval);
 	    my @alphabet=('A'..'Z');
 	    if ($target eq 'web') {
 		if ($tag eq 'numericalresponse') {
@@ -329,6 +422,11 @@ sub end_numericalresponse {
 	
 	if ($target eq 'answer') {
 	    $result.=&Apache::response::answer_header($tag);
+	    if ($Apache::lonhomework::type eq 'exam') {
+		my ($bubble_values,undef,$correct) = &make_numerical_bubbles($partid,
+					     $id,$target,$parstack,$safeeval);
+		$result.=&Apache::response::answer_part($tag,$correct);
+	    }
 	}
 	my ($sigline,$tolline);
 	for(my $i=0;$i<=$#answers;$i++) {
@@ -389,6 +487,7 @@ sub end_numericalresponse {
 		if ($unit=~/\$/) { $fmt="\$".$fmt; $unit=~s/\$//g; }
 		if ($unit=~/\,/) { $fmt="\,".$fmt; $unit=~s/\,//g; }
 		$ans = &format_number($ans,$fmt,$target,$safeeval);
+		if ($fmt=~/\$/ && $unit!~/\$/) { $ans=~s/\$//; }
 	    }
 	    push(@fmt_ans,$ans);
 	}
@@ -403,25 +502,21 @@ sub end_numericalresponse {
 	    $response.=" $cleanunit";
 	}
 
-	my ($awards,$msgs)=&check_submission($response,$partid,$id,$tag,
-					     $parstack,$safeeval);
-	my ($ad,$msg) =&Apache::inputtags::finalizeawards($awards,$msgs);
+	my ($ad,$msg)=&check_submission($response,$partid,$id,$tag,
+					$parstack,$safeeval);
 	if ($ad ne 'EXACT_ANS' && $ad ne 'APPROX_ANS') {
 	    my $error;
 	    if ($tag eq 'formularesponse') {
-		$error=&mt('Computer\'s answer is incorrect ("[_1]").');
+		$error=&mt('Computer\'s answer is incorrect ("[_1]").',$response);
 	    } else {
 		# answer failed check if it is sig figs that is failing
-		my ($awards,$msgs)=&check_submission($response,$partid,$id,
-						     $tag,$parstack,
-						     $safeeval,1);
-		($ad,$msg)=&Apache::inputtags::finalizeawards($awards,
-							      $msgs);
-		    
+		my ($ad,$msg)=&check_submission($response,$partid,$id,
+						$tag,$parstack,
+						$safeeval,1);
 		if ($sigline ne '') {
 		    $error=&mt('Computer\'s answer is incorrect ("[_1]"). It is likely that the tolerance range [_2] or significant figures [_3] need to be adjusted.',$response,$tolline,$sigline);
 		} else {
-		    $error=&mt('Computer\'s answer is incorrect ("[_1]"). It is likely that the tolerance range [_1] needs to be adjusted.',$response,$tolline);
+		    $error=&mt('Computer\'s answer is incorrect ("[_1]"). It is likely that the tolerance range [_2] needs to be adjusted.',$response,$tolline);
 		}
 	    }
 	    if ($ad ne 'EXACT_ANS' && $ad ne 'APPROX_ANS') {
@@ -524,35 +619,56 @@ sub format_number {
 }
 
 sub make_numerical_bubbles {
-    my ($number_of_bubbles,$target,$answer,$format,$incorrect,$safeeval) =@_;
+    my ($part,$id,$target,$parstack,$safeeval) =@_;
+    
+    my $number_of_bubbles = 
+	&Apache::response::get_response_param($part.'_'.$id,'numbubbles',8);
+
+    my ($format)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
+    my ($answer)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
+    my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,
+						   $safeeval);
+    if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); }
+    
     my @bubble_values=();
-    &Apache::lonxml::debug("answer is $answer incorrect is $incorrect");
+    my @alphabet=('A'..'Z');
+
+    &Apache::lonxml::debug("answer is $answer incorrect is @incorrect");
     my @oldseed=&Math::Random::random_get_seed();
-    if (defined($incorrect) && ref($incorrect)) {
-	&Apache::lonxml::debug("inside ".(scalar(@$incorrect)+1 gt $number_of_bubbles));
-	if (defined($$incorrect[0]) &&
-	    scalar(@$incorrect)+1 >= $number_of_bubbles) {
-	    &Apache::lonxml::debug("inside ".(scalar(@$incorrect)+1).":$number_of_bubbles");
+    if (@incorrect) {
+	&Apache::lonxml::debug("inside ".(scalar(@incorrect)+1 gt $number_of_bubbles));
+	if (defined($incorrect[0]) &&
+	    scalar(@incorrect)+1 >= $number_of_bubbles) {
+	    &Apache::lonxml::debug("inside ".(scalar(@incorrect)+1).":$number_of_bubbles");
 	    &Apache::response::setrandomnumber();
-	    my @rand_inc=&Math::Random::random_permutation(@$incorrect);
+	    my @rand_inc=&Math::Random::random_permutation(@incorrect);
 	    @bubble_values=@rand_inc[0..($number_of_bubbles-2)];
 	    @bubble_values=sort {$a <=> $b} (@bubble_values,$answer);
-	    &Apache::lonxml::debug("Answer was :$answer: returning :".$#bubble_values.": whih are :".join(':',@bubble_values));
+	    &Apache::lonxml::debug("Answer was :$answer: returning :".$#bubble_values.": which are :".join(':',@bubble_values));
 	    &Math::Random::random_set_seed(@oldseed);
+
+	    my $correct;
+	    for(my $i=0; $i<=$#bubble_values;$i++) {
+		if ($bubble_values[$i] eq $answer) {
+		    $correct = $alphabet[$i];
+		    last;
+		}
+	    }
+
 	    if (defined($format) && $format ne '') {
 		my @bubble_display;
 		foreach my $value (@bubble_values) {
 		    push(@bubble_display,
 			 &format_number($value,$format,$target,$safeeval));
 		}
-		return (\@bubble_values,\@bubble_display);
+		return (\@bubble_values,\@bubble_display,$correct);
 	    } else {
-		return (\@bubble_values,\@bubble_values);
+		return (\@bubble_values,\@bubble_values,$correct);
 	    }
 	}
-	if (defined($$incorrect[0]) &&
-	    scalar(@$incorrect)+1 < $number_of_bubbles) {
-	    &Apache::lonxml::warning("Not enough incorrect answers were specified in the incorrect array, ignoring the specified incorrect answers and instead generating them (".join(',',@$incorrect).").");
+	if (defined($incorrect[0]) &&
+	    scalar(@incorrect)+1 < $number_of_bubbles) {
+	    &Apache::lonxml::warning("Not enough incorrect answers were specified in the incorrect array, ignoring the specified incorrect answers and instead generating them (".join(',',@incorrect).").");
 	}
     }
     my @factors = (1.13,1.17,1.25,1.33,1.45); #default values of factors
@@ -569,8 +685,9 @@ sub make_numerical_bubbles {
 					       $format,$target,$safeeval);
 
     }
+    my $correct = $alphabet[$number_of_bubbles-$power];
     &Math::Random::random_set_seed(@oldseed);
-    return (\@bubble_values,\@bubble_display);
+    return (\@bubble_values,\@bubble_display,$correct);
 }
 
 sub get_tolrange {
@@ -699,7 +816,7 @@ sub end_stringresponse {
 #			$answer=$token->[2]->{'answer'};
 #		    }
 		    ${$safeeval->varglob('LONCAPA::response')}=$response;
-		    $result = &Apache::run::run('return $LONCAPA::response=~m'.$answer,$safeeval);
+		    $result = &Apache::run::run('if ($LONCAPA::response=~m'.$answer.') { return 1; } else { return 0; }',$safeeval);
 		    &Apache::lonxml::debug("current $response");
 		    &Apache::lonxml::debug("current $answer");
 		    $ad = ($result) ? 'APPROX_ANS' : 'INCORRECT';
@@ -760,6 +877,10 @@ sub end_stringresponse {
 #	foreach my $ans (@answers) {
 	    if ($target eq 'answer') {
 		$result.=&Apache::response::answer_part('stringresponse',$answer);
+		if ($type eq 're') {
+		    $result.=&Apache::response::answer_part('stringresponse',
+							    $answerdisplay);
+		}
 	    } elsif ($target eq 'analyze') {
 		push (@{ $Apache::lonhomework::analyze{"$part.$id.answer"} },
 		      $answer);