--- loncom/lonnet/perl/lonnet.pm 2003/12/12 00:20:08 1.459 +++ loncom/lonnet/perl/lonnet.pm 2004/01/26 22:00:07 1.459.2.2 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.459 2003/12/12 00:20:08 albertel Exp $ +# $Id: lonnet.pm,v 1.459.2.2 2004/01/26 22:00:07 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -3792,7 +3792,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; @@ -4427,7 +4429,7 @@ sub filelocation { $location=$file; } else { $file=~s/^$perlvar{'lonDocRoot'}//; - $file=~s:^/*res::; + $file=~s:^/res/:/:; if ( !( $file =~ m:^/:) ) { $location = $dir. '/'.$file; } else {