--- loncom/homework/caparesponse/caparesponse.pm	2001/07/20 21:19:03	1.36
+++ loncom/homework/caparesponse/caparesponse.pm	2001/12/04 14:54:47	1.46
@@ -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:','samples',$token,40);
     }
     $result.='</td></tr><tr><td colspan="3">';
   } elsif ($target eq 'modified') {
@@ -72,14 +74,19 @@ 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','samples');
     }
     if ($constructtag) {
       $result = &Apache::edit::rebuild_tag($token);
       $result.=&Apache::edit::handle_insert();
     }
+  } elsif ($target eq 'meta') {
+    $result=&Apache::response::meta_package_write('numericalresponse');
   }
   return $result;
 }
@@ -89,51 +96,58 @@ sub end_numericalresponse {
   my $result = '';
   if ( $target eq 'grade' ) {
     if ( defined $ENV{'form.submitted'}) {
+      &Apache::response::setup_params($$tagstack[-1]);
       $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 $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='';
+	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];
+	foreach my $key (keys(%Apache::inputtags::params)) {
+	  $expression.= ';my $'. #'
+	    $key.'="'.$Apache::inputtags::params{$key}.'"';
 	}
+	if ($$tagstack[-1] eq 'formularesponse') {
+	  $expression.=';my $type="fml";';
+	} elsif ($$tagstack[-1] eq 'numericalresponse') {
+	  $expression.=';my $type="float";';
+	}
+	$expression.="');";
+	$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::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 (@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 $unit=&Apache::lonxml::get_param('unit',$parstack,$safeeval);
-
-      $result="<br></br>The computer got ";
+      $result="<br />The computer got ";
 
       for (my $i=0; $i <= $#answers; $i++) {
 	my $answer=$answers[$i];
@@ -143,7 +157,7 @@ sub end_numericalresponse {
 	} else {
 	  $format=$formats[0];
 	}
-	if (defined($format)) {
+	if ((defined($format)) && ($format ne '')) {
 	  &Apache::lonxml::debug("formatting with :$format: answer :$answer:");
 	  $result.=sprintf('%.'.$format,$answer).',';
 	} else {
@@ -156,19 +170,85 @@ sub end_numericalresponse {
     }
   } elsif ($target eq 'edit') {
     $result.='</td></tr>'.&Apache::edit::end_table;
+  } elsif ($target eq 'answer') {
+
+    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($$tagstack[-1]);
+    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($$tagstack[-1],$ans);
+    }
+    if ($unit) {
+      $result.=&Apache::response::answer_part($$tagstack[-1],
+					      '<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';
+      } elsif ($type eq 'fml') {
+	$string='Formula';
+      }
+      $result.=&Apache::response::answer_part($$tagstack[-1],
+					      '<b>'.$string.'</b>');
+    }
+    if ($$tagstack[-1] eq 'formularesponse') {
+      my $samples=&Apache::lonxml::get_param('samples',$parstack,$safeeval);
+      $result.=&Apache::response::answer_part($$tagstack[-1],$samples);
+    }
+    $result.=&Apache::response::answer_footer($$tagstack[-1]);
   }
   &Apache::response::end_response;
   return $result;
 }
 
 sub start_stringresponse {
-  return start_numericalresponse(@_);
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  my $result;
+  if ($target eq 'meta') {
+    $result=&Apache::response::meta_package_write('stringresponse');
+  } else {
+    $result.=&start_numericalresponse(@_);
+  }
+  return $result;
 }
 
 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__