[LON-CAPA-cvs] cvs: loncom /interface lonindexer.pm /lonnet/perl lonnet.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Wed, 06 Aug 2003 16:43:37 -0000
albertel Wed Aug 6 12:43:37 2003 EDT
Modified files:
/loncom/lonnet/perl lonnet.pm
/loncom/interface lonindexer.pm
Log:
1. When list /res there is no reason to do any network calls, as it was
we were trying to do bre checks on /res/msu//res/msu
which is
a) wrong
b) doesn't have a trailing / so metdata tried to get metadata
which meant we tried to do a repcopy, which meant we tried to find what home server
user res in domain msu was on which is
i) stupid
ii) kinda funny
iii) cuased us to try to do a network call to everymachine
2. Fixes BUG1963, since we no longer make any network calls when listing /res
3. Have I mentioned how much I love the caller function. Introspection is so much fun.
4. One last line in an attempt to pad out my commit message
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.396 loncom/lonnet/perl/lonnet.pm:1.397
--- loncom/lonnet/perl/lonnet.pm:1.396 Tue Jul 29 01:29:21 2003
+++ loncom/lonnet/perl/lonnet.pm Wed Aug 6 12:43:36 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network
# TCP networking package
#
-# $Id: lonnet.pm,v 1.396 2003/07/29 05:29:21 albertel Exp $
+# $Id: lonnet.pm,v 1.397 2003/08/06 16:43:36 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -3070,7 +3070,7 @@
}
my $alldomstr='';
foreach (sort keys %alldom) {
- $alldomstr.=$perlvar{'lonDocRoot'}.'/res/'.$_.'&domain:';
+ $alldomstr.=$perlvar{'lonDocRoot'}.'/res/'.$_.'/&domain:';
}
$alldomstr=~s/:$//;
return split(/:/,$alldomstr);
Index: loncom/interface/lonindexer.pm
diff -u loncom/interface/lonindexer.pm:1.71 loncom/interface/lonindexer.pm:1.72
--- loncom/interface/lonindexer.pm:1.71 Tue Jul 22 15:00:51 2003
+++ loncom/interface/lonindexer.pm Wed Aug 6 12:43:36 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Directory Indexer
#
-# $Id: lonindexer.pm,v 1.71 2003/07/22 19:00:51 ng Exp $
+# $Id: lonindexer.pm,v 1.72 2003/08/06 16:43:36 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -554,8 +554,8 @@
}
if ($dom eq 'domain') {
- $compuri = join('',$strip,'/'); # dom list has /res/<domain name>
- $curdir = $compuri;
+ # dom list has full path /res/<domain name>/ already
+ $curdir='';
} else {
# user, dir & file have name only, i.e., w/o path
$compuri = join('',$startdir,$strip,'/');