--- loncom/lonnet/perl/lonnet.pm	2000/10/31 19:28:11	1.56
+++ loncom/lonnet/perl/lonnet.pm	2000/10/31 22:32:32	1.57
@@ -885,7 +885,9 @@ sub allowed {
                if (($ENV{$prefix.'res.'.$uri.'.lock.sections'}=~/\,$csec\,/)
                 || ($ENV{$prefix.'res.'.$uri.'.lock.sections'} eq 'all')) {
 		   if ($ENV{$prefix.'res.'.$uri.'.lock.expire'}>time) {
-                       &log('Locked by res: '.$priv.' for '.$uri.' due to '.
+                       &log($ENV{'user.domain'},$ENV{'user.name'},
+                            $ENV{'user.host'},
+                            'Locked by res: '.$priv.' for '.$uri.' due to '.
                             $cdom.'/'.$cnum.'/'.$csec.' expire '.
                             $ENV{$prefix.'priv.'.$priv.'.lock.expire'});
 		       return '';
@@ -894,7 +896,9 @@ sub allowed {
                if (($ENV{$prefix.'priv.'.$priv.'.lock.sections'}=~/\,$csec\,/)
                 || ($ENV{$prefix.'priv.'.$priv.'.lock.sections'} eq 'all')) {
 		   if ($ENV{'priv.'.$priv.'.lock.expire'}>time) {
-                       &log('Locked by priv: '.$priv.' for '.$uri.' due to '.
+                       &log($ENV{'user.domain'},$ENV{'user.name'},
+                            $ENV{'user.host'},
+                            'Locked by priv: '.$priv.' for '.$uri.' due to '.
                             $cdom.'/'.$cnum.'/'.$csec.' expire '.
                             $ENV{$prefix.'priv.'.$priv.'.lock.expire'});
 		       return '';
@@ -923,7 +927,8 @@ sub allowed {
        my $rolecode=(split(/\./,$ENV{'request.role'}))[0];
        if ($ENV{'course.'.$ENV{'request.course.id'}.'.'.$priv.'.roles.denied'}
 	   =~/\,$rolecode\,/) {
-           &log('Denied by role: '.$priv.' for '.$uri.' as '.$rolecode.' in '.
+           &log($ENV{'user.domain'},$ENV{'user.name'},$ENV{'user.host'},
+                'Denied by role: '.$priv.' for '.$uri.' as '.$rolecode.' in '.
                 $ENV{'request.course.id'});
            return '';
        }
@@ -942,7 +947,8 @@ sub allowed {
 	   }
            if (join('',@content)=~
                     /\<roledeny[^\>]*\>[^\<]*$rolecode[^\<]*\<\/roledeny\>/) {
-	       &log('Denied by role: '.$priv.' for '.$uri.' as '.$rolecode);
+	       &log($ENV{'user.domain'},$ENV{'user.name'},$ENV{'user.host'},
+                    'Denied by role: '.$priv.' for '.$uri.' as '.$rolecode);
            return '';
 
            }
@@ -1195,15 +1201,21 @@ sub varval {
     } else {
        $rest='';
     }
+    my $qualifierrest=$qualifier;
+    if ($rest) { $qualifierrest.='.'.$rest; }
+    my $spacequalifierrest=$space;
+    if ($qualifierrest) { $spacequalifierrest.='.'.$qualifierrest; }
     if ($realm eq 'user') {
 # --------------------------------------------------------------- user.resource
 	if ($space eq 'resource') {
+	    my %restored=&restore;
+            return $restored{$qualifierrest};
 # ----------------------------------------------------------------- user.access
         } elsif ($space eq 'access') {
             return &allowed($qualifier,$rest);
 # ------------------------------------------ user.preferences, user.environment
         } elsif (($space eq 'preferences') || ($space eq 'environment')) {
-            return $ENV{join('.',('environment',$qualifier,$rest))};
+            return $ENV{join('.',('environment',$qualifierrest))};
 # ----------------------------------------------------------------- user.course
         } elsif ($space eq 'course') {
             return $ENV{join('.',('request.course',$qualifier))};
@@ -1231,33 +1243,42 @@ sub varval {
 # ------------------------------------------------------------- request.browser
         if ($space eq 'browser') {
 	    return $ENV{'browser.'.$qualifier};
-        } elsif ($space eq 'filename') {
-            return $ENV{'request.filename'};
+# ------------------------------------------------------------ request.filename
+        } else {
+            return $ENV{'request.'.$spacequalifierrest};
         }
     } elsif ($realm eq 'course') {
 # ---------------------------------------------------------- course.description
-        if ($space eq 'description') {
-            my %reply=&coursedescription($ENV{'request.course.id'});
-            return $reply{'description'};
-# ------------------------------------------------------------------- course.id
-        } elsif ($space eq 'id') {
-            return $ENV{'request.course.id'};
-# -------------------------------------------------- Any other course namespace
-        } else {
-	    my ($cdom,$cnam)=split(/\_/,$ENV{'request.course.id'});
-	    my $chome=&homeserver($cnam,$cdom);
-            my $item=join('.',($qualifier,$rest));
-            return &unescape
-                   (&reply('get:'.$cdom.':'.$cnam.':'.&escape($space).':'.
-			   &escape($item),$chome));
+        my $section='';
+        if ($ENV{'request.course.sec'}) {
+	    $section='_'.$ENV{'request.course.sec'};
         }
+        return $ENV{'course.'.$ENV{'request.course.id'}.$section.'.'.
+                              $spacequalifierrest};
+    } elsif ($realm eq 'resource') {
+# ----------------------------------------------------------- resource metadata
+	my $uri=&declutter($ENV{'request.filename'});
+        my $filename=$perlvar{'lonDocRoot'}.'/res/'.$ENV.'.meta';
+        if (-e $filename) {
+            my @content;
+            {
+             my $fh=Apache::File->new($filename);
+             @content=<$fh>;
+            }
+            if (join('',@content)=~
+                 /\<$space[^\>]*\>([^\<]*)\<\/$space\>/) {
+	        return $1;
+            } else {
+                return '';
+            }
+         }
     } elsif ($realm eq 'userdata') {
         my $uhome=&homeserver($qualifier,$space);
 # ----------------------------------------------- userdata.domain.name.resource
 # ---------------------------------------------------- Any other user namespace
     } elsif ($realm eq 'environment') {
 # ----------------------------------------------------------------- environment
-        return $ENV{join('.',($space,$qualifier,$rest))};
+        return $ENV{$spacequalifierrest};
     } elsif ($realm eq 'system') {
 # ----------------------------------------------------------------- system.time
 	if ($space eq 'time') {