--- loncom/lonnet/perl/lonnet.pm 2001/10/02 18:32:56 1.160
+++ loncom/lonnet/perl/lonnet.pm 2001/10/16 08:53:19 1.164
@@ -118,6 +118,7 @@
# 05/01,06/01,09/01 Gerd Kortemeyer
# 09/01 Guy Albertelli
# 09/01,10/01,11/01 Gerd Kortemeyer
+# YEAR=2001
# 02/27/01 Scott Harrison
# 3/2 Gerd Kortemeyer
# 3/15,3/19 Scott Harrison
@@ -129,6 +130,8 @@
# July Guy Albertelli
# 8/4,8/7,8/8,8/9,8/11,8/16,8/17,8/18,8/20,8/23,9/20,9/21,9/26,
# 10/2 Gerd Kortemeyer
+# 10/5,10/10 Scott Harrison
+# 10/15 Gerd Kortemeyer
package Apache::lonnet;
@@ -146,6 +149,16 @@ use Fcntl qw(:flock);
# --------------------------------------------------------------------- Logging
+sub logtouch {
+ my $execdir=$perlvar{'lonDaemons'};
+ unless (-e "$execdir/logs/lonnet.log") {
+ my $fh=Apache::File->new(">>$execdir/logs/lonnet.log");
+ close $fh;
+ }
+ my ($wwwuid,$wwwgid)=(getpwnam('www'))[2,3];
+ chown($wwwuid,$wwwgid,$execdir.'/logs/lonnet.log');
+}
+
sub logthis {
my $message=shift;
my $execdir=$perlvar{'lonDaemons'};
@@ -1898,10 +1911,6 @@ sub EXT {
$spacequalifierrest};
} elsif ($realm eq 'resource') {
if ($ENV{'request.course.id'}) {
-
-# print '
'.$space.' - '.$qualifier.' - '.$spacequalifierrest;
-
-
# ----------------------------------------------------- Cascading lookup scheme
my $symbp;
if ($symbparm) {
@@ -1999,7 +2008,7 @@ sub EXT {
# ------------------------------------------------------------------ Cascade up
unless ($space eq '0') {
- my ($part,$id)=split(/\_/,$space);
+ my ($part,$id)=split(/(\.|\_)/,$space);
if ($id) {
my $partgeneral=&EXT('resource.'.$part.'.'.$qualifierrest,
$symbparm);
@@ -2048,7 +2057,7 @@ sub metadata {
$keyroot.='_'.$token->[2]->{'part'};
}
if (defined($token->[2]->{'id'})) {
- $keyroot.='_'.$token->[2]->{'id'};
+ $keyroot.='.'.$token->[2]->{'id'};
}
if ($metacache{$uri.':packages'}) {
$metacache{$uri.':packages'}.=','.$package.$keyroot;
@@ -2061,6 +2070,7 @@ sub metadata {
my $value=$packagetab{$_};
my $part=$keyroot;
$part=~s/^\_//;
+ $part=~s/\./\_/g;
if ($subp eq 'display') {
$value.=' [Part: '.$part.']';
}
@@ -2080,7 +2090,7 @@ sub metadata {
$unikey.='_'.$token->[2]->{'part'};
}
if (defined($token->[2]->{'id'})) {
- $unikey.='_'.$token->[2]->{'id'};
+ $unikey.='.'.$token->[2]->{'id'};
}
if (defined($token->[2]->{'name'})) {
$unikey.='_'.$token->[2]->{'name'};
@@ -2421,6 +2431,7 @@ unless ($readit) {
%metacache=();
$readit='done';
+&logtouch();
&logthis('INFO: Read configuration');
}
}