--- loncom/homework/inputtags.pm	2010/11/09 17:41:47	1.271.2.1
+++ loncom/homework/inputtags.pm	2010/10/31 12:33:02	1.272
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.271.2.1 2010/11/09 17:41:47 raeburn Exp $
+# $Id: inputtags.pm,v 1.272 2010/10/31 12:33:02 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -576,7 +576,6 @@ sub current_file_submissions {
     }
     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};
@@ -593,8 +592,7 @@ sub current_file_submissions {
                         if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
                             $result .=
                                  '<td valign="bottom"><input type="checkbox" name="HWFILE'.$jspart.'_'.$id.'_delete"'.
-                                 ' value="'.$portfile.'" id="HWFILE'.$jspart.'_'.$id.'_'.$num.'_delete" /></td>'."\n";
-                            $num ++;
+                                 ' value="'.$portfile.'" /></td>'."\n";
                         }
                         my $showname = $rows{$url}{path}.$name;
                         if ($legacy{$url}) {
@@ -612,9 +610,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>';
+        $result .= &Apache::loncommon::end_data_table();
     }
     if (@bad_file_list) {
         my $bad_files = '<span class="LC_filename">'.
@@ -663,7 +659,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', 
@@ -680,7 +677,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',
@@ -967,7 +965,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;