[LON-CAPA-cvs] cvs: loncom /homework grades.pm /interface lonprintout.pm /lonnet/perl lonnet.pm

[raeburn]

raeburn		Sat Jun 11 14:20:42 2022 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
    /loncom/homework	grades.pm 
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - Always remove line feeds from lines returned by get_scantronformat_file()
    so chomp() no longer needs to be included when using the output.
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.676 loncom/interface/lonprintout.pm:1.677
--- loncom/interface/lonprintout.pm:1.676	Sat Apr  2 19:14:31 2022
+++ loncom/interface/lonprintout.pm	Sat Jun 11 14:20:41 2022
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.676 2022/04/02 19:14:31 raeburn Exp $
+# $Id: lonprintout.pm,v 1.677 2022/06/11 14:20:41 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3240,7 +3240,6 @@
          my @lines = &Apache::lonnet::get_scantronformat_file();
 	 my ($code_type,$code_length,$bubbles_per_row)=('letter',6,10);
 	 foreach my $line (@lines) {
-             chomp($line);
 	     my ($name,$type,$length,$bubbles_per_item) = 
                  (split(/:/,$line))[0,2,4,17];
 	     if ($name eq $code_option) {
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.788 loncom/homework/grades.pm:1.789
--- loncom/homework/grades.pm:1.788	Wed Feb  9 23:21:11 2022
+++ loncom/homework/grades.pm	Sat Jun 11 14:20:42 2022
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.788 2022/02/09 23:21:11 raeburn Exp $
+# $Id: grades.pm,v 1.789 2022/06/11 14:20:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -9805,7 +9805,6 @@
         my %unique_formats;
         my @formatlines = &Apache::lonnet::get_scantronformat_file();
         foreach my $line (@formatlines) {
-            chomp($line);
             my @config = split(/:/,$line);
             my $idstart = $config[5];
             my $idlength = $config[6];
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1487 loncom/lonnet/perl/lonnet.pm:1.1488
--- loncom/lonnet/perl/lonnet.pm:1.1487	Wed Jun  8 20:49:09 2022
+++ loncom/lonnet/perl/lonnet.pm	Sat Jun 11 14:20:42 2022
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1487 2022/06/08 20:49:09 raeburn Exp $
+# $Id: lonnet.pm,v 1.1488 2022/06/11 14:20:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4918,6 +4918,7 @@
                 close($fh);
             }
         }
+        chomp(@lines);
     }
     return @lines;
 }