[BACK]Return to lonuserstate.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / rat

Diff for /rat/lonuserstate.pm between versions 1.49 and 1.52

version 1.49, 2003/02/03 18:03:53 version 1.52, 2003/02/28 16:17:00
Line 67  my @cond;    # Array with all of the con Line 67  my @cond;    # Array with all of the con
 my $errtext; # variable with all errors  my $errtext; # variable with all errors
 my $retfurl; # variable with the very first URL in the course  my $retfurl; # variable with the very first URL in the course
 my %randompick; # randomly picked resources  my %randompick; # randomly picked resources
   my %randompickseed; # optional seed for randomly picking resources
 my %actualversion; # version of resource as loaded now  my %actualversion; # version of resource as loaded now
 my %setversion; # forced version of resource  my %setversion; # forced version of resource
 my %lastversion; # version when CC came in last  my %lastversion; # version when CC came in last
Line 140  sub loadmap { Line 141  sub loadmap {
                         } else { # normal internal resource                          } else { # normal internal resource
                            if (($embstyle eq 'img') || ($embstyle eq 'emb')                             if (($embstyle eq 'img') || ($embstyle eq 'emb')
              || ($turi=~/\/(syllabus|aboutme|navmaps|smppg|bulletinboard)$/)) {               || ($turi=~/\/(syllabus|aboutme|navmaps|smppg|bulletinboard)$/)) {
        $turi='/adm/wrapper'.$turi;         $turi=$turi.'?register=1';
                            }                             }
                         }                          }
     }      }
Line 239  sub loadmap { Line 240  sub loadmap {
                     if ($token->[2]->{'name'} eq 'parameter_randompick') {                      if ($token->[2]->{'name'} eq 'parameter_randompick') {
  $randompick{$referid}=$token->[2]->{'value'};   $randompick{$referid}=$token->[2]->{'value'};
                     }                      }
                       if ($token->[2]->{'name'} eq 'parameter_randompickseed') {
    $randompick{$referid}=$token->[2]->{'value'};
                       }
                 }                   } 
   
             }              }
Line 417  sub pickrandom { Line 421  sub pickrandom {
         my $mpc=$hash{'map_pc_'.$hash{'src_'.$rid}};          my $mpc=$hash{'map_pc_'.$hash{'src_'.$rid}};
 # ------------------------------------------- put existing resources into array  # ------------------------------------------- put existing resources into array
         my @currentrids=();          my @currentrids=();
         foreach (keys %hash) {          foreach (sort(keys(%hash))) {
     if ($_=~/^src_($mpc\.\d+)/) {      if ($_=~/^src_($mpc\.\d+)/) {
  if ($hash{'src_'.$1}) { push @currentrids, $1; }   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);          next if ($#currentrids<$rndpick);
 # -------------------------------- randomly eliminate the ones that should stay  # -------------------------------- randomly eliminate the ones that should stay
  srand(&Apache::lonnet::rndseed($rid)); # use rid instead of symb   my (undef,$id)=split(/\./,$rid);
         for (my $i=1;$i<=$rndpick;$i++) {          if ($randompickseed{$rid}) { $id=$randompickseed{$rid}; }
             while (1) {   my $rndseed=&Apache::lonnet::rndseed($id); # use id instead of symb
  my $randomidx=int(rand($#currentrids+1));   &Math::Random::random_set_seed_from_phrase($rndseed);
                 if ($currentrids[$randomidx]) {   my @whichids=&Math::Random::random_permuted_index($#currentrids+1);
     $currentrids[$randomidx]='';          for (my $i=1;$i<=$rndpick;$i++) { $currentrids[$whichids[$i]]=''; }
                     last;   #&Apache::lonnet::logthis("$id,$rndseed,".join(':',@whichids));
                 }  
             }  
         }  
 # -------------------------------------------------------- delete the leftovers  # -------------------------------------------------------- delete the leftovers
         for (my $k=0; $k<=$#currentrids; $k++) {          for (my $k=0; $k<=$#currentrids; $k++) {
             if ($currentrids[$k]) {              if ($currentrids[$k]) {
Removed from v.1.49  
changed lines
  Added in v.1.52

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>