[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /lonnet/perl lonnet.pm

[raeburn]

raeburn		Wed Jul  3 19:07:47 2024 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - For 2.11
    Backport 1.1485, 1.1487, 1.1488
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1172.2.149 loncom/lonnet/perl/lonnet.pm:1.1172.2.150
--- loncom/lonnet/perl/lonnet.pm:1.1172.2.149	Tue Jul  2 21:40:21 2024
+++ loncom/lonnet/perl/lonnet.pm	Wed Jul  3 19:07:47 2024
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1172.2.149 2024/07/02 21:40:21 raeburn Exp $
+# $Id: lonnet.pm,v 1.1172.2.150 2024/07/03 19:07:47 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4551,6 +4551,7 @@
                 close($fh);
             }
         }
+        chomp(@lines);
     }
     return @lines;
 }
@@ -12724,17 +12725,10 @@
     my %bighash;
     my $syval='';
     if (($env{'request.course.fn'}) && ($thisfn)) {
-        my $targetfn = $thisfn;
-        if ( ($thisfn =~ m/^(uploaded|editupload)\//) && ($thisfn !~ m/\.(page|sequence)$/) ) {
-            $targetfn = 'adm/wrapper/'.$thisfn;
-        }
-	if ($targetfn =~ m|^adm/wrapper/(ext/.*)|) {
-	    $targetfn=$1;
-	}
         unless ($ignoresymbdb) {
             if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
                           &GDBM_READER(),0640)) {
-	        $syval=$hash{$targetfn};
+	        $syval=$hash{$thisfn};
                 untie(%hash);
             }
             if ($syval && $checkforblock) {