--- loncom/homework/caparesponse/caparesponse.pm	2001/07/10 22:06:42	1.33
+++ loncom/homework/caparesponse/caparesponse.pm	2001/07/23 22:40:59	1.37
@@ -6,7 +6,7 @@ use strict;
 use capa;
 
 sub BEGIN {
-  &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse'));
+  &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse'));
 }
 
 sub start_caparesponse {
@@ -58,11 +58,24 @@ sub start_numericalresponse {
   my $result;
   if ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token,&Apache::lonxml::description($token));
-    $result.=&Apache::edit::text_arg('Answer:','answer',$token).
-      &Apache::edit::text_arg('Unit:','unit',$token).'</td></tr><tr><td colspan="3">';
+    $result.=&Apache::edit::text_arg('Answer:','answer',$token);
+    if ($token->[1] eq 'numericalresponse') {
+      $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)
+    }
+    $result.='</td></tr><tr><td colspan="3">';
   } elsif ($target eq 'modified') {
-    my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
-						 'answer','unit');
+    my $constructtag;
+    if ($token->[1] eq 'numericalresponse') {
+      $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
+						'answer','unit','format');
+    } else {
+      $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
+						'answer','type');
+    }
     if ($constructtag) {
       $result = &Apache::edit::rebuild_tag($token);
       $result.=&Apache::edit::handle_insert();
@@ -109,13 +122,35 @@ sub end_numericalresponse {
     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>";
     }
@@ -126,6 +161,14 @@ sub end_numericalresponse {
   return $result;
 }
 
+sub start_stringresponse {
+  return start_numericalresponse(@_);
+}
+
+sub end_stringresponse {
+  return end_numericalresponse(@_);
+}
+
 1;
 __END__