--- rat/lonuserstate.pm	2005/04/07 06:56:27	1.89
+++ rat/lonuserstate.pm	2005/06/29 11:57:17	1.93
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construct and maintain state and binary representation of course for user
 #
-# $Id: lonuserstate.pm,v 1.89 2005/04/07 06:56:27 albertel Exp $
+# $Id: lonuserstate.pm,v 1.93 2005/06/29 11:57:17 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -73,6 +73,7 @@ sub versiontrack {
 
 sub putinversion {
     my $uri=shift;
+    my $key=$env{'request.course.id'}.'_'.&Apache::lonnet::clutter($uri);
     if ($hash{'version_'.$uri}) {
 	my $version=$hash{'version_'.$uri};
 	if ($version eq 'mostrecent') { return $uri; }
@@ -81,6 +82,7 @@ sub putinversion {
 	             { return $uri; }
 	$uri=~s/\.(\w+)$/\.$version\.$1/;
     }
+    &Apache::lonnet::do_cache_new('courseresversion',$key,&Apache::lonnet::declutter($uri),600);
     return $uri;
 }
 
@@ -138,7 +140,7 @@ sub loadmap {
 	    if ($token->[0] eq 'S') {
                 if ($token->[1] eq 'resource') {
 # -------------------------------------------------------------------- Resource
-
+                    if ($token->[2]->{'type'} eq 'zombie') { next; }
                     my $rid=$lpc.'.'.$token->[2]->{'id'};
 
                     $hash{'kind_'.$rid}='res';
@@ -338,7 +340,14 @@ sub traceroute {
 	my ($mapid,$resid)=split(/\./,$rid);
 	my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$hash{'src_'.$rid});
 	my $hidden=&Apache::lonnet::EXT('resource.0.hiddenresource',$symb);
-	if ($hdnflag || lc($hidden) eq 'yes') { $hiddenurl{$rid}=1; }
+
+	if ($hdnflag || lc($hidden) eq 'yes') {
+	    $hiddenurl{$rid}=1;
+	}
+	if (!$hdnflag && lc($hidden) eq 'no') {
+	    delete($hiddenurl{$rid});
+	}
+
 	my $encrypt=&Apache::lonnet::EXT('resource.0.encrypturl',$symb);
 	if ($encflag || lc($encrypt) eq 'yes') { $encurl{$rid}=1; }
 	if (($retfurl eq '') && ($hash{'src_'.$rid})