--- loncom/homework/caparesponse/caparesponse.pm	2001/10/29 22:50:32	1.45
+++ loncom/homework/caparesponse/caparesponse.pm	2002/02/12 07:23:31	1.51
@@ -1,11 +1,36 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
+#
+# $Id: caparesponse.pm,v 1.51 2002/02/12 07:23:31 albertel Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 
 package Apache::caparesponse;
 use strict;
 use capa;
 
-sub BEGIN {
+BEGIN {
   &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse','formularesponse'));
 }
 
@@ -57,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') {
@@ -116,19 +141,15 @@ sub end_numericalresponse {
 	    $key.'="'.$Apache::inputtags::params{$key}.'"';
 	}
 	if ($$tagstack[-1] eq 'formularesponse') {
-	  $expression.=';$type="fml";';
+	  $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::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");
@@ -170,6 +191,7 @@ sub end_numericalresponse {
     $result.='</td></tr>'.&Apache::edit::end_table;
   } elsif ($target eq 'answer') {
 
+    &Apache::response::setup_params($$tagstack[-1]);
     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);
@@ -186,12 +208,21 @@ sub end_numericalresponse {
 	  $fmt=$formats[0];
 	}
       }
-      if ($fmt) { $ans = sprintf('%.'.$fmt,$ans); }
+      my ($high,$low);
+      if ($Apache::inputtags::params{'tol'}) {
+	($high,$low)=&get_tolrange($ans,$Apache::inputtags::params{'tol'});
+      }	
+      if ($fmt) {
+	$ans = sprintf('%.'.$fmt,$ans);
+	if ($high) {
+	  $high = sprintf('%.'.$fmt,$high); $low = sprintf('%.'.$fmt,$low);
+	}
+      }
+      if ($high) { $ans.=' ['.$low.','.$high.'] '; }
       $result.=&Apache::response::answer_part($$tagstack[-1],$ans);
     }
     if ($unit) {
-      $result.=&Apache::response::answer_part($$tagstack[-1],
-					      '<b>'.$unit.'</b>');
+      $result.=&Apache::response::answer_part($$tagstack[-1],"<b>$unit</b>");
     }
     if ($type || $token->[1] eq 'stringresponse') {
       my $string='Case Insensitive';
@@ -217,6 +248,21 @@ sub end_numericalresponse {
   return $result;
 }
 
+sub get_tolrange {
+  my ($ans,$tol)=@_;
+  my ($high,$low);
+  if ($tol =~ /%$/) {
+    chop($tol);
+    my $change=$ans*($tol/100.0);
+    $high=$ans+$change;
+    $low=$ans-$change;
+  } else {
+    $high=$ans+$tol;
+    $low=$ans-$tol;
+  }
+  return ($high,$low);
+}
+
 sub start_stringresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result;