--- loncom/lonnet/perl/lonnet.pm	2006/02/08 23:47:00	1.708
+++ loncom/lonnet/perl/lonnet.pm	2006/02/14 20:28:57	1.711
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.708 2006/02/08 23:47:00 raeburn Exp $
+# $Id: lonnet.pm,v 1.711 2006/02/14 20:28:57 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1145,7 +1145,9 @@ sub ssi {
     my $ua=new LWP::UserAgent;
     
     my $request;
-    
+
+    $form{'no_update_last_known'}=1;
+
     if (%form) {
       $request=new HTTP::Request('POST',"http://".$ENV{'HTTP_HOST'}.$fn);
       $request->content(join('&',map { &escape($_).'='.&escape($form{$_}) } keys %form));
@@ -3450,16 +3452,17 @@ sub allowed {
    return 'F';
 }
 
+sub split_uri_for_cond {
+    my $uri=&deversion(&declutter(shift));
+    my @uriparts=split(/\//,$uri);
+    my $filename=pop(@uriparts);
+    my $pathname=join('/',@uriparts);
+    return ($pathname,$filename);
+}
 # --------------------------------------------------- Is a resource on the map?
 
 sub is_on_map {
-    my $uri=&deversion(&declutter(shift));
-    my @uriparts=split(/\//,$uri);
-    my $filename=$uriparts[$#uriparts];
-    my $pathname=$uri;
-    $pathname=~s|/\Q$filename\E$||;
-    $pathname=~s/^adm\/wrapper\///;
-    $pathname=~s/^adm\/coursedocs\/showdoc\///;
+    my ($pathname,$filename) = &split_uri_for_cond(shift);
     #Trying to find the conditional for the file
     my $match=($env{'acc.res.'.$env{'request.course.id'}.'.'.$pathname}=~
 	       /\&\Q$filename\E\:([\d\|]+)\&/);
@@ -3737,6 +3740,9 @@ sub auto_photo_permission {
     my $homeserver = &homeserver($cnum,$cdom);
     my ($outcome,$perm_reqd,$conditions) = 
 	split(/:/,&unescape(&reply('autophotopermission:'.$cdom,$homeserver)),3);
+    if ($outcome =~ /^(con_lost|unknown_cmd|no_such_host)$/) {
+	return (undef,undef);
+    }
     return ($outcome,$perm_reqd,$conditions);
 }
 
@@ -3747,6 +3753,9 @@ sub auto_checkphotos {
     my $outcome = &unescape(&reply('autophotocheck:'.&escape($udom).':'.
 				   &escape($uname).':'.&escape($pid),
 				   $homeserver));
+    if ($outcome =~ /^(con_lost|unknown_cmd|no_such_host)$/) {
+	return (undef,undef);
+    }
     if ($outcome) {
         ($result,$resulttype) = split(/:/,$outcome);
     } 
@@ -3759,6 +3768,9 @@ sub auto_photochoice {
     my ($update,$comment) = split(/:/,&unescape(&reply('autophotochoice:'.
 						       &escape($cdom),
 						       $homeserver)));
+    if ($update =~ /^(con_lost|unknown_cmd|no_such_host)$/) {
+	return (undef,undef);
+    }
     return ($update,$comment);
 }
 
@@ -5461,9 +5473,12 @@ sub symblist {
     if (($env{'request.course.fn'}) && (%newhash)) {
         if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
                       &GDBM_WRCREAT(),0640)) {
-	    foreach (keys %newhash) {
-                $hash{declutter($_)}=&encode_symb($mapname,$newhash{$_}->[1],
-						  $newhash{$_}->[0]);
+	    foreach my $url (keys %newhash) {
+		next if ($url eq 'last_known'
+			 && $env{'form.no_update_last_known'});
+		$hash{declutter($url)}=&encode_symb($mapname,
+						    $newhash{$url}->[1],
+						    $newhash{$url}->[0]);
             }
             if (untie(%hash)) {
 		return 'ok';