--- loncom/homework/caparesponse/caparesponse.pm	2001/12/04 15:17:57	1.47
+++ loncom/homework/caparesponse/caparesponse.pm	2002/01/11 16:32:29	1.49
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.47 2001/12/04 15:17:57 albertel Exp $
+# $Id: caparesponse.pm,v 1.49 2002/01/11 16:32:29 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -82,18 +82,18 @@ sub start_numericalresponse {
   my $id = &Apache::response::start_response($parstack,$safeeval);
   my $result;
   if ($target eq 'edit') {
-    $result.=&Apache::edit::tag_start($target,$token,&Apache::lonxml::description($token));
+    $result.=&Apache::edit::tag_start($target,$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);
     } elsif ($token->[1] eq 'stringresponse') {
       $result.=&Apache::edit::select_arg('Type:','type',
-					 ['cs','ci','mc'],$token)
+					 ['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">';
+    $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {
     my $constructtag;
     if ($token->[1] eq 'numericalresponse') {
@@ -149,13 +149,7 @@ sub end_numericalresponse {
 	$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::response::handle_previous(\%previous,$ad);
 	$Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
 	&Apache::lonxml::debug("$expression");
 	&Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");