--- loncom/lonnet/perl/lonnet.pm	2000/11/14 14:58:59	1.61
+++ loncom/lonnet/perl/lonnet.pm	2000/11/15 23:25:59	1.64
@@ -67,7 +67,7 @@
 # 10/04 Gerd Kortemeyer
 # 10/04 Guy Albertelli
 # 10/06,10/09,10/10,10/11,10/14,10/20,10/23,10/25,10/26,10/27,10/28,10/29, 
-# 10/30,10/31,11/2,11/14 Gerd Kortemeyer
+# 10/30,10/31,11/2,11/14,11/15 Gerd Kortemeyer
 
 package Apache::lonnet;
 
@@ -369,6 +369,9 @@ sub subscribe {
         return 'not_found'; 
     }
     my $answer=reply("sub:$fname",$home);
+    if (($answer eq 'con_lost') || ($answer eq 'rejected')) {
+	$answer.=' by '.$home;
+    }
     return $answer;
 }
     
@@ -380,14 +383,14 @@ sub repcopy {
     my $transname="$filename.in.transfer";
     if ((-e $filename) || (-e $transname)) { return OK; }
     my $remoteurl=subscribe($filename);
-    if ($remoteurl eq 'con_lost') {
-	   &logthis("Subscribe returned con_lost: $filename");
+    if ($remoteurl =~ /^con_lost by/) {
+	   &logthis("Subscribe returned $remoteurl: $filename");
            return HTTP_SERVICE_UNAVAILABLE;
     } elsif ($remoteurl eq 'not_found') {
 	   &logthis("Subscribe returned not_found: $filename");
 	   return HTTP_NOT_FOUND;
-    } elsif ($remoteurl eq 'rejected') {
-	   &logthis("Subscribe returned rejected: $filename");
+    } elsif ($remoteurl =~ /^rejected by/) {
+	   &logthis("Subscribe returned $remoteurl: $filename");
            return FORBIDDEN;
     } elsif ($remoteurl eq 'directory') {
            return OK;
@@ -1264,11 +1267,12 @@ sub EXT {
             $ENV{'request.course.id'}.'.'.$spacequalifierrest;
 
 # ----------------------------------------------------------- first, check user
-       my %resourcedata=get('resourcedata',($reslevel,$seclevel,$courselevel));
+      my %resourcedata=get('resourcedata',($reslevel,$seclevel,$courselevel));
+      if ($resourcedata{$reslevel}!~/^error\:/) {
        if ($resourcedata{$reslevel}) { return $resourcedata{$reslevel}; }
        if ($resourcedata{$seclevel}) { return $resourcedata{$seclevel}; }
        if ($resourcedata{$courselevel}) { return $resourcedata{$courselevel}; }
-
+      }
 # -------------------------------------------------------- second, check course
         my $section='';
         if ($ENV{'request.course.sec'}) {
@@ -1280,13 +1284,15 @@ sub EXT {
               ':resourcedata:'.
               escape($reslevel).':'.escape($seclevel).':'.escape($courselevel),
 		   $ENV{'course.'.$ENV{'request.course.id'}.$section.'.home'});
+      if ($reply!~/^error\:/) {
         map {
            my ($name,$value)=split(/\=/,$_);
            $resourcedata{unescape($name)}=unescape($value);  
         } split(/\&/,$reply);
        if ($resourcedata{$reslevel}) { return $resourcedata{$reslevel}; }
-       if ($resourcedata{$seclevel}) { return $resourcedata{$seclevel}; }
+       if ($resourcedata{$seclevel}) { return $resourcedata{$seclevel}; }  
        if ($resourcedata{$courselevel}) { return $resourcedata{$courselevel}; }
+      }
 
 # ------------------------------------------------------ third, check map parms
        
@@ -1368,6 +1374,7 @@ sub symbread {
     my %hash;
     my %bighash;
     my $syval='';
+    my $parms='';
     if (($ENV{'request.course.fn'}) && ($thisfn)) {
         if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'_symb.db',
                       &GDBM_READER,0640)) {
@@ -1395,6 +1402,7 @@ sub symbread {
                  if ($#possibilities==0) {
 # ----------------------------------------------- There is only one possibility
 		     my ($mapid,$resid)=split(/\./,$ids);
+                     $parms=$bighash{'param_'.$ids};
                      $syval=declutter($bighash{'map_id_'.$mapid}).'___'.$resid;
                  } else {
 # ------------------------------------------ There is more than one possibility
@@ -1405,6 +1413,7 @@ sub symbread {
          		    my ($mapid,$resid)=split(/\./,$_);
                             if ($bighash{'map_type_'.$mapid} ne 'page') {
 				$realpossible++;
+                                $parms=$bighash{'param_'.$_};
                                 $syval=declutter($bighash{'map_id_'.$mapid}).
                                        '___'.$resid;
                             }
@@ -1416,7 +1425,12 @@ sub symbread {
               untie(%bighash)
            } 
         }
-        if ($syval) { return $syval.'___'.$thisfn; }
+        if ($syval) {
+           if ($parms) {
+	       &appendparms($syval.'___'.$thisfn,$parms);
+           }
+           return $syval.'___'.$thisfn; 
+        }
     }
     &appenv('request.ambiguous' => $thisfn);
     return '';