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

[albertel]

albertel		Wed Jan 11 03:24:21 2006 EDT

  Modified files:              
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - when decluttering need to remove adm/wrapper bit first (since it might be a /adm/wrapper/res resource)
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.696 loncom/lonnet/perl/lonnet.pm:1.697
--- loncom/lonnet/perl/lonnet.pm:1.696	Wed Jan 11 03:08:23 2006
+++ loncom/lonnet/perl/lonnet.pm	Wed Jan 11 03:24:21 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.696 2006/01/11 08:08:23 albertel Exp $
+# $Id: lonnet.pm,v 1.697 2006/01/11 08:24:21 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -6149,10 +6149,10 @@
     if ($thisfn=~m|^/enc/|) { $thisfn=&Apache::lonenc::unencrypted($thisfn); }
     $thisfn=~s/^\Q$perlvar{'lonDocRoot'}\E//;
     $thisfn=~s/^\///;
-    $thisfn=~s/^res\///;
-    $thisfn=~s/\?.+$//;
     $thisfn=~s|^adm/wrapper/||;
     $thisfn=~s|^adm/coursedocs/showdoc/||;
+    $thisfn=~s/^res\///;
+    $thisfn=~s/\?.+$//;
     return $thisfn;
 }