--- loncom/homework/caparesponse/caparesponse.pm	2001/07/23 22:40:59	1.37
+++ loncom/homework/caparesponse/caparesponse.pm	2001/09/18 02:21:13	1.43
@@ -80,6 +80,8 @@ sub start_numericalresponse {
       $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,33 +91,40 @@ sub end_numericalresponse {
   my $result = '';
   if ( $target eq 'grade' ) {
     if ( defined $ENV{'form.submitted'}) {
+      &Apache::response::setup_params('numericalresponse');
       $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}.'"';
+	}
+	$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') {
@@ -156,13 +165,34 @@ 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";
+    }
+    $result .= "<br />".&Apache::run::run('return $result',$safeeval);
   }
   &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 {