--- rat/lonuserstate.pm	2009/11/16 20:26:04	1.128.2.3
+++ rat/lonuserstate.pm	2009/12/03 19:01:33	1.134
@@ -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.128.2.3 2009/11/16 20:26:04 raeburn Exp $
+# $Id: lonuserstate.pm,v 1.134 2009/12/03 19:01:33 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -62,6 +62,12 @@ my %hiddenurl; # this URL (or complete f
 
 # ----------------------------------- Remove version from URL and store in hash
 
+sub versionerror {
+    my ($uri,$usedversion,$unusedversion)=@_;
+    return '<br />'.&mt('Version discrepancy: resource [_1] included in both version [_2] and version [_3]. Using version [_2].',
+                    $uri,$usedversion,$unusedversion).'<br />';
+}
+
 sub versiontrack {
     my $uri=shift;
     if ($uri=~/\.(\d+)\.\w+$/) {
@@ -69,7 +75,9 @@ sub versiontrack {
 	$uri=~s/\.\d+\.(\w+)$/\.$1/;
         unless ($hash{'version_'.$uri}) {
 	    $hash{'version_'.$uri}=$version;
-	}
+	} elsif ($version!=$hash{'version_'.$uri}) {
+            $errtext.=&versionerror($uri,$hash{'version_'.$uri},$version);
+        }
     }
     return $uri;
 }
@@ -688,9 +696,9 @@ sub readmap {
                     'Could not untie coursemap hash '.$fn.' for '.$uri.'.</font>');
             }
         }
-        flock(LOCKFILE,LOCK_UN);
+	flock(LOCKFILE,LOCK_UN);
     }
-    unless ($lock && $tiedhash && $tiedparmhash) {
+    unless ($lock && $tiedhash && $tiedparmhash) { 
 	# 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 
@@ -703,7 +711,7 @@ sub readmap {
 	}
         if ($tiedhash) {
             unless($untiedhash) {
-                untie(%hash);
+	        untie(%hash);
             }
         }
         if ($tiedparmhash) {
@@ -711,8 +719,8 @@ sub readmap {
                 untie(%parmhash);
             }
         }
-        &Apache::lonnet::logthis('<font color="blue">WARNING: '.
-                                 "Could not tie coursemap $fn for $uri.</font>");
+	&Apache::lonnet::logthis('<font color="blue">WARNING: '.
+				 "Could not tie coursemap $fn for $uri.</font>");
         $tiedhash = '';
         $tiedparmhash = '';
 	my $i=0;
@@ -728,18 +736,18 @@ sub readmap {
                         if (-e "$fn.state") {
 		            $retfurl='/adm/navmaps';
 		            &Apache::lonnet::appenv({"request.course.id"  => $short,
-					             "request.course.fn"  => $fn,
+		   			             "request.course.fn"  => $fn,
 					             "request.course.uri" => $uri});
-                            $untiedhash = untie(%hash);
-                            $untiedparmhash = untie(%parmhash);
+		            $untiedhash = untie(%hash);
+		            $untiedparmhash = untie(%parmhash);
                             $gotstate = 1;
 		            last;
-                        }
+		        }
                         $untiedparmhash = untie(%parmhash);
-                    }
-                    $untiedhash = untie(%hash);
-		}
-	    }
+	            }
+	            $untiedhash = untie(%hash);
+                }
+            }
 	}
         if ($lock) {
             flock(LOCKFILE,LOCK_UN);
@@ -1002,37 +1010,33 @@ of course for user.
 This is part of the LearningOnline Network with CAPA project
 described at http://www.lon-capa.org.
 
-=head1 HANDLER SUBROUTINE
-
-There is no handler subroutine.
-
-=head1 OTHER SUBROUTINES
+=head1 SUBROUTINES
 
-=over 4
+=over
 
-=item *
+=item loadmap()
 
-loadmap() : Loads map from disk
+Loads map from disk
 
-=item *
+=item simplify()
 
-simplify() : Simplify expression
+Simplify expression
 
-=item *
+=item traceroute()
 
-traceroute() : Build condition hash
+Build condition hash
 
-=item *
+=item accinit()
 
-accinit() : Cascading conditions, quick access, parameters
+Cascading conditions, quick access, parameters
 
-=item *
+=item readmap()
 
-readmap() : Read map and all submaps
+Read map and all submaps
 
-=item *
+=item evalstate()
 
-evalstate() : Evaluate state string
+Evaluate state string
 
 =back