--- loncom/lonnet/perl/lonnet.pm 2004/01/13 16:33:37 1.462 +++ loncom/lonnet/perl/lonnet.pm 2004/01/26 21:58:34 1.464 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.462 2004/01/13 16:33:37 albertel Exp $ +# $Id: lonnet.pm,v 1.464 2004/01/26 21:58:34 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -3822,7 +3822,9 @@ sub packages_tab_default { foreach my $package (split(/,/,$packages)) { my ($pack_type,$pack_part)=split(/_/,$package,2); if ($pack_part eq $part) { - return $packagetab{"$pack_type&$name&default"}; + if (defined($packagetab{"$pack_type&$name&default"})) { + return $packagetab{"$pack_type&$name&default"}; + } } } return undef; @@ -4457,7 +4459,7 @@ sub filelocation { $location=$file; } else { $file=~s/^$perlvar{'lonDocRoot'}//; - $file=~s:^/*res::; + $file=~s:^/res/:/:; if ( !( $file =~ m:^/:) ) { $location = $dir. '/'.$file; } else {