--- rat/lonuserstate.pm	2002/12/12 18:00:24	1.48
+++ rat/lonuserstate.pm	2003/02/28 18:14:44	1.53
@@ -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.48 2002/12/12 18:00:24 www Exp $
+# $Id: lonuserstate.pm,v 1.53 2003/02/28 18:14:44 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,6 +67,7 @@ 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 %randompickseed; # optional seed for randomly picking resources
 my %actualversion; # version of resource as loaded now
 my %setversion; # forced version of resource
 my %lastversion; # version when CC came in last
@@ -139,19 +139,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:';
@@ -240,6 +245,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'};
+                    }
                 } 
 
             }
@@ -418,23 +426,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
+	&Math::Random::random_set_seed_from_phrase($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]) {