--- loncom/homework/inputtags.pm	2014/11/07 22:00:17	1.327
+++ loncom/homework/inputtags.pm	2014/12/22 17:04:03	1.329
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.327 2014/11/07 22:00:17 raeburn Exp $
+# $Id: inputtags.pm,v 1.329 2014/12/22 17:04:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -641,7 +641,7 @@ sub file_selector {
     my $current_files_display = &current_file_submissions($part,$id);
     my $addfiles;
     if ($current_files_display) {
-        $result .= &Apache::lonhtmlcommon::row_title(&mt('Currently submitted files')).
+        $result .= &Apache::lonhtmlcommon::row_title(&mt('Files currently selected for submission')).
                    $current_files_display.
                    &Apache::lonhtmlcommon::row_closure();
         $addfiles = &mt('Submit other file(s)');
@@ -699,6 +699,15 @@ sub current_file_submissions {
     my $uploadedfile=$Apache::lonhomework::history{"resource.$part.$id.uploadedfile"};
     my $portfiles=$Apache::lonhomework::history{"resource.$part.$id.portfiles"};
     return if (($uploadedfile eq '') && ($portfiles !~/[^\s]/));
+    my @unversioned;
+    foreach my $file (split(/\s*,\s*/,&unescape($portfiles))) {
+        my ($path,$name) = ($file =~ m{^(.*/)([^/]+)$});
+        my ($origname,$version,$ext) = &Apache::lonnet::file_name_version_ext($name);
+        unless ($version) {
+            push(@unversioned,$file);
+        }    
+    }
+    return if (!@unversioned);
     my $header = &portpath_popup_js().
                  &Apache::loncommon::start_data_table().
                  &Apache::loncommon::start_data_table_header_row();
@@ -709,7 +718,7 @@ sub current_file_submissions {
                  '<th>'.&mt('Size (MB)').'</th>'.
                  '<th>'.&mt('Last Modified').'</th>'.
                  &Apache::loncommon::end_data_table_header_row();
-    my (undef,$crsid,$udom,$uname)=&Apache::lonnet::whichuser();
+    my ($symb,$crsid,$udom,$uname)=&Apache::lonnet::whichuser();
     my ($cdom,$cnum) = ($crsid =~ /^($LONCAPA::match_domain)_($LONCAPA::match_courseid)$/);
     my ($result,$header_shown,%okfiles,%rows,%legacy,@bad_file_list);
     if ($uploadedfile) {
@@ -728,9 +737,9 @@ sub current_file_submissions {
             push(@bad_file_list,$error);
         }
     }
-    if ($portfiles =~ /[^\s]/) {
+    if (@unversioned > 0) {
         my $prefix = "/uploaded/$udom/$uname/portfolio";
-        foreach my $file (split(/\s*,\s*/,&unescape($portfiles))) {
+        foreach my $file (@unversioned) {
             my ($path,$name) = ($file =~ m{^(.*/)([^/]+)$});
             my $url = $prefix.$path.$name;
             my $uploadedfile = &HTML::Entities::encode($url,'<>&"');
@@ -878,7 +887,7 @@ END
 sub valid_award {
     my ($award) =@_;
     foreach my $possibleaward ('EXTRA_ANSWER','MISSING_ANSWER', 'ERROR',
-			       'NO_RESPONSE',
+			       'NO_RESPONSE','WRONG_NUMBOXESCHECKED',
 			       'TOO_LONG', 'UNIT_INVALID_INSTRUCTOR',
 			       'UNIT_INVALID_STUDENT', 'UNIT_IRRECONCIBLE',
 			       'UNIT_FAIL', 'NO_UNIT',
@@ -898,7 +907,7 @@ sub valid_award {
 
 {
     my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE',
-		  'TOO_LONG',
+		  'WRONG_NUMCHECKEDBOXES','TOO_LONG',
 		  'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT',
 		  'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT',
 		  'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA',  'NOT_FUNCTION', 
@@ -1125,6 +1134,13 @@ sub decideoutput {
         }
 	$css_class=$possible_class{'not_charged_try'};
 	$button = 1;
+    } elsif ($award eq 'WRONG_NUMBOXESCHECKED') {
+        $message = &mt('Number of boxes checked outside permissible range (either too few or too many).');
+        if ($target ne 'tex') {
+           $message .= &Apache::loncommon::help_open_topic('Wrong_Num_Boxes_Checked');
+        }
+        $css_class=$possible_class{'not_charged_try'};
+        $button = 1;
     } elsif ($award eq 'ERROR') {
 	$message = &mt('An error occurred while grading your answer.');
 	$css_class=$possible_class{'not_charged_try'};