--- loncom/homework/inputtags.pm	2006/09/29 20:55:33	1.206
+++ loncom/homework/inputtags.pm	2006/11/01 23:24:52	1.210
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.206 2006/09/29 20:55:33 albertel Exp $
+# $Id: inputtags.pm,v 1.210 2006/11/01 23:24:52 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -283,6 +283,7 @@ sub needs_exam_box {
 sub start_textline {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result = "";
+    my $input_id = &start_input($parstack,$safeeval);
     if ($target eq 'web') {
 	$Apache::lonxml::evaluate--;
 	my $partid=$Apache::inputtags::part;
@@ -293,7 +294,14 @@ sub start_textline {
 	    if ($size eq '') { $size=20; } else {
 		if ($size < 20) { $maxlength=$size; }
 	    }
-	    my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"},'<>&"');
+	    my $oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"};
+	    &Apache::lonxml::debug("oldresponse $oldresponse is ".ref($oldresponse));
+
+	    if (ref($oldresponse) eq 'ARRAY') {
+		$oldresponse = $oldresponse->[$#Apache::inputtags::inputlist];
+	    }
+	    $oldresponse = &HTML::Entities::encode($oldresponse,'<>&"');
+
 	    if ($Apache::lonhomework::type ne 'exam') {
 		my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval);
 		$result='';
@@ -321,7 +329,8 @@ sub start_textline {
 	    }
 	} else {
 	    #right or wrong don't show what was last typed in.
-	    $result='<b>'.$Apache::inputtags::answertxt{$id}.'</b>';
+	    my $count = scalar(@Apache::inputtags::inputlist)-1;
+	    $result='<b>'.$Apache::inputtags::answertxt{$id}[$count].'</b>';
 	    #$result='';
 	}
     } elsif ($target eq 'edit') {
@@ -356,6 +365,7 @@ sub end_textline {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     if    ($target eq 'web') { $Apache::lonxml::evaluate++; }
     elsif ($target eq 'edit') { return ('','no'); }
+    &end_input();
     return "";
 }
 
@@ -459,7 +469,7 @@ sub show_past_portfile_submission {
     }
     my (@file_list,@bad_file_list);
     foreach my $file (split(/\s*,\s*/,&unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"}))) {
-	my (undef,undef,$domain,$user)=&Apache::lonxml::whichuser();
+	my (undef,undef,$domain,$user)=&Apache::lonnet::whichuser();
 	my $url="/uploaded/$domain/$user/portfolio$file";
 	my $icon=&Apache::loncommon::icon($url);
 	push(@file_list,'<a href="'.$url.'"><img src="'.$icon.
@@ -484,20 +494,6 @@ sub show_past_portfile_submission {
 
 }
 
-sub checkstatus {
-    my ($value,$awardref,$msgref,$nameref)=@_;
-    for (my $i=0;$i<=$#$awardref;$i++) {
-	if ($$awardref[$i] eq $value) {
-	    if (ref($nameref)) {
-		return ($$awardref[$i],$$msgref[$i],$$nameref[$i]);
-	    } else {
-		return ($$awardref[$i],$$msgref[$i]);
-	    }
-	}
-    }
-    return(undef,undef);
-}
-
 sub valid_award {
     my ($award) =@_;
     foreach my $possibleaward ('EXTRA_ANSWER','MISSING_ANSWER', 'ERROR',
@@ -515,13 +511,29 @@ sub valid_award {
     return 0;
 }
 
+{
+    my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE',
+		  'TOO_LONG',
+		  'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT',
+		  'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT',
+		  'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA',
+		  'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK',
+		  'INVALID_FILETYPE', 'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE',
+		  'APPROX_ANS', 'EXACT_ANS');
+    my $i=0;
+    my %fwd_awards = map { ($_,$i++) } @awards;
+    my $max=scalar(@awards);
+    @awards=reverse(@awards);
+    $i=0;
+    my %rev_awards = map { ($_,$i++) } @awards;
+
 sub finalizeawards {
     my ($awardref,$msgref,$nameref,$reverse)=@_;
-    my ($result,$award,$msg,$name);
+    my $result;
     if ($#$awardref == -1) { $result = "NO_RESPONSE"; }
     if ($result eq '' ) {
 	my $blankcount;
-	foreach $award (@$awardref) {
+	foreach my $award (@$awardref) {
 	    if ($award eq '') {
 		$result='MISSING_ANSWER';
 		$blankcount++;
@@ -529,26 +541,31 @@ sub finalizeawards {
 	}
 	if ($blankcount == ($#$awardref + 1)) { $result = 'NO_RESPONSE'; }
     }
-    if (defined($result)) { return ($result,$msg); }
+    if (defined($result)) { return ($result); }
 
     # these awards are ordered from most important error through best correct
-    
-    my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE',
-		  'TOO_LONG',
-		  'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT',
-		  'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT',
-		  'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA',
-		  'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK',
-		  'INVALID_FILETYPE', 'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE',
-		  'APPROX_ANS', 'EXACT_ANS');
-    if ($reverse) { @awards=reverse(@awards); }
-    foreach my $possibleaward (@awards) {
-	($result,$msg,$name)=&checkstatus($possibleaward,$awardref,$msgref,
-					  $nameref);
-	if (defined($result)) { return ($result,$msg,$name); }
+    my $awards = (!$reverse) ? \%fwd_awards : \%rev_awards ;
+
+    my $best = $max;
+    my $j=0;
+    my $which;
+    foreach my $award (@$awardref) {
+	if ($awards->{$award} < $best) {
+	    $best  = $awards->{$award};
+	    $which = $j;
+	}
+	$j++;
+    }
+    if (defined($which)) {
+	if (ref($nameref)) {
+	    return ($$awardref[$which],$$msgref[$which],$$nameref[$which]);
+	} else {
+	    return ($$awardref[$which],$$msgref[$which]);
+	}
     }
     return ('ERROR',undef);
 }
+}
 
 sub decideoutput {
     my ($award,$awarded,$awardmsg,$solved,$previous,$target)=@_;
@@ -743,7 +760,7 @@ sub decideoutput {
 	$message = &mt("Unknown message").": $award";
 	$button=1;
     }
-    my (undef,undef,$domain,$user)=&Apache::lonxml::whichuser();
+    my (undef,undef,$domain,$user)=&Apache::lonnet::whichuser();
     foreach my $resid(@Apache::inputtags::response){
         if ($Apache::lonhomework::history{"resource.$part.$resid.handback"}) {
 	    $message.='<br />';