--- loncom/lonnet/perl/lonnet.pm 2001/10/05 17:54:36 1.161 +++ loncom/lonnet/perl/lonnet.pm 2001/10/16 08:53:19 1.164 @@ -130,7 +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 Scott Harrison +# 10/5,10/10 Scott Harrison +# 10/15 Gerd Kortemeyer package Apache::lonnet; @@ -148,14 +149,23 @@ 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'}; my $now=time; my $local=localtime($now); - my $fh; - $fh=Apache::File->new(">>$execdir/logs/lonnet.log") and - print $fh "$local ($$): $message\n"; + my $fh=Apache::File->new(">>$execdir/logs/lonnet.log"); + print $fh "$local ($$): $message\n"; return 1; } @@ -164,9 +174,8 @@ sub logperm { my $execdir=$perlvar{'lonDaemons'}; my $now=time; my $local=localtime($now); - my $fh; - $fh=Apache::File->new(">>$execdir/logs/lonnet.perm.log") and - print $fh "$now:$message:$local\n"; + my $fh=Apache::File->new(">>$execdir/logs/lonnet.perm.log"); + print $fh "$now:$message:$local\n"; return 1; } @@ -1902,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) { @@ -2003,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); @@ -2052,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; @@ -2065,6 +2070,7 @@ sub metadata { my $value=$packagetab{$_}; my $part=$keyroot; $part=~s/^\_//; + $part=~s/\./\_/g; if ($subp eq 'display') { $value.=' [Part: '.$part.']'; } @@ -2084,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'}; @@ -2425,6 +2431,7 @@ unless ($readit) { %metacache=(); $readit='done'; +&logtouch(); &logthis('INFO: Read configuration'); } }