--- loncom/homework/caparesponse/caparesponse.pm	2000/10/12 21:51:40	1.8
+++ loncom/homework/caparesponse/caparesponse.pm	2001/01/04 22:52:29	1.25
@@ -6,40 +6,107 @@ use strict;
 use capa;
 
 sub BEGIN {
-  &Apache::lonxml::register('Apache::caparesponse',('caparesponse'));
+  &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse'));
 }
 
-$Apache::caparesponse::result='';
 sub start_caparesponse {
-  my $envkey;
-  
-  #foreach $envkey (sort keys %ENV) {
-  #  Apache::lonxml::debug("$envkey ---- $ENV{$envkey}<br>");
-  #}
-  
-  #Apache::lonxml::debug("\n<br>\nreal caparesponse<br>\n");
+  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my $id = &Apache::response::start_response($parstack,$safeeval);
+  return '';
 }
 
 sub end_caparesponse {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
-  if ( defined $ENV{'form.'.$ENV{'form.request.prefix'}.'submit'}) {
-    $Apache::caparesponse::result='';
-    $safeeval->share('&caparesponse_capa_check_answer');
-    $safeeval->share('$Apache::caparesponse::result');
-    my $response = $ENV{'form.'.$ENV{'form.request.prefix'}.'HWVAL'.$Apache::inputtags::curvalue};
-    Apache::lonxml::debug("submitted a $response<br>\n");
-    Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");
-    my $expression="caparesponse_check $response $$parstack[$#$parstack];";
-    &Apache::run::run($expression,$safeeval);
-    
-    &Apache::lonxml::debug("\n<br>result:$Apache::caparesponse::result:<br>\n");
+  my $result = '';
+  if ( $target eq 'grade' ) {
+    if ( defined $ENV{'form.submit'}) {
+      $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
+      my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
+      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.$Apache::inputtags::response['-1'].submission"}=$response;
+	  &Apache::lonxml::debug("submitted a $response<br>\n");
+	  &Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");
+	  my $expression="&caparesponse_check('".$response."','".
+	    $$parstack[$#$parstack].
+	      ';my $tol="'.$Apache::inputtags::params{'tol'}.'"'.
+		';my $sig="'.$Apache::inputtags::params{'sig'}.'"'.
+		  "');";
+	  $result = &Apache::run::run($expression,$safeeval);
+	  my ($ad) = split /:/ , $result;
+	  $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].awarddetail"}=$ad;
+	  &Apache::lonxml::debug("$expression");
+	  &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
+	}
+      }
+    }
   } else {
-    #return "The correct answer is ".&Apache::run::run("{$$parstack['-1'];".'return $answer}',$safeeval)."\n";
+    #$result .= "The correct answer is ".&Apache::run::run("{$$parstack['-1'];".'return $answer}',$safeeval)."\n";
   }
   #Apache::lonxml::debug("\n<br>\nreal end caparesponse<br>\n");
+  &Apache::response::end_response;
+  return '';
+}
+
+sub start_numericalresponse {
+  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my $id = &Apache::response::start_response($parstack,$safeeval);
   return '';
 }
 
+sub end_numericalresponse {
+  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my $result = '';
+  if ( $target eq 'grade' ) {
+    if ( defined $ENV{'form.submit'}) {
+      $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
+      my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
+      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.$Apache::inputtags::response['-1'].submission"}=$response;
+	  &Apache::lonxml::debug("submitted a $response<br>\n");
+	  &Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");
+	  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.$Apache::inputtags::response['-1'].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"};
+    if ($award =~ /^correct/) {
+      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);
+      
+      $result="<br></br>The computer got ";
+      my $answer;
+      foreach $answer (@answers) { $result.="$answer,"; }
+      chop $result;
+      $result.=" $unit.<br></br>";
+    }
+  }
+  &Apache::response::end_response;
+  return $result;
+}
+
 1;
 __END__