--- loncom/homework/caparesponse/caparesponse.pm	2001/07/19 21:26:22	1.35
+++ loncom/homework/caparesponse/caparesponse.pm	2001/08/05 16:26:28	1.39
@@ -60,7 +60,8 @@ sub start_numericalresponse {
     $result.=&Apache::edit::tag_start($target,$token,&Apache::lonxml::description($token));
     $result.=&Apache::edit::text_arg('Answer:','answer',$token);
     if ($token->[1] eq 'numericalresponse') {
-      $result.=&Apache::edit::text_arg('Unit:','unit',$token)
+      $result.=&Apache::edit::text_arg('Unit:','unit',$token,5);
+      $result.=&Apache::edit::text_arg('Format:','format',$token,4);
     } else {
       $result.=&Apache::edit::select_arg('Type:','type',
 					 ['cs','ci','mc'],$token)
@@ -70,7 +71,7 @@ sub start_numericalresponse {
     my $constructtag;
     if ($token->[1] eq 'numericalresponse') {
       $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
-						'answer','unit');
+						'answer','unit','format');
     } else {
       $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
 						'answer','type');
@@ -79,6 +80,8 @@ sub start_numericalresponse {
       $result = &Apache::edit::rebuild_tag($token);
       $result.=&Apache::edit::handle_insert();
     }
+  } elsif ($target eq 'meta') {
+    $result=&meta_package_write('numericalresponse');
   }
   return $result;
 }
@@ -89,45 +92,71 @@ sub end_numericalresponse {
   if ( $target eq 'grade' ) {
     if ( defined $ENV{'form.submitted'}) {
       $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
-      my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
+      my $partid = $Apache::inputtags::part;
+      my $id = $Apache::inputtags::response['-1'];
+      my $response = $ENV{'form.HWVAL'.$id};
       if ( $response =~ /[^\s]/) {
-	my $id = $Apache::inputtags::response['-1'];
-	my $previous= &Apache::response::check_for_previous($response,$id,$response);
-	if ( $previous ) { 
-	  $result = 'PREVIOUSLY_USED';
-	} else {
-	  $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response;
-	  &Apache::lonxml::debug("submitted a $response<br>\n");
-	  &Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");
-	  $response =~ s/\\/\\\\/g;
-	  $response =~ s/\'/\\\'/g;
-	  &Apache::lonxml::debug("current $response");
-	  my $expression="&caparesponse_check_list('".$response."','".
-	    $$parstack[$#$parstack].
-	      ';my $tol="'.$Apache::inputtags::params{'tol'}.'"'.
+	my %previous = &Apache::response::check_for_previous($response,$partid,$id);
+	$Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
+	&Apache::lonxml::debug("submitted a $response<br>\n");
+	&Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");
+	$response =~ s/\\/\\\\/g;
+	$response =~ s/\'/\\\'/g;
+	&Apache::lonxml::debug("current $response");
+	my $expression="&caparesponse_check_list('".$response."','".
+	  $$parstack[$#$parstack].
+	    ';my $tol="'.$Apache::inputtags::params{'tol'}.'"'.
 	      ';my $sig="'.$Apache::inputtags::params{'sig'}.'"'.
 		"');";
-	  $result = &Apache::run::run($expression,$safeeval);
-	  my ($awards) = split /:/ , $result;
-	  my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
-	  $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$ad;
-	  &Apache::lonxml::debug("$expression");
-	  &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
-	  $result='';
+	$result = &Apache::run::run($expression,$safeeval);
+	my ($awards) = split /:/ , $result;
+	my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
+	if ( $previous{'used'} && ($previous{'award'} eq $ad) ) {
+	  if ($previous{'last'}) {
+	    push(@Apache::inputtags::previous,'PREVIOUSLY_LAST');
+	  } else {
+	    push(@Apache::inputtags::previous,'PREVIOUSLY_USED');
+	  }
 	}
+	$Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
+	&Apache::lonxml::debug("$expression");
+	&Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
+	$result='';
       }
     }
   } elsif ($target eq 'web') {
     my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
     my $status = $Apache::inputtags::status['-1'];
     if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" ) {
-      my $answervar=&Apache::run::run("{$$parstack['-1'];".'return $answer}',$safeeval);
-      my (@answers)=&Apache::run::run("$answervar",$safeeval);
-      my $unit=&Apache::run::run("{$$parstack['-1'];".'return $unit}',$safeeval);
-      
+      my $answervar=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
+      my (@answers)=&Apache::run::run("return $answervar",$safeeval,1);
+      if (!defined($answers[0])) { $answers[0]=$answervar; } else {
+	&Apache::lonxml::debug("answers is $#answers :$answers[0]:");
+      }
+      my $formatvar=&Apache::lonxml::get_param('format',$parstack,$safeeval);
+      my (@formats)=&Apache::run::run("return $formatvar",$safeeval,1);
+      if (!defined($formats[0])) { $formats[0]=$formatvar; }
+
+      my $unit=&Apache::lonxml::get_param('unit',$parstack,$safeeval);
+
       $result="<br></br>The computer got ";
-      my $answer;
-      foreach $answer (@answers) { $result.="$answer,"; }
+
+      for (my $i=0; $i <= $#answers; $i++) {
+	my $answer=$answers[$i];
+	my $format;
+	if ($#formats > 0) {
+	  $format=$formats[$i];
+	} else {
+	  $format=$formats[0];
+	}
+	if ((defined($format)) && ($format ne '')) {
+	  &Apache::lonxml::debug("formatting with :$format: answer :$answer:");
+	  $result.=sprintf('%.'.$format,$answer).',';
+	} else {
+	  &Apache::lonxml::debug("no format answer :$answer:");
+	  $result.="$answer,";
+	}
+      }
       chop $result;
       $result.=" $unit.<br></br>";
     }