--- loncom/interface/lonnavmaps.pm	2002/03/26 15:16:24	1.34
+++ loncom/interface/lonnavmaps.pm	2002/07/25 16:55:53	1.39
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.34 2002/03/26 15:16:24 www Exp $
+# $Id: lonnavmaps.pm,v 1.39 2002/07/25 16:55:53 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -612,6 +612,11 @@ sub handler {
 			my $indent;my $indentstr;
 			my $linkid;
 			my $rid=$colcont[$j];
+                        $rid=~/(\d+)\.(\d+)$/;
+			my $src=
+			   &Apache::lonnet::declutter($hash{'src_'.$1.'.'.$2});
+			my $symb=
+	  &Apache::lonnet::declutter($hash{'map_id_'.$1}).'___'.$2.'___'.$src;
 			my $add='<td>';
 			my $adde='</td>';
 			my $hwk='<font color="#223322">';
@@ -622,6 +627,12 @@ sub handler {
 			    $rid=$1;
 			    $add='<th bgcolor="#AAFF55"><a name="'.$rid.'">';
 			    $adde='</th>';
+                            if (($ENV{'user.adv'}) && 
+				($parmhash{$symb.'.0.parameter_randompick'})) {
+                               $adde=' (randomly select '.
+				   $parmhash{$symb.'.0.parameter_randompick'}.
+                                   ')</th>';
+                            }
 			}
 			if ($rid=~/^j(.+)/) { $rid=$1; }
 			if ($rid=~/^p(\d)(\d)\"([\w\: \(\)\/\,]*)\"(.+)/) {
@@ -667,11 +678,6 @@ sub handler {
 			    $adde=
 				'<font color=red size=+2><b> &lt;</b></font>'.$adde;
 			}
-			my $src=
-			    &Apache::lonnet::declutter($hash{'src_'.$rid});
-			$rid=~/^(\d+)\.(\d+)$/;
-			my $symb=
-			    &Apache::lonnet::declutter($hash{'map_id_'.$1}).'___'.$2.'___'.$src;
 			if ($discussiontimes{$symb}>$lastcheck) {
 			    $adde=
 				'<img border=0 src="/adm/lonMisc/chat.gif">'.
@@ -704,10 +710,15 @@ sub handler {
 			    for(my $i=-1;$i<$indent;$i++) { $indentstr.=$is; }
 			}
 			if (!$linkid) { $linkid=$rid; }
+                        if ($hash{'randomout_'.$rid}) {
+                            $adde=' <i>(hidden)</i>'.$adde;
+                        }
 			$r->print($add.$indentstr);
 			if ($rid) {
 			    $r->print('<a href="'.$hash{'src_'.$linkid}.
-                                      '?symb='.$symb.'">'.
+                                      (($hash{'src_'.$linkid}=~/\?/)?'&':'?').
+                                      'symb='.&Apache::lonnet::escape($symb)
+                                       .'">'.
 				      $hwk.$hash{'title_'.$rid}.$hwke.'</a>');
 			}
 			$r->print($adde);