--- loncom/lonnet/perl/lonnet.pm	2001/09/21 20:38:10	1.158
+++ 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
@@ -127,7 +128,10 @@
 # 5/30 H. K. Ng
 # 6/1 Gerd Kortemeyer
 # 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 Gerd Kortemeyer
+# 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;
 
@@ -145,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'};
@@ -1187,6 +1201,12 @@ sub allowed {
 	return 'F';
     }
 
+# Free bre to public access
+
+    if ($priv eq 'bre') {
+	if (&metadata($uri,'copyright') eq 'public') { return 'F'; }
+    }
+
     my $thisallowed='';
     my $statecond=0;
     my $courseprivid='';
@@ -1626,7 +1646,7 @@ sub modifystudent {
 	return 'error: no such user';
     }
 # -------------------------------------------------- Add student to course list
-    my $reply=critical('put:'.$ENV{'course.'.$cid.'.domain'}.':'.
+    $reply=critical('put:'.$ENV{'course.'.$cid.'.domain'}.':'.
 	              $ENV{'course.'.$cid.'.num'}.':classlist:'.
                       &escape($uname.':'.$udom).'='.
                       &escape($end.':'.$start),
@@ -1691,7 +1711,7 @@ sub createcourse {
     my $reply=&reply('encrypt:makeuser:'.$udom.':'.$uname.':none::',
                       $ENV{'user.home'});
     unless ($reply eq 'ok') { return 'error: '.$reply; }
-    my $uhome=&homeserver($uname,$udom);
+    $uhome=&homeserver($uname,$udom);
     if (($uhome eq '') || ($uhome eq 'no_host')) { 
 	return 'error: no such course';
     }
@@ -1891,10 +1911,6 @@ sub EXT {
                               $spacequalifierrest};
     } elsif ($realm eq 'resource') {
        if ($ENV{'request.course.id'}) {
-
-#	   print '<br>'.$space.' - '.$qualifier.' - '.$spacequalifierrest;
-
-
 # ----------------------------------------------------- Cascading lookup scheme
          my $symbp;
          if ($symbparm) {
@@ -1992,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);
@@ -2041,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;
@@ -2054,6 +2070,7 @@ sub metadata {
                       my $value=$packagetab{$_};
 		      my $part=$keyroot;
                       $part=~s/^\_//;
+                      $part=~s/\./\_/g;
                       if ($subp eq 'display') {
 			  $value.=' [Part: '.$part.']';
                       }
@@ -2073,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'}; 
@@ -2317,7 +2334,7 @@ sub unescape {
 # ================================================================ Main Program
 
 sub BEGIN {
-if ($readit ne 'done') {
+unless ($readit) {
 # ------------------------------------------------------------ Read access.conf
 {
     my $config=Apache::File->new("/etc/httpd/conf/access.conf");
@@ -2362,8 +2379,10 @@ if ($readit ne 'done') {
 
     while (my $configline=<$config>) {
        chomp($configline);
+      if ($configline) {
        my ($role,$perm)=split(/ /,$configline);
        if ($perm ne '') { $pr{$role}=$perm; }
+      }
     }
 }
 
@@ -2373,8 +2392,10 @@ if ($readit ne 'done') {
 
     while (my $configline=<$config>) {
        chomp($configline);
+      if ($configline) {
        my ($short,$plain)=split(/:/,$configline);
        if ($plain ne '') { $prp{$short}=$plain; }
+      }
     }
 }
 
@@ -2410,6 +2431,7 @@ if ($readit ne 'done') {
 %metacache=();
 
 $readit='done';
+&logtouch();
 &logthis('<font color=yellow>INFO: Read configuration</font>');
 }
 }