--- loncom/homework/inputtags.pm	2010/12/21 14:56:03	1.271.2.3
+++ loncom/homework/inputtags.pm	2010/12/31 00:58:10	1.276
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.271.2.3 2010/12/21 14:56:03 raeburn Exp $
+# $Id: inputtags.pm,v 1.276 2010/12/31 00:58:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -354,7 +354,6 @@ sub start_textline {
             unless ($newvariation) {
 	        $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];
 	        }
@@ -596,9 +595,9 @@ sub current_file_submissions {
             }
         }
     }
+    my $num = 0;
     foreach my $name (sort(keys(%okfiles))) {
         if (ref($okfiles{$name}) eq 'ARRAY') {
-            my $num = 0;
             foreach my $url (@{$okfiles{$name}}) {
                 if (ref($rows{$url}) eq 'HASH') {
                     my $link = $rows{$url}{link};
@@ -636,7 +635,7 @@ sub current_file_submissions {
     if ($header_shown) {
         $result .= &Apache::loncommon::end_data_table().
                    '<br /><span class="LC_warning">'.
-                   &mt('Items checked for deletion will not be included amongst the files evaluated when your submission is graded.').'</span>';
+                   &mt('Exclude existing file(s) from grading by checking the "Delete?" checkbox(es) and clicking "Submit Answer"').'</span>';
     }
     if (@bad_file_list) {
         my $bad_files = '<span class="LC_filename">'.
@@ -685,7 +684,8 @@ sub valid_award {
 			       'UNIT_INVALID_STUDENT', 'UNIT_IRRECONCIBLE',
 			       'UNIT_FAIL', 'NO_UNIT',
 			       'UNIT_NOTNEEDED', 'WANTED_NUMERIC',
-			       'BAD_FORMULA', 'INTERNAL_ERROR', 'SIG_FAIL', 'INCORRECT', 
+			       'BAD_FORMULA', 'NOT_FUNCTION', 'WRONG_FORMAT', 
+                               'INTERNAL_ERROR', 'SIG_FAIL', 'INCORRECT', 
 			       'MISORDERED_RANK', 'INVALID_FILETYPE',
                                'EXCESS_FILESIZE', 'FILENAME_INUSE', 
 			       'DRAFT', 'SUBMITTED', 'SUBMITTED_CREDIT', 
@@ -702,7 +702,8 @@ sub valid_award {
 		  'TOO_LONG',
 		  'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT',
 		  'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT',
-		  'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'INTERNAL_ERROR',
+		  'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA',  'NOT_FUNCTION', 
+                  'WRONG_FORMAT', 'INTERNAL_ERROR',
 		  'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK',
 		  'INVALID_FILETYPE', 'EXCESS_FILESIZE', 'FILENAME_INUSE', 
                   'DRAFT', 'SUBMITTED',
@@ -989,7 +990,15 @@ sub decideoutput {
         if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Formula_Answers')};
 	$css_class=$possible_class{'not_charged_try'};
 	$button=1;
-    } elsif ($award eq 'INTERNAL_ERROR') {
+    } elsif ($award eq 'NOT_FUNCTION') {
+        $message = &mt("Not a function").'.';
+        $css_class=$possible_class{'not_charged_try'};
+        $button=1;
+    } elsif ($award eq 'WRONG_FORMAT') {
+        $message = &mt("Wrong format").'.';
+        $css_class=$possible_class{'not_charged_try'};
+        $button=1;
+     } elsif ($award eq 'INTERNAL_ERROR') {
         $message = &mt("An internal error occurred while processing your answer. Please try again later.");
         $css_class=$possible_class{'not_charged_try'};
         $button=1;
@@ -1266,7 +1275,7 @@ sub setgradedata {
 	&Apache::response::add_to_gradingqueue();
     }
     if (($Apache::lonhomework::type eq 'anonsurvey') ||
-        ($Apache::lonhomework::type eq 'anonsurveycred') ||
+        ($Apache::lonhomework::type eq 'anonsurveycred') || 
         ($Apache::lonhomework::type eq 'randomizetry')) {
         $Apache::lonhomework::results{"resource.$id.type"} = $Apache::lonhomework::type;
     }
@@ -1496,7 +1505,6 @@ sub previous_tries {
 	$count++;
 	$count_lookup{$i} = $count;
         my $curr_rndseed = $Apache::lonhomework::history{"$prefix.rndseed"};
-
 	my ($previousmsg,$latemessage,$message,$trystr);
 
 	($previousmsg,$latemessage,$message,$trystr) =
@@ -1522,7 +1530,7 @@ sub previous_tries {
                 if ($curr_rndseed ne $lastrndseed) {
                     $trystr .= '<br /><span style="color: green; white-space: nowrap; font-style: italic; font-weight: bold; font-size: 80%;">'.&mt('New problem variation this try.').'</span>';
                 }
-            }
+            } 
 	    $message =~ s{(</td>)}{ $trystr $1};
 	}
 	my ($class) = ($message =~ m{<td.*class="([^"]*)"}); #"