--- loncom/homework/caparesponse/caparesponse.pm	2001/09/18 02:21:13	1.43
+++ loncom/homework/caparesponse/caparesponse.pm	2001/10/01 20:18:31	1.44
@@ -6,7 +6,7 @@ use strict;
 use capa;
 
 sub BEGIN {
-  &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse'));
+  &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse','formularesponse'));
 }
 
 sub start_caparesponse {
@@ -62,9 +62,11 @@ sub start_numericalresponse {
     if ($token->[1] eq 'numericalresponse') {
       $result.=&Apache::edit::text_arg('Unit:','unit',$token,5);
       $result.=&Apache::edit::text_arg('Format:','format',$token,4);
-    } else {
+    } elsif ($token->[1] eq 'stringresponse') {
       $result.=&Apache::edit::select_arg('Type:','type',
 					 ['cs','ci','mc'],$token)
+    } elsif ($token->[1] eq 'formularesponse') {
+      $result.=&Apache::edit::text_arg('Sample Points:','points',$token,40);
     }
     $result.='</td></tr><tr><td colspan="3">';
   } elsif ($target eq 'modified') {
@@ -72,9 +74,12 @@ sub start_numericalresponse {
     if ($token->[1] eq 'numericalresponse') {
       $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
 						'answer','unit','format');
-    } else {
+    } elsif ($token->[1] eq 'stringresponse') {
       $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
 						'answer','type');
+    } elsif ($token->[1] eq 'formularesponse') {
+      $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
+						'answer','points');
     }
     if ($constructtag) {
       $result = &Apache::edit::rebuild_tag($token);
@@ -131,16 +136,11 @@ 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::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);
+      my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,
+						   $safeeval);
+      my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,
+						   $safeeval);
+      my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);
 
       $result="<br></br>The computer got ";
 
@@ -166,19 +166,43 @@ sub end_numericalresponse {
   } elsif ($target eq 'edit') {
     $result.='</td></tr>'.&Apache::edit::end_table;
   } elsif ($target eq 'answer') {
-    my $answer= &Apache::run::run('eval \''.$$parstack[-1].';return $answer\'',
-				  $safeeval);
-    my (@answers) = &Apache::run::run("eval ".$answer,$safeeval);
-    # if the eval fails just use what is in the answer exactly
-    if (!defined(@answers) || !defined($answers[0])) {
-      $result.="list zero is undefined<br />";
-      $answers[0]=$answer;
-    }
-    $result.="<br /> An answers: $answer";
-    foreach my $ans (@answers) {
-      $result.="<br /> An answer: $ans";
+
+    my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
+    my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
+    my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);
+    my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval);
+
+    $result.=&Apache::response::answer_header('numericalresponse');
+    for(my $i=0;$i<=$#answers;$i++) {
+      my $ans=$answers[$i];
+      my $fmt;
+      if (@formats) {
+	if ($#formats) {
+	  $fmt=$formats[$i];
+	} else {
+	  $fmt=$formats[0];
+	}
+      }
+      if ($fmt) { $ans = sprintf('%.'.$fmt,$ans); }
+      $result.=&Apache::response::answer_part('numericalresponse',$ans);
+    }
+    if ($unit) {
+      $result.=&Apache::response::answer_part('numericalresponse',
+					      '<b>'.$unit.'</b>');
+    }
+    if ($type || $token->[1] eq 'stringresponse') {
+      my $string='Case Insensitive';
+      if ($type eq 'mc') {
+	$string='Multiple Choice';
+      } elsif ($type eq 'cs') {
+	$string='Case Sensitive';
+      } elsif ($type eq 'ci') {
+	$string='Case Insensitive';
+      }
+      $result.=&Apache::response::answer_part('numericalresponse',
+					      '<b>'.$string.'</b>');
     }
-    $result .= "<br />".&Apache::run::run('return $result',$safeeval);
+    $result.=&Apache::response::answer_footer('numericalresponse');
   }
   &Apache::response::end_response;
   return $result;
@@ -199,6 +223,21 @@ sub end_stringresponse {
   return end_numericalresponse(@_);
 }
 
+sub start_formularesponse {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  my $result;
+  if ($target eq 'meta') {
+    $result=&Apache::response::meta_package_write('formularesponse');
+  } else {
+    $result.=&start_numericalresponse(@_);
+  }
+  return $result;
+}
+
+sub end_formularesponse {
+  return end_numericalresponse(@_);
+}
+
 1;
 __END__