[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /homework grades.pm

[raeburn]

raeburn		Wed Jul  3 13:12:44 2024 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/homework	grades.pm 
  Log:
  - For 2.11
    Backport 1.789, 1.790
  
  
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.596.2.12.2.61 loncom/homework/grades.pm:1.596.2.12.2.62
--- loncom/homework/grades.pm:1.596.2.12.2.61	Mon Jul  1 22:51:46 2024
+++ loncom/homework/grades.pm	Wed Jul  3 13:12:44 2024
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.596.2.12.2.61 2024/07/01 22:51:46 raeburn Exp $
+# $Id: grades.pm,v 1.596.2.12.2.62 2024/07/03 13:12:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -9389,7 +9389,7 @@
                             my @lines = &Apache::lonnet::get_scantronformat_file();
                             my $count = 0;
                             foreach my $line (@lines) {
-                                next if ($line =~ /^#/);
+                                next if (($line =~ /^\#/) || ($line eq ''));
                                 $singleline = $line;
                                 $count ++;
                             }
@@ -9551,7 +9551,7 @@
         my %unique_formats;
         my @formatlines = &Apache::lonnet::get_scantronformat_file();
         foreach my $line (@formatlines) {
-            chomp($line);
+            next if (($line =~ /^\#/) || ($line eq ''));
             my @config = split(/:/,$line);
             my $idstart = $config[5];
             my $idlength = $config[6];