--- loncom/homework/inputtags.pm	2005/06/20 19:54:28	1.168
+++ loncom/homework/inputtags.pm	2005/08/02 18:05:25	1.173
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.168 2005/06/20 19:54:28 albertel Exp $
+# $Id: inputtags.pm,v 1.173 2005/08/02 18:05:25 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,9 +43,13 @@ sub initialize_inputtags {
     # list of all input ids seen in this problem
     @Apache::inputtags::inputlist=();
     # list of all current response ids
-    @Apache::inputtags::response=();
+    @Apache::inputtags::hint=();
     # list of all response ids seen in this problem
     @Apache::inputtags::responselist=();
+    # list of all current hint ids
+    @Apache::inputtags::response=();
+    # list of all hint ids seen in this problem
+    @Apache::inputtags::hintlist=();
     # list of whether or not a specific response was previously used
     @Apache::inputtags::previous=();
     # submission it was used in
@@ -75,6 +79,7 @@ sub check_for_duplicate_ids {
     my %check;
     foreach my $id (@Apache::inputtags::partlist,
 		    @Apache::inputtags::responselist,
+		    @Apache::inputtags::hintlist,
 		    @Apache::inputtags::importlist) {
 	$check{$id}++;
     }
@@ -401,7 +406,7 @@ sub finalizeawards {
 }
 
 sub decideoutput {
-    my ($award,$awardmsg,$solved,$previous,$target)=@_;
+    my ($award,$awarded,$awardmsg,$solved,$previous,$target)=@_;
     my $message='';
     my $button=0;
     my $previousmsg;
@@ -413,16 +418,28 @@ sub decideoutput {
 	  'not_charged_try' => '#ffffaa',
 	  'no_message' => '#fffff',
 	  );
+
     if ($previous) { $previousmsg=&mt('You have entered that answer before'); }
     
     if      ($solved =~ /^correct/) {
-	if ($award eq 'ASSIGNED_SCORE') {
+	$bgcolor=$possiblecolors{'correct'};
+	$message=&mt('You are correct.');
+	if ($awarded < 1 && $awarded > 0) {
+	    $message=&mt('You are partially correct.');
+	    $bgcolor=$possiblecolors{'not_charged_try'};
+	} elsif ($awarded < 1) {
+	    $message=&mt('Incorrect.');
+	    $bgcolor=$possiblecolors{'charged_try'};
+	}
+	if ($env{'request.filename'} =~ 
+	    m|/res/lib/templates/examupload.problem$|) {
 	    $message = &mt("A score has been assigned.");
+	    $added_computer_text=1;
 	} else {
 	    if ($target eq 'tex') {
-		$message = '\textbf{'.&mt('You are correct.').'}';
+		$message = '\textbf{'.$message.'}';
 	    } else {
-		$message = "<b>".&mt('You are correct.')."</b>";
+		$message = "<b>".$message."</b>";
 		$message.=" ".&mt("Computer's answer now shown above.");
 	    }
 	    $added_computer_text=1;
@@ -434,7 +451,6 @@ sub decideoutput {
 		    (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');
 	    }
 	}
-	$bgcolor=$possiblecolors{'correct'};
 	$button=0;
 	$previousmsg='';
     } elsif ($solved =~ /^excused/) {
@@ -787,6 +803,7 @@ sub gradestatus {
     if ( $status ne 'CLOSED' && $status ne 'UNAVAILABLE' &&
 	 $status ne 'INVALID_ACCESS') {  
 	my $award = $Apache::lonhomework::history{"resource.$id.award"};
+	my $awarded = $Apache::lonhomework::history{"resource.$id.awarded"};
 	my $solved = $Apache::lonhomework::history{"resource.$id.solved"};
 	my $previous = $Apache::lonhomework::history{"resource.$id.previous"};
 	my $awardmsg = $Apache::lonhomework::history{"resource.$id.awardmsg"};
@@ -794,7 +811,8 @@ sub gradestatus {
 	if ( $award ne '' || $solved ne '' || $status eq 'SHOW_ANSWER') {
 	    &Apache::lonxml::debug('Getting message');
 	    ($showbutton,$bgcolor,$message,$previousmsg) =
-		&decideoutput($award,$awardmsg,$solved,$previous,$target);
+		&decideoutput($award,$awarded,$awardmsg,$solved,$previous,
+			      $target);
 	    if ($target eq 'tex') {
 		$message='\vskip 2 mm '.$message.' ';
 	    } else {