--- rat/lonuserstate.pm	2002/10/10 19:05:32	1.46
+++ rat/lonuserstate.pm	2003/10/22 16:10:56	1.61
@@ -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.46 2002/10/10 19:05:32 www Exp $
+# $Id: lonuserstate.pm,v 1.61 2003/10/22 16:10:56 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,7 +40,6 @@
 # 11/1,11/2,11/14,11/16,11/22,12/28,
 # YEAR=2001
 # 07/05/01,08/30,08/31 Gerd Kortemeyer
-# 12/16 Scott Harrison
 #
 ###
 
@@ -68,10 +67,47 @@ my @cond;    # Array with all of the con
 my $errtext; # variable with all errors
 my $retfurl; # variable with the very first URL in the course
 my %randompick; # randomly picked resources
-my %actualversion; # version of resource as loaded now
-my %setversion; # forced version of resource
-my %lastversion; # version when CC came in last
-my $versionmode; # how versioning is handled in this course
+my %randompickseed; # optional seed for randomly picking resources
+
+# ----------------------------------- Remove version from URL and store in hash
+
+sub versiontrack {
+    my $uri=shift;
+    if ($uri=~/\.(\d+)\.\w+$/) {
+	my $version=$1;
+	$uri=~s/\.\d+\.(\w+)$/\.$1/;
+        $hash{'version_'.$uri}=$version;
+    }
+    return $uri;
+}
+
+# -------------------------------------------------------------- Put in version
+
+sub putinversion {
+    my $uri=shift;
+    if ($hash{'version_'.$uri}) {
+	my $version=$hash{'version_'.$uri};
+	$uri=~s/\.(\w+)$/\.$version\.$1/;
+    }
+    return $uri;
+}
+
+# ----------------------------------------- Processing versions file for course
+
+sub processversionfile {
+    my %cenv=shift;
+    my %versions=&Apache::lonnet::dump('resourceversions',
+				       $cenv{'domain'},
+				       $cenv{'num'});
+    foreach (keys %versions) {
+	if ($_=~/^error\:/) { return; }
+	if ($versions{$_} eq 'current') {
+	    delete $hash{'version_'.$_};
+	} else {
+	    $hash{'version_'.$_}=$versions{$_};
+	}
+    }
+}
 
 # --------------------------------------------------------- Loads map from disk
 
@@ -97,7 +133,7 @@ sub loadmap {
 
     my $instr=&Apache::lonnet::getfile($fn);
 
-    unless ($instr == -1) {
+    unless ($instr eq -1) {
 
 # Successfully got file, parse it
 
@@ -119,7 +155,18 @@ sub loadmap {
 
                     $hash{'kind_'.$rid}='res';
                     $hash{'title_'.$rid}=$token->[2]->{'title'};
-                    my $turi=$token->[2]->{'src'};
+# Rip out the version and store it separately
+                    my $turi=&versiontrack($token->[2]->{'src'});
+# If there is an explicit version parameter, use that one
+                    if ($token->[2]->{'version'}) {
+			$hash{'version_'.$turi}=$1;
+		    }
+		    &Apache::lonnet::do_cache(\%Apache::lonnet::titlecache,
+		       &Apache::lonnet::symbclean(
+                        &Apache::lonnet::declutter($uri).'___'.
+                        $token->[2]->{'id'}.'___'.
+		        &Apache::lonnet::declutter($turi)),
+					      $token->[2]->{'title'});
                     unless ($ispage) {
                         $turi=~/\.(\w+)$/;
                         my $embstyle=&Apache::loncommon::fileembstyle($1);
@@ -133,19 +180,24 @@ sub loadmap {
 				$turi='/adm/coursedocs/showdoc'.$turi;
                             }
                         } else { # normal internal resource
-                           if (($embstyle eq 'img') || ($embstyle eq 'emb')
-             || ($turi=~/\/(syllabus|aboutme|navmaps|smppg|bulletinboard)$/)) {
+                           if (($embstyle eq 'img') || ($embstyle eq 'emb')) {
 			       $turi='/adm/wrapper'.$turi;
                            }
                         }
 		    }
-                    $hash{'src_'.$rid}=$turi;
 
                     if (defined($hash{'ids_'.$turi})) {
                         $hash{'ids_'.$turi}.=','.$rid;
                     } else {
                         $hash{'ids_'.$turi}=''.$rid;
                     }
+               
+                    if
+	        ($turi=~/\/(syllabus|aboutme|navmaps|smppg|bulletinboard)$/) {
+			$turi.='?register=1';
+		    }
+
+                    $hash{'src_'.$rid}=$turi;
 
                     if ($token->[2]->{'external'} eq 'true') {
                         $hash{'ext_'.$rid}='true:';
@@ -234,6 +286,9 @@ sub loadmap {
                     if ($token->[2]->{'name'} eq 'parameter_randompick') {
 			$randompick{$referid}=$token->[2]->{'value'};
                     }
+                    if ($token->[2]->{'name'} eq 'parameter_randompickseed') {
+			$randompick{$referid}=$token->[2]->{'value'};
+                    }
                 } 
 
             }
@@ -272,7 +327,8 @@ sub traceroute {
     $sofar=simplify($sofar);
     unless ($beenhere=~/\&$rid\&/) {
        $beenhere.=$rid.'&';  
-       if (($retfurl eq '') && ($hash{'src_'.$rid})) {
+       if (($retfurl eq '') && ($hash{'src_'.$rid})
+        && ($hash{'src_'.$rid}!~/\.sequence$/)) {
            my ($mapid,$resid)=split(/\./,$rid);
            $retfurl=$hash{'src_'.$rid}.
            (($hash{'src_'.$rid}=~/\?/)?'&':'?').'symb='.
@@ -362,11 +418,11 @@ sub accinit {
 	    my $resid=$_;
             my $uri=$hash{'src_'.$resid};
             $uri=~s/^\/adm\/wrapper//;
+            $uri=&Apache::lonnet::declutter($uri);
             my @uriparts=split(/\//,$uri);
             my $urifile=$uriparts[$#uriparts];
             $#uriparts--;
             my $uripath=join('/',@uriparts);
-            $uripath=~s/^\/res\///;
            if ($uripath) {
             my $uricond='0';
             if (defined($hash{'conditions_'.$resid})) {
@@ -374,7 +430,7 @@ sub accinit {
             }
             if (defined($acchash{'acc.res.'.$short.'.'.$uripath})) {
                 if ($acchash{'acc.res.'.$short.'.'.$uripath}=~
-                   /(\&$urifile\:[^\&]*)/) {
+                   /(\&\Q$urifile\E\:[^\&]*)/) {
 		    my $replace=$1;
                     my $regexp=$replace;
                     $regexp=~s/\|/\\\|/g;
@@ -411,23 +467,27 @@ sub pickrandom {
         my $mpc=$hash{'map_pc_'.$hash{'src_'.$rid}};
 # ------------------------------------------- put existing resources into array
         my @currentrids=();
-        foreach (keys %hash) {
+        foreach (sort(keys(%hash))) {
 	    if ($_=~/^src_($mpc\.\d+)/) {
 		if ($hash{'src_'.$1}) { push @currentrids, $1; }
             }
         }
+	# rids are number.number and we want to numercially sort on 
+        # the second number
+	@currentrids=sort {
+	    my (undef,$aid)=split(/\./,$a);
+	    my (undef,$bid)=split(/\./,$b);
+	    $aid <=> $bid;
+	} @currentrids;
         next if ($#currentrids<$rndpick);
 # -------------------------------- randomly eliminate the ones that should stay
-	srand(&Apache::lonnet::rndseed($rid)); # use rid instead of symb
-        for (my $i=1;$i<=$rndpick;$i++) {
-            while (1) {
-		my $randomidx=int(rand($#currentrids+1));
-                if ($currentrids[$randomidx]) {
-		    $currentrids[$randomidx]='';
-                    last;
-                }
-            }
-        }
+	my (undef,$id)=split(/\./,$rid);
+        if ($randompickseed{$rid}) { $id=$randompickseed{$rid}; }
+	my $rndseed=&Apache::lonnet::rndseed($id); # use id instead of symb
+	&Apache::lonnet::setup_random_from_rndseed($rndseed);
+	my @whichids=&Math::Random::random_permuted_index($#currentrids+1);
+        for (my $i=1;$i<=$rndpick;$i++) { $currentrids[$whichids[$i]]=''; }
+	#&Apache::lonnet::logthis("$id,$rndseed,".join(':',@whichids));
 # -------------------------------------------------------- delete the leftovers
         for (my $k=0; $k<=$#currentrids; $k++) {
             if ($currentrids[$k]) {
@@ -475,7 +535,7 @@ sub readmap {
     $errtext='';
     $pc=0;
     my $furi=&Apache::lonnet::clutter($uri);
-    $hash{'src_0.0'}=$furi;
+    $hash{'src_0.0'}=&versiontrack($furi);
     $hash{'title_0.0'}=&Apache::lonnet::metadata($uri,'title');
     $hash{'ids_'.$furi}='0.0';
     $hash{'is_map_0.0'}=1;
@@ -486,8 +546,11 @@ sub readmap {
         &pickrandom();
     }
 # ------------------------------------------------------------ Version tracking
-    if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
-	&Apache::lonnet::logthis('Will be version tracking');
+    &processversionfile(%cenv);
+    foreach (keys %hash) {
+	if ($_=~/^src\_/) {
+	    $hash{$_}=&putinversion($hash{$_});
+	}
     }
     unless ((untie(%hash)) && (untie(%parmhash))) {
       &Apache::lonnet::logthis("<font color=blue>WARNING: ".
@@ -516,8 +579,6 @@ sub readmap {
 	    $retfurl='/adm/email?critical=display';
         }
     }
-
-
    return ($retfurl,$errtext);
 }