--- loncom/homework/inputtags.pm	2004/03/31 05:23:59	1.138
+++ loncom/homework/inputtags.pm	2004/05/20 23:11:12	1.142
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.138 2004/03/31 05:23:59 albertel Exp $
+# $Id: inputtags.pm,v 1.142 2004/05/20 23:11:12 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -421,19 +421,17 @@ sub decideoutput {
 	$bgcolor=$possiblecolors{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'UNIT_INVALID_STUDENT') {
-	$message = &mt('Unable to interpret units. Computer reads units as "[_1]"',
-		       $awardmsg);
+	$message = &mt('Unable to interpret units. Computer reads units as "[_1]"','<tt>'.$awardmsg.'</tt>');
 	if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} 
 	$bgcolor=$possiblecolors{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'UNIT_FAIL' || $award eq 'UNIT_IRRECONCIBLE') {
-	$message = &mt('Units incorrect. Computer reads units as "[_1]"',
-		       $awardmsg);
+	$message = &mt('Incompatible units. No conversion found between "[_1]" and the required units.','<tt>'.$awardmsg.'</tt>');
 	if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} 
 	$bgcolor=$possiblecolors{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'UNIT_NOTNEEDED') {
-	$message = &mt('Only a number required. Computer reads units of "[_1]"',$awardmsg);
+	$message = &mt('Only a number required. Computer reads units of "[_1]"','<tt>'.$awardmsg.'</tt>');
 	$bgcolor=$possiblecolors{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'NO_UNIT') {
@@ -484,9 +482,26 @@ sub removealldata {
     }
 }
 
+sub hidealldata {
+    my ($id)=@_;
+    foreach my $key (keys(%Apache::lonhomework::results)) {
+	if (($key =~ /^resource\.\Q$id\E\./) && ($key !~ /\.collaborators$/)) {
+	    &Apache::lonxml::debug("Hidding $key");
+	    my $newkey=$key;
+	    $newkey=~s/^(resource\.\Q$id\E\.[^\.]+\.)(.*)$/${1}hidden${2}/;
+	    $Apache::lonhomework::results{$newkey}=
+		$Apache::lonhomework::results{$key};
+	    delete($Apache::lonhomework::results{$key});
+	}
+    }
+}
+
 sub setgradedata {
     my ($award,$msg,$id,$previously_used) = @_;
     # if the student already has it correct, don't modify the status
+    if ($Apache::lonhomework::scantronmode && defined($ENV{'form.CODE'})) {
+	$Apache::lonhomework::results{"resource.CODE"}=$ENV{'form.CODE'};
+    }
     if (!$Apache::lonhomework::scantronmode &&
 	$Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
 	$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') {