--- loncom/homework/caparesponse/caparesponse.pm	2004/02/26 18:24:24	1.126.2.2
+++ loncom/homework/caparesponse/caparesponse.pm	2004/03/13 00:36:11	1.142
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.126.2.2 2004/02/26 18:24:24 albertel Exp $
+# $Id: caparesponse.pm,v 1.142 2004/03/13 00:36:11 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,6 +29,7 @@
 package Apache::caparesponse;
 use strict;
 use capa;
+use Apache::lonlocal;
 
 BEGIN {
     &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse','formularesponse'));
@@ -98,7 +99,7 @@ sub end_numericalresponse {
     my $tag;
     if (scalar(@$tagstack)) { $tag=$$tagstack[-1]; }
     if ( $target eq 'grade' && defined($ENV{'form.submitted'})) {
-	&Apache::response::setup_params($tag);
+	&Apache::response::setup_params($tag,$safeeval);
 	$safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
 	my $partid = $Apache::inputtags::part;
 	my $id = $Apache::inputtags::response['-1'];
@@ -132,39 +133,50 @@ sub end_numericalresponse {
 		my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit');
 
 		foreach my $key (keys(%Apache::inputtags::params)) {
-		    $expression.= ';my $'. #'
+		    $expression.= ';my $__LC__'. #'
 			$key.'="'.$Apache::inputtags::params{$key}.'"';
 		}
 
 		#no way to enter units, with radio buttons
 		if ($Apache::lonhomework::type eq 'exam' ||
 		    lc($hideunit) eq "yes") {
-		    $expression.=';my $unit=undef;';
+		    $expression.=';my $__LC__unit=undef;';
 		}
 		#sig fig don't make much sense either
 		if (($Apache::lonhomework::type eq 'exam' ||
 		     $ENV{'form.submitted'} eq 'scantron') &&
 		    $tag eq 'numericalresponse') {
-		    $expression.=';my $sig=undef;';
+		    $expression.=';my $__LC__sig=undef;';
 		}
 
 		if ($tag eq 'formularesponse') {
-		    $expression.=';my $type="fml";';
+		    $expression.=';my $__LC__type="fml";';
 		} elsif ($tag eq 'numericalresponse') {
-		    $expression.=';my $type="float";';
+		    $expression.=';my $__LC__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);
+		($result,my @msgs) = &Apache::run::run($expression,$safeeval);
+		&Apache::lonxml::debug('msgs are'.join(':',@msgs));
+		my ($awards)=split(/:/,$result);
+		my (@awards) = split(/,/,$awards);
+		($ad,my $msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);
+		&Apache::lonxml::debug('ad is'.$ad);
+		if ($ad eq 'SIG_FAIL') {
+		    my ($sig_u,$sig_l)=
+			&get_sigrange($Apache::inputtags::params{'sig'});
+		    $msg=join(':',$msg,$sig_l,$sig_u);
+		    &Apache::lonxml::debug("sigs bad $sig_u $sig_l ".
+					   $Apache::inputtags::params{'sig'});
+		}
 		&Apache::lonxml::debug("$expression");
 		&Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
 		&Apache::response::handle_previous(\%previous,$ad);
 		$Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
+		$Apache::lonhomework::results{"resource.$partid.$id.awardmsg"}=$msg;
 		$result='';
 	    }
 	}
@@ -179,7 +191,7 @@ sub end_numericalresponse {
 	    my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
 						    $safeeval);
 	    if ($target eq 'web') {
-		$result="<br />The correct answer is ";
+		$result="<br />".&mt('The correct answer is')." ";
 	    }
 	    for (my $i=0; $i <= $#answers; $i++) {
 		my $answer=$answers[$i];
@@ -297,7 +309,7 @@ sub end_numericalresponse {
 	    push (@{ $Apache::lonhomework::analyze{"$part_id.incorrect"} }, @incorrect);
 	}
 	if (scalar(@$tagstack)) {
-	    &Apache::response::setup_params($tag);
+	    &Apache::response::setup_params($tag,$safeeval);
 	}
 	my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
 	my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
@@ -381,12 +393,14 @@ sub get_table_sizes {
     my $cell_width=0;
     foreach my $member (@$rbubble_values) {
 	my $cell_width_real=0;
-	if ($member=~/(\d*)\.?(\d*)(E|e)(\+|-)?(\d*)/) {
+	if ($member=~/(\+|-)?(\d*)\.?(\d*)\s*\$\\times\s*10\^{(\+|-)?(\d+)}\$/) {
+	    $cell_width_real=(length($2)+length($3)+length($5)+7)*$scale;
+	} elsif ($member=~/(\d*)\.?(\d*)(E|e)(\+|-)?(\d*)/) {
 	    $cell_width_real=(length($1)+length($2)+length($5)+9)*$scale;
-	} elsif ($member=~/(\d*)\.(\d*)/) {
+        } elsif ($member=~/(\d*)\.(\d*)/) {
 	    $cell_width_real=(length($1)+length($2)+3)*$scale;
 	} else {
-	    $cell_width_real=(length($member)+1)*$scale;
+	    $cell_width_real=(length($member)+1)*$scale*0.9;
 	}
 	if ($cell_width_real>$cell_width) {$cell_width=$cell_width_real;}
     }
@@ -409,6 +423,7 @@ sub get_table_sizes {
 	push @table_range,($number_of_bubbles % $bubbles_per_line);
     }
     $cell_width-=8;
+    $cell_width=$cell_width*3/4;
     return ($cell_width,$number_of_tables,@table_range);
 }
 
@@ -518,6 +533,16 @@ sub get_sigrange {
 	}
 	if (!$sig_ubound) { $sig_ubound=$sig_lbound; }
     }
+    if (($sig_ubound<$sig_lbound) ||
+	($sig_lbound > 15) ||
+	($sig =~/(\+|-)/ ) ) {
+	my $errormsg=&mt("Invalid Significant figures detected")." ($sig)";
+	if ($ENV{'request.state'} eq 'construct') {
+	    $errormsg.=
+		&Apache::loncommon::help_open_topic('Significant_Figures');
+	}
+	&Apache::lonxml::error($errormsg);
+    }
     return ($sig_ubound,$sig_lbound);
 }
 
@@ -536,16 +561,18 @@ sub start_stringresponse {
 			 [['cs','Case Sensitive'],['ci','Case Insensitive'],
 			  ['mc','Case Insensitive, Any Order'],
 			  ['re','Regular Expression']],$token);
+	$result.=&Apache::edit::checked_arg('Answer Display:','answerdisplay',
+					    [['inline','Inline']],$token);
 	$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
-	my $constructtag;
-	$constructtag=&Apache::edit::get_new_args($token,$parstack,
-						  $safeeval,'answer',
-						  'type');
-	if ($constructtag) {
-	    $result = &Apache::edit::rebuild_tag($token);
-	    $result.=&Apache::edit::handle_insert();
-	}
+       my $constructtag;
+       $constructtag=&Apache::edit::get_new_args($token,$parstack,
+                                                 $safeeval,'answer',
+                                                 'type','answerdisplay');
+       if ($constructtag) {
+           $result = &Apache::edit::rebuild_tag($token);
+           $result.=&Apache::edit::handle_insert();
+       }
     } elsif ($target eq 'answer' || $target eq 'grade') {
 	&Apache::response::reset_params();
     }
@@ -560,12 +587,13 @@ sub end_stringresponse {
     my $id=$Apache::inputtags::response[-1];
     my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
     my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval);
+    my $answerdisplay=&Apache::lonxml::get_param('answerdisplay',$parstack,$safeeval);
     &Apache::lonxml::debug("current $answer ".$token->[2]);
     if (!$Apache::lonxml::default_homework_loaded) {
 	&Apache::lonxml::default_homework_load($safeeval);
     }
     if ( $target eq 'grade' && defined($ENV{'form.submitted'})) {
-	&Apache::response::setup_params('stringresponse');
+	&Apache::response::setup_params('stringresponse',$safeeval);
 	$safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
 	if ($Apache::lonhomework::type eq 'exam' ||
 	    $ENV{'form.submitted'} eq 'scantron') {
@@ -580,7 +608,7 @@ sub end_stringresponse {
 		
 		$Apache::lonhomework::results{"resource.$part.$id.submission"}=
 		    $response;
-		my $ad;
+		my ($ad,$msg);
 		if ($type eq 're' ) { 
 		    # if the RE wasn't in a var it likely got munged,
                     # thus grab it from the var directly
@@ -607,14 +635,17 @@ sub end_stringresponse {
 		    $expression.="');";
 		    &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);
+		    ($result, my @msgs) = &Apache::run::run($expression,$safeeval);
+		    &Apache::lonxml::debug('msgs are'.join(':',@msgs));
+		    my ($awards)=split(/:/,$result);
+		    my (@awards) = split(/,/,$awards);
+		    ($ad,$msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);
 		    &Apache::lonxml::debug("$expression");
 		    &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
 		}
 		&Apache::response::handle_previous(\%previous,$ad);
 		$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
+		$Apache::lonhomework::results{"resource.$part.$id.awardmsg"}=$msg;
 	    }
 	}
     } elsif ($target eq 'web' || $target eq 'tex') {
@@ -622,7 +653,8 @@ sub end_stringresponse {
 	my $status = $Apache::inputtags::status['-1'];
 	if (  &Apache::response::show_answer() ) {
 	    if ($target eq 'web') {
-		$result="<br />The correct answer is ".$answer;
+		$result=($answerdisplay eq 'inline'?'':"<br />".&mt('The correct answer is')." ")
+		    .$answer;
 #		    join(', ',@answers).".<br />";
 	    }
 	}
@@ -641,7 +673,7 @@ sub end_stringresponse {
 	    push (@{ $Apache::lonhomework::analyze{"parts"} },"$part.$id");
 	    $Apache::lonhomework::analyze{"$part.$id.type"} = 'stringresponse';
 	}
-	&Apache::response::setup_params('stringresponse');
+	&Apache::response::setup_params('stringresponse',$safeeval);
 	if ($target eq 'answer') {
 	    $result.=&Apache::response::answer_header('stringresponse');
 	}