--- loncom/lonnet/perl/lonnet.pm	2000/10/12 02:11:16	1.45
+++ loncom/lonnet/perl/lonnet.pm	2000/10/16 09:42:50	1.46
@@ -48,6 +48,7 @@
 #                      be found, replicates and subscribes to the file
 # filelocation(dir,file) : returns a farily clean absolute reference to file 
 #                          from the directory dir
+# hreflocation(dir,file) : same as filelocation, but for hrefs
 #
 # 6/1/99,6/2,6/10,6/11,6/12,6/14,6/26,6/28,6/29,6/30,
 # 7/1,7/2,7/9,7/10,7/12,7/14,7/15,7/19,
@@ -62,7 +63,7 @@
 # 08/22,08/28,08/31,09/01,09/02,09/04,09/05,09/25,09/28,09/30 Gerd Kortemeyer
 # 10/04 Gerd Kortemeyer
 # 10/04 Guy Albertelli
-# 10/06,10/09,10/10,10/11 Gerd Kortemeyer
+# 10/06,10/09,10/10,10/11,10/14 Gerd Kortemeyer
 
 package Apache::lonnet;
 
@@ -1144,11 +1145,21 @@ sub filelocation {
     $location = '/home/httpd/html/res'.$file;
   }
   $location=~s://+:/:g; # remove duplicate /
-  while ($location=~m:/../:) {$location=~ s:/[^/]+/\.\./:/:g;} #remove dir/..
-
+  while ($location=~m:/\.\./:) {$location=~ s:/[^/]+/\.\./:/:g;} #remove dir/..
   return $location;
 }
 
+sub hreflocation {
+    my ($dir,$file)=@_;
+    unless (($_=~/^http:\/\//i) || ($_=~/^\//)) {
+       my $finalpath=filelocation($dir,$file);
+       $finalpath=~s/^\/home\/httpd\/html//;
+       return $finalpath;
+    } else {
+       return $file;
+    }
+}
+
 # ------------------------------------------------------------- Declutters URLs
 
 sub declutter {