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

[www]

www		Sat Aug 17 15:50:18 2002 EDT

  Modified files:              
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  Can now load top-level map from userfile space.
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.269 loncom/lonnet/perl/lonnet.pm:1.270
--- loncom/lonnet/perl/lonnet.pm:1.269	Sat Aug 17 14:58:28 2002
+++ loncom/lonnet/perl/lonnet.pm	Sat Aug 17 15:50:17 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.269 2002/08/17 18:58:28 www Exp $
+# $Id: lonnet.pm,v 1.270 2002/08/17 19:50:17 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1435,7 +1435,7 @@
            while (my ($name,$value) = each %returnhash) {
                $envhash{'course.'.$normalid.'.'.$name}=$value;
            }
-           $returnhash{'url'}='/res/'.declutter($returnhash{'url'});
+           $returnhash{'url'}=&clutter($returnhash{'url'});
            $returnhash{'fn'}=$perlvar{'lonDaemons'}.'/tmp/'.
 	       $ENV{'user.name'}.'_'.$cdomain.'_'.$cnum;
            $envhash{'course.'.$normalid.'.last_cache'}=time;
@@ -3109,6 +3109,8 @@
   if ($file=~m:^/~:) { # is a contruction space reference
     $location = $file;
     $location =~ s:/~(.*?)/(.*):/home/$1/public_html/$2:;
+  } elsif ($file=~/^\/*uploaded/) { # is an uploaded file
+    $location=$file;
   } else {
     $file=~s/^$perlvar{'lonDocRoot'}//;
     $file=~s:^/*res::;
@@ -3150,7 +3152,9 @@
 
 sub clutter {
     my $thisfn='/'.&declutter(shift);
-    unless ($thisfn=~/^\/(uploaded|adm)\//) { $thisfn='/res'.$thisfn; }
+    unless ($thisfn=~/^\/(uploaded|adm|userfiles|ext|raw|priv)\//) { 
+       $thisfn='/res'.$thisfn; 
+    }
     return $thisfn;
 }