--- loncom/homework/caparesponse/caparesponse.pm	2001/01/04 22:52:29	1.25
+++ loncom/homework/caparesponse/caparesponse.pm	2001/07/20 21:19:03	1.36
@@ -6,20 +6,20 @@ use strict;
 use capa;
 
 sub BEGIN {
-  &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse'));
+  &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse'));
 }
 
 sub start_caparesponse {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $id = &Apache::response::start_response($parstack,$safeeval);
   return '';
 }
 
 sub end_caparesponse {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result = '';
   if ( $target eq 'grade' ) {
-    if ( defined $ENV{'form.submit'}) {
+    if ( defined $ENV{'form.submitted'}) {
       $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
       my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
       if ( $response =~ /[^\s]/) {
@@ -28,7 +28,7 @@ sub end_caparesponse {
 	if ( $previous ) { 
 	  $result = 'PREVIOUSLY_USED';
 	} else {
-	  $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"}=$response;
+	  $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>");
 	  my $expression="&caparesponse_check('".$response."','".
@@ -38,13 +38,13 @@ sub end_caparesponse {
 		  "');";
 	  $result = &Apache::run::run($expression,$safeeval);
 	  my ($ad) = split /:/ , $result;
-	  $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].awarddetail"}=$ad;
+	  $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");
 	}
       }
     }
-  } else {
+  } elsif ($target eq 'web') {
     #$result .= "The correct answer is ".&Apache::run::run("{$$parstack['-1'];".'return $answer}',$safeeval)."\n";
   }
   #Apache::lonxml::debug("\n<br>\nreal end caparesponse<br>\n");
@@ -53,16 +53,42 @@ sub end_caparesponse {
 }
 
 sub start_numericalresponse {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $id = &Apache::response::start_response($parstack,$safeeval);
-  return '';
+  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);
+    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;
+    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();
+    }
+  }
+  return $result;
 }
 
 sub end_numericalresponse {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result = '';
   if ( $target eq 'grade' ) {
-    if ( defined $ENV{'form.submit'}) {
+    if ( defined $ENV{'form.submitted'}) {
       $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
       my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
       if ( $response =~ /[^\s]/) {
@@ -71,9 +97,12 @@ sub end_numericalresponse {
 	if ( $previous ) { 
 	  $result = 'PREVIOUSLY_USED';
 	} else {
-	  $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"}=$response;
+	  $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'}.'"'.
@@ -82,7 +111,7 @@ sub end_numericalresponse {
 	  $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::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='';
@@ -91,22 +120,55 @@ sub end_numericalresponse {
     }
   } 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);
-      
+    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);
+
       $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)) {
+	  &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>";
     }
+  } elsif ($target eq 'edit') {
+    $result.='</td></tr>'.&Apache::edit::end_table;
   }
   &Apache::response::end_response;
   return $result;
 }
 
+sub start_stringresponse {
+  return start_numericalresponse(@_);
+}
+
+sub end_stringresponse {
+  return end_numericalresponse(@_);
+}
+
 1;
 __END__