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

[albertel]

albertel		Tue Jan 13 11:33:37 2004 EDT

  Modified files:              
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - Fixes #2577, how about we return something when we didn't have to do anything too.
  
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.461 loncom/lonnet/perl/lonnet.pm:1.462
--- loncom/lonnet/perl/lonnet.pm:1.461	Tue Jan 13 11:29:41 2004
+++ loncom/lonnet/perl/lonnet.pm	Tue Jan 13 11:33:37 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.461 2004/01/13 16:29:41 www Exp $
+# $Id: lonnet.pm,v 1.462 2004/01/13 16:33:37 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4474,13 +4474,14 @@
     unless (($file=~m-^http://-i) || ($file=~m-^/-)) {
 	my $finalpath=filelocation($dir,$file);
 	$finalpath=~s-^/home/httpd/html--;
-	$finalpath=~s-/home/(\w+)/public_html/-/~$1/-;
+	$finalpath=~s-^/home/(\w+)/public_html/-/~$1/-;
 	return $finalpath;
     } elsif ($file=~m-^/home-) {
 	$file=~s-^/home/httpd/html--;
-	$file=~s-/home/(\w+)/public_html/-/~$1/-;
+	$file=~s-^/home/(\w+)/public_html/-/~$1/-;
 	return $file;
     }
+    return $file;
 }
 
 # ------------------------------------------------------------- Declutters URLs