--- loncom/interface/lonnavmaps.pm	2002/03/16 08:56:53	1.32
+++ loncom/interface/lonnavmaps.pm	2002/09/03 01:23:35	1.41.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.32 2002/03/16 08:56:53 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.41.2.1 2002/09/03 01:23:35 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -338,7 +338,6 @@ sub followlinks () {
 sub tracetable {
     my ($sofar,$rid,$beenhere,$showtypes,$indent,$linkid)=@_;
     my $newshowtypes=$showtypes;
-    my $newlinkid=$linkid;
     my $further=$sofar;
     #$Apache::lonxml::debug=1;
     &Apache::lonxml::debug("$rid ; $linkid ; $sofar ; $beenhere ; ".$hash{'src_'.$rid});
@@ -355,9 +354,11 @@ sub tracetable {
 		 eq 'page') {
 	    $tprefix='j';
 	    if ($indent) { $tprefix='i'.$indent.','.$tprefix; }
+	    if ($linkid) { $tprefix='l'.$linkid.','.$tprefix; }
 	    $newshowtypes='problems';
 	    $indent++;
-	    $newlinkid=$rid;
+	    #if in a .page continue to link the encompising .page
+	    if (!$linkid) { $linkid=$rid; }
 	}
 	if (defined($rows[$sofar])) {
 	    $rows[$sofar].='&'.$tprefix.$rid;
@@ -368,10 +369,10 @@ sub tracetable {
 	    (defined($hash{'map_finish_'.$hash{'src_'.$rid}}))) {
 	    my $frid=$hash{'map_finish_'.$hash{'src_'.$rid}};
 	    $sofar=&tracetable($sofar,$hash{'map_start_'.$hash{'src_'.$rid}},
-			       '&'.$frid.'&',$newshowtypes,$indent,$newlinkid);
+			       '&'.$frid.'&',$newshowtypes,$indent,$linkid);
 	    &addresource($hash{'src_'.$frid},\$sofar,$frid,$newshowtypes,
-			 $indent,$newlinkid);
-	    if ($tprefix =~ /j$/) { $indent--; }
+			 $indent,$linkid);
+	    if ($tprefix =~ /j$/) { $indent--; $linkid=''; }
 	}
     } else {
 	&addresource($hash{'src_'.$rid},\$sofar,$rid,$showtypes,
@@ -410,10 +411,10 @@ sub handler {
     if ($ENV{'request.course.fn'}) {
 	$fn=$ENV{'request.course.fn'};
 	if (-e "$fn.db") {
-	    if ((tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER,0640)) &&
+	    if ((tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640)) &&
 		(tie(%parmhash,'GDBM_File',
 		     $ENV{'request.course.fn'}.'_parms.db',
-		     &GDBM_READER,0640))) {
+		     &GDBM_READER(),0640))) {
 		$hashtied=1;
 	    }
 	}
@@ -488,13 +489,7 @@ sub handler {
 
 	@rows=();
 
-	&tracetable(0,$firstres,'&'.$lastres.'&','',0);
-	if ($hash{'src_'.$lastres}) {
-	    my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$lastres});
-	    if (($brepriv eq '2') || ($brepriv eq 'F')) {
-		$rows[$#rows+1]=''.$lastres;
-	    }
-	}
+	&tracetable(0,$firstres,'&','',0);
 
 # ------------------------------------------------------------------ Page parms
 
@@ -574,8 +569,10 @@ sub handler {
 	    }
 	    $r->print('><script>window.focus();</script>'.
 		      '<img align=right src=/adm/lonIcons/lonlogos.gif>'.
-		      '<h1>Navigate Course Map</h1>'.
-		      "<h3>$date</h3>");
+		      '<h1>Navigate Course Map</h1>');
+	    my $desc=$ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+	    if (defined($desc)) { $r->print("<h2>$desc</h2>\n"); }
+	    $r->print("<h3>$date</h3>\n");
 	    $r->rflush();
 	    $r->print('<img src="/adm/lonMisc/chat.gif"> New discussion since '.
 		      localtime($lastcheck).
@@ -611,6 +608,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">';
@@ -621,6 +623,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\: \(\)\/\,]*)\"(.+)/) {
@@ -660,17 +668,12 @@ sub handler {
 				$hwke='</b> ('.$ctext.')</font>';
 			    }
 			}
-			if ($hash{'src_'.$rid} eq $currenturl) {
+			if ($rid && $hash{'src_'.$rid} eq $currenturl) {
 			    $add=$add.'<a name="curloc"></a>'.
 				'<font color=red size=+2><b>&gt; </b></font>';
 			    $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">'.
@@ -703,9 +706,18 @@ sub handler {
 			    for(my $i=-1;$i<$indent;$i++) { $indentstr.=$is; }
 			}
 			if (!$linkid) { $linkid=$rid; }
-			$r->print($add.$indentstr.
-				  '<a href="'.$hash{'src_'.$linkid}.'">'.$hwk.
-				  $hash{'title_'.$rid}.$hwke.'</a>'.$adde);
+                        if ($hash{'randomout_'.$rid}) {
+                            $adde=' <i>(hidden)</i>'.$adde;
+                        }
+			$r->print($add.$indentstr);
+			if ($rid) {
+			    $r->print('<a href="'.$hash{'src_'.$linkid}.
+                                      (($hash{'src_'.$linkid}=~/\?/)?'&':'?').
+                                      'symb='.&Apache::lonnet::escape($symb)
+                                       .'">'.
+				      $hwk.$hash{'title_'.$rid}.$hwke.'</a>');
+			}
+			$r->print($adde);
 		    }
 		    $r->print('</tr>');
 		}