--- loncom/lonnet/perl/lonnet.pm	2002/05/17 19:52:42	1.224
+++ loncom/lonnet/perl/lonnet.pm	2002/05/21 13:06:07	1.229
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.224 2002/05/17 19:52:42 albertel Exp $
+# $Id: lonnet.pm,v 1.229 2002/05/21 13:06:07 stredwic Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -481,21 +481,22 @@ sub authenticate {
 # ---------------------- Find the homebase for a user from domain's lib servers
 
 sub homeserver {
-    my ($uname,$udom)=@_;
+    my ($uname,$udom, $cacheBadFlag)=@_;
     my $index="$uname:$udom";
     if ($homecache{$index}) { 
         return "$homecache{$index}"; 
     }
     my $tryserver;
     foreach $tryserver (keys %libserv) {
-        next if (exists($badhomecache{$index}->{$tryserver}));
+        next if ($cacheBadFlag eq 'true' && 
+		 exists($badhomecache{$index}->{$tryserver}));
 	if ($hostdom{$tryserver} eq $udom) {
            my $answer=reply("home:$udom:$uname",$tryserver);
            if ($answer eq 'found') { 
               $homecache{$index}=$tryserver;
               return $tryserver; 
            } else {
-               $badhomecache{$index}->{$tryserver}=1;
+	       $badhomecache{$index}->{$tryserver}=1;
            }
        } else {
            $badhomecache{$index}->{$tryserver}=1;
@@ -2763,6 +2764,7 @@ sub hreflocation {
     unless (($file=~/^http:\/\//i) || ($file=~/^\//)) {
        my $finalpath=filelocation($dir,$file);
        $finalpath=~s/^\/home\/httpd\/html//;
+       $finalpath=~s-/home/(\w+)/public_html/-/~$1/-;
        return $finalpath;
     } else {
        return $file;
@@ -2804,21 +2806,8 @@ sub goodbye {
 }
 
 BEGIN {
-# ---------------------------------- Read loncapa_apache.conf and loncapa.conf
-# (eventually access.conf will become deprecated)
+# ----------------------------------- Read loncapa.conf and loncapa_apache.conf
     unless ($readit) {
-
-{
-    my $config=Apache::File->new("/etc/httpd/conf/loncapa_apache.conf");
-
-    while (my $configline=<$config>) {
-        if ($configline =~ /^[^\#]*PerlSetVar/) {
-	   my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);
-           chomp($varvalue);
-           $perlvar{$varname}=$varvalue;
-        }
-    }
-}
 {
     my $config=Apache::File->new("/etc/httpd/conf/loncapa.conf");