--- rat/lonuserstate.pm	2005/05/06 19:11:49	1.91
+++ rat/lonuserstate.pm	2005/09/23 21:39:09	1.96
@@ -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.91 2005/05/06 19:11:49 albertel Exp $
+# $Id: lonuserstate.pm,v 1.96 2005/09/23 21:39:09 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,6 +41,7 @@ use Safe;
 use Safe::Hole;
 use Opcode;
 use Apache::lonenc;
+use Fcntl qw(:flock);
 
 # ---------------------------------------------------- Globals for this package
 
@@ -73,6 +74,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 +83,7 @@ sub putinversion {
 	             { return $uri; }
 	$uri=~s/\.(\w+)$/\.$version\.$1/;
     }
+    &Apache::lonnet::do_cache_new('courseresversion',$key,&Apache::lonnet::declutter($uri),600);
     return $uri;
 }
 
@@ -126,6 +129,7 @@ sub loadmap {
 # Successfully got file, parse it
 
         my $parser = HTML::TokeParser->new(\$instr);
+	$parser->attr_encoded(1);
         my $token;
 
         my $linkpc=0;
@@ -138,7 +142,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';
@@ -546,15 +550,21 @@ sub readmap {
 	return 'No course data available.';
     }
     @cond=('true:normal');
-    #unlink($fn.'.db');
-    #unlink($fn.'_symb.db');
-    unlink($fn.'.state');
-    unlink($fn.'parms.db');
+
+    open(LOCKFILE,">$fn.db.lock");
+    my $lock=0;
+    if (flock(LOCKFILE,LOCK_EX|LOCK_NB)) {
+	$lock=1;
+	unlink($fn.'.db');
+	unlink($fn.'_symb.db');
+	unlink($fn.'.state');
+	unlink($fn.'parms.db');
+    }
     undef %randompick;
     undef %hiddenurl;
     undef %encurl;
     $retfurl='';
-    if ((tie(%hash,'GDBM_File',"$fn.db",&GDBM_WRCREAT(),0640)) &&
+    if ($lock && (tie(%hash,'GDBM_File',"$fn.db",&GDBM_WRCREAT(),0640)) &&
 	(tie(%parmhash,'GDBM_File',$fn.'_parms.db',&GDBM_WRCREAT(),0640))) {
 	%hash=();
 	%parmhash=();
@@ -588,6 +598,7 @@ sub readmap {
 	}
 # ----------------------------------------------- Close hashes to finally store
 # --------------------------------- Routine must pass this point, no early outs
+	$hash{'first_url'}=$retfurl;
 	unless ((untie(%hash)) && (untie(%parmhash))) {
 	    &Apache::lonnet::logthis("<font color=blue>WARNING: ".
 				     "Could not untie coursemap $fn for $uri.</font>"); 
@@ -601,13 +612,19 @@ sub readmap {
 		&Apache::lonnet::logthis("<font color=blue>WARNING: ".
 					 "Could not write statemap $fn for $uri.</font>"); 
 	    }
-	}  
+	}
+	flock(LOCKFILE,LOCK_UN);
+	close(LOCKFILE);
     } else {
 	# if we are here it is likely because we are already trying to 
 	# initialize the course in another child, busy wait trying to 
 	# tie the hashes for the next 90 seconds, if we succeed forward 
 	# them on to navmaps, if we fail, throw up the Could not init 
 	# course screen
+	if ($lock) {
+	    # Got the lock but not the DB files
+	    flock(LOCKFILE,LOCK_UN);
+	}
 	untie(%hash);
 	untie(%parmhash);
 	&Apache::lonnet::logthis("<font color=blue>WARNING: ".
@@ -616,7 +633,8 @@ sub readmap {
 	while($i<90) {
 	    $i++;
 	    sleep(1);
-	    if ((tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640))) {
+	    if (flock(LOCKFILE,LOCK_EX|LOCK_NB) &&
+		(tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640))) {
 		if (tie(%parmhash,'GDBM_File',$fn.'_parms.db',&GDBM_READER(),0640)) {
 		    $retfurl='/adm/navmaps';
 		    &Apache::lonnet::appenv("request.course.id"  => $short,
@@ -630,6 +648,8 @@ sub readmap {
 	    untie(%hash);
 	    untie(%parmhash);
 	}
+	flock(LOCKFILE,LOCK_UN);
+	close(LOCKFILE);
     }
     &Apache::lonmsg::author_res_msg($env{'request.course.uri'},$errtext);
 # ------------------------------------------------- Check for critical messages