version 1.31, 2002/06/27 13:21:04
|
version 1.35, 2002/07/25 16:55:53
|
Line 277 sub traceroute {
|
Line 277 sub traceroute {
|
$sofar=simplify($sofar); |
$sofar=simplify($sofar); |
unless ($beenhere=~/\&$rid\&/) { |
unless ($beenhere=~/\&$rid\&/) { |
$beenhere.=$rid.'&'; |
$beenhere.=$rid.'&'; |
if ($retfurl eq '') { |
if (($retfurl eq '') && ($hash{'src_'.$rid})) { |
my ($mapid,$resid)=split(/\./,$rid); |
my ($mapid,$resid)=split(/\./,$rid); |
$retfurl=$hash{'src_'.$rid}.'?symb='. |
$retfurl=$hash{'src_'.$rid}. |
|
(($hash{'src_'.$rid}=~/\?/)?'&':'?').'symb='. |
&Apache::lonnet::symbclean( |
&Apache::lonnet::symbclean( |
&Apache::lonnet::declutter($hash{'map_id_'.$mapid}). |
&Apache::lonnet::declutter($hash{'map_id_'.$mapid}). |
'___'.$resid.'___'. |
'___'.$resid.'___'. |
Line 423 sub pickrandom {
|
Line 424 sub pickrandom {
|
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 |
srand(&Apache::lonnet::rndseed($rid)); # use rid instead of symb |
for (my $i=1;$i<=$#currentrids+1-$rndpick;$i++) { |
for (my $i=1;$i<=$rndpick;$i++) { |
while (1) { |
while (1) { |
my $randomidx=int(rand($#currentrids+1)); |
my $randomidx=int(rand($#currentrids+1)); |
if ($currentrids[$randomidx]) { |
if ($currentrids[$randomidx]) { |
Line 436 sub pickrandom {
|
Line 437 sub pickrandom {
|
for (my $k=0; $k<=$#currentrids; $k++) { |
for (my $k=0; $k<=$#currentrids; $k++) { |
if ($currentrids[$k]) { |
if ($currentrids[$k]) { |
$hash{'randomout_'.$currentrids[$k]}=1; |
$hash{'randomout_'.$currentrids[$k]}=1; |
$randomoutentry.='&'.$currentrids[$k].'&'; |
my ($mapid,$resid)=split(/\./,$currentrids[$k]); |
|
$randomoutentry.='&'. |
|
&Apache::lonnet::symbclean( |
|
&Apache::lonnet::declutter($hash{'map_id_'.$mapid}). |
|
'___'.$resid.'___'. |
|
&Apache::lonnet::declutter($hash{'src_'.$currentrids[$k]}) |
|
).'&'; |
} |
} |
} |
} |
} |
} |