--- loncom/lonnet/perl/lonnet.pm	2000/10/05 19:27:23	1.36
+++ loncom/lonnet/perl/lonnet.pm	2000/10/06 21:00:05	1.37
@@ -59,7 +59,7 @@
 # 08/22,08/28,08/31,09/01,09/02,09/04,09/05,09/25,09/28,09/30 Gerd Kortemeyer
 # 10/04 Gerd Kortemeyer
 # 10/04 Guy Albertelli
-
+# 10/06 Gerd Kortemeyer
 
 package Apache::lonnet;
 
@@ -428,7 +428,7 @@ sub log {
 sub store {
     my %storehash=@_;
     my $symb;
-    unless ($symb=escape(&symbread())) { return ''; }
+    unless ($symb=escape(&symbread($ENV{'request.filename'}))) { return ''; }
     my $namespace;
     unless ($namespace=$ENV{'request.course.id'}) { return ''; }
     my $namevalue='';
@@ -445,7 +445,7 @@ sub store {
 
 sub restore {
     my $symb;
-    unless ($symb=escape(&symbread())) { return ''; }
+    unless ($symb=escape(&symbread($ENV{'request.filename'}))) { return ''; }
     my $namespace;
     unless ($namespace=$ENV{'request.course.id'}) { return ''; }
     my $answer=reply(
@@ -1016,24 +1016,44 @@ sub symblist {
 # ------------------------------------------------------ Return symb list entry
 
 sub symbread {
+    my $thisfn=declutter(shift);
     my %hash;
-    my $syval;
+    my %bighash;
+    my $syval='';
     if (($ENV{'request.course.fn'}) && ($ENV{'request.filename'})) {
         if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'_symb.db',
                       &GDBM_READER,0640)) {
-            my $thisfn=declutter($ENV{'request.filename'});
 	    $syval=$hash{$thisfn};
-            if (untie(%hash)) {
-                unless ($syval=~/\_\d+$/) {
-		   unless ($ENV{'form.request.prefix'}=~/\.(\d+)\_$/) {
-                      return '';
-                   }    
-                   $syval.=$1;
-	        }
-                $syval.='___'.$thisfn;
-		return $syval;
-            }
+            untie(%hash);
         }
+# ---------------------------------------------------------- There was an entry
+        if ($syval) {
+           unless ($syval=~/\_\d+$/) {
+	       unless ($ENV{'form.request.prefix'}=~/\.(\d+)\_$/) {
+                  return '';
+               }    
+               $syval.=$1;
+	   }
+        } else {
+# ------------------------------------------------------- Was not in symb table
+           if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
+                            &GDBM_READER,0640)) {
+# ---------------------------------------------- Get ID(s) for current resource
+              my $ids=$bighash{'ids_/res/'.$thisfn};
+              if ($ids) {
+# ------------------------------------------------------------------- Has ID(s)
+                 my @possibilities=split(/\,/,$ids);
+                 if ($#possibilities==1) {
+		     my ($mapid,$resid)=split(/\./,$ids);
+                     $syval=declutter($bighash{'map_id_'.$mapid}).'___'.$resid;
+                 } else {
+                     $syval='';
+                 }
+	      }
+              untie(%bighash)
+           } 
+        }
+        return $syval.'___'.$thisfn;
     }
     return '';
 }
@@ -1054,7 +1074,7 @@ sub numval {
 
 sub rndseed {
     my $symb;
-    unless ($symb=&symbread()) { return ''; }
+    unless ($symb=&symbread($ENV{'request.filename'})) { return ''; }
     my $symbchck=unpack("%32C*",$symb);
     my $symbseed=numval($symb)%$symbchck;
     my $namechck=unpack("%32C*",$ENV{'user.name'});
@@ -1071,10 +1091,7 @@ sub rndseed {
 # returns either the contents of the file or a -1
 sub getfile {
   my $file=shift;
-  if (! -e $file ) {
-    &subscribe($file);
-    &repcopy($file);
-  }
+  &repcopy($file);
   if (! -e $file ) { return -1; };
   my $fh=Apache::File->new($file);
   my $a='';