--- loncom/interface/lonnavmaps.pm	2002/12/02 14:22:50	1.121
+++ loncom/interface/lonnavmaps.pm	2003/02/01 19:55:00	1.129.2.1
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.121 2002/12/02 14:22:50 bowersj2 Exp $
+# $Id: lonnavmaps.pm,v 1.129.2.1 2003/02/01 19:55:00 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -96,6 +96,11 @@ sub real_handler {
                                           ''));
     $r->print('<script>window.focus();</script>');
 
+    $r->rflush();
+
+    # Now that we've displayed some stuff to the user, init the navmap
+    $navmap->init();
+
     $r->print('<table border="0" cellpadding="2" cellspacing="0">');
     my $date=localtime;
     $r->print('<tr><td align="right" valign="bottom">Key:&nbsp;&nbsp;</td>');
@@ -178,9 +183,6 @@ sub real_handler {
     $r->print('<br>&nbsp;');
     $r->rflush();
 
-    # Now that we've displayed some stuff to the user, init the navmap
-    $navmap->init();
-
     # Check that it's defined
     if (!($navmap->courseMapDefined())) {
         $r->print('<font size="+2" color="red">Coursemap undefined.</font>' .
@@ -486,6 +488,10 @@ sub real_handler {
                     '"';
 
                 my $title = $curRes->compTitle();
+                if ($src=~/^\/uploaded\//) {
+		    $nonLinkedText=$title;
+                    $title='';
+                }
                 my $partLabel = "";
                 my $newBranchText = "";
 
@@ -596,7 +602,7 @@ sub real_handler {
                 $r->print("</td>\n");
 
                 # SECOND COL: Is there text, feedback, errors??
-                my $discussionHTML = ""; my $feedbackHTML = "";
+                my $discussionHTML = ""; my $feedbackHTML = ""; my $errorHTML = "";
 
                 if ($curRes->hasDiscussion()) {
                     $discussionHTML = $linkopen .
@@ -616,7 +622,19 @@ sub real_handler {
                     }
                 }
 
-                $r->print("<td width=\"75\" align=\"left\" valign=\"center\">$discussionHTML$feedbackHTML&nbsp;</td>");
+                if ($curRes->getErrors()) {
+                    my $errors = $curRes->getErrors();
+                    foreach (split(/,/, $errors)) {
+                        if ($_) {
+                            $errorHTML .= '&nbsp;<a href="/adm/email?display='
+                                . &Apache::lonnet::escape($_) . '">'
+                                . '<img src="/adm/lonMisc/bomb.gif" '
+                                . 'border="0" /></a>';
+                        }
+                    }
+                }
+
+                $r->print("<td width=\"75\" align=\"left\" valign=\"center\">$discussionHTML$feedbackHTML$errorHTML&nbsp;</td>");
 
                 # Is this the first displayed part of a multi-part problem
                 # that has not been condensed, so we should suppress these two
@@ -668,10 +686,10 @@ sub real_handler {
         $r->print('<script>location += "#curloc";</script>');
     }
 
-    $r->print("</body></html>");
-
     $navmap->untieHashes();
 
+    $r->print("</body></html>");
+
     return OK;
 }
 
@@ -981,15 +999,11 @@ sub new {
         return undef;
     }
 
-    # Now copy the hashes for speed (?)
-    my %realnav; my %realparm;
-    foreach (%navmaphash) { $realnav{$_} = $navmaphash{$_}; }
-    foreach (%parmhash) { $realparm{$_} = $navmaphash{$_}; }
-    $self->{NAV_HASH} = \%realnav;
-    $self->{PARM_HASH} = \%realparm;
+    $self->{HASH_TIED} = 1;
+    $self->{NAV_HASH} = \%navmaphash;
+    $self->{PARM_HASH} = \%parmhash;
 
     bless($self);
-    $self->untieHashes();
         
     return $self;
 }
@@ -1060,7 +1074,7 @@ sub init {
         my %emailstatus = &Apache::lonnet::dump('email_status');
         my $logoutTime = $emailstatus{'logout'};
         my $courseLeaveTime = $emailstatus{'logout_'.$ENV{'request.course.id'}};
-        $self->{LAST_CHECK} = ($courseLeaveTime > $logoutTime ?
+        $self->{LAST_CHECK} = ($courseLeaveTime < $logoutTime ?
                                $courseLeaveTime : $logoutTime);
         my %discussiontime = &Apache::lonnet::dump('discussiontimes', 
                                                    $cdom, $cnum);
@@ -1141,18 +1155,19 @@ sub DESTROY {
     $self->untieHashes();
 }
 
-# Private function: Does the given resource (as a symb string) have
+# Private method: Does the given resource (as a symb string) have
 # current discussion? Returns 0 if chat/mail data not extracted.
 sub hasDiscussion {
     my $self = shift;
     my $symb = shift;
     if (!defined($self->{DISCUSSION_TIME})) { return 0; }
 
+    #return defined($self->{DISCUSSION_TIME}->{$symb});
     return $self->{DISCUSSION_TIME}->{$symb} >
            $self->{LAST_CHECK};
 }
 
-# Private function: Does the given resource (as a symb string) have
+# Private method: Does the given resource (as a symb string) have
 # current feedback? Returns the string in the feedback hash, which
 # will be false if it does not exist.
 sub getFeedback { 
@@ -1164,6 +1179,15 @@ sub getFeedback {
     return $self->{FEEDBACK}->{$symb};
 }
 
+# Private method: Get the errors for that resource (by source).
+sub getErrors { 
+    my $self = shift;
+    my $src = shift;
+    
+    if (!defined($self->{ERROR_MSG})) { return ""; }
+    return $self->{ERROR_MSG}->{$src};
+}
+
 =pod
 
 =item * B<getById>(id): Based on the ID of the resource (1.1, 3.2, etc.), get a resource object for that resource. This method, or other methods that use it (as in the resource object) is the only proper way to obtain a resource object.
@@ -1655,7 +1679,7 @@ sub next {
     # If this is a blank resource, don't actually return it.
     # Should you ever find you need it, make sure to add an option to the code
     #  that you can use; other things depend on this behavior.
-    if (!$self->{HERE}->src()) {
+    if (!$self->{HERE}->src() || !$self->{HERE}->browsePriv()) {
         return $self->next();
     }
 
@@ -2229,7 +2253,16 @@ sub hasDiscussion {
 
 sub getFeedback {
     my $self = shift;
-    return $self->{NAV_MAP}->getFeedback($self->src());
+    my $source = $self->src();
+    if ($source =~ /^\/res\//) { $source = substr $source, 5; }
+    return $self->{NAV_MAP}->getFeedback($source);
+}
+
+sub getErrors {
+    my $self = shift;
+    my $source = $self->src();
+    if ($source =~ /^\/res\//) { $source = substr $source, 5; }
+    return $self->{NAV_MAP}->getErrors($source);
 }
 
 =pod
@@ -2585,16 +2618,7 @@ sub getNext {
         my $next = $choice->goesto();
         $next = $self->{NAV_MAP}->getById($next);
 
-        # Don't remember it if the student doesn't have browse priviledges
-        # future note: this may properly belong in the client of the resource
-        my $browsePriv = $self->{BROWSE_PRIV};
-        if (!defined($browsePriv)) {
-            $browsePriv = &Apache::lonnet::allowed('bre', $self->src);
-            $self->{BROWSE_PRIV} = $browsePriv;
-        }
-        if (!($browsePriv ne '2' && $browsePriv ne 'F')) {
-            push @branches, $next;
-        }
+        push @branches, $next;
     }
     return \@branches;
 }
@@ -2608,20 +2632,20 @@ sub getPrevious {
         my $prev = $choice->comesfrom();
         $prev = $self->{NAV_MAP}->getById($prev);
 
-        # Don't remember it if the student doesn't have browse priviledges
-        # future note: this may properly belong in the client of the resource
-        my $browsePriv = $self->{BROWSE_PRIV};
-        if (!defined($browsePriv)) {
-            $browsePriv = &Apache::lonnet::allowed('bre', $self->src);
-            $self->{BROWSE_PRIV} = $browsePriv;
-        }
-        if (!($browsePriv ne '2' && $browsePriv ne 'F')) {
-            push @branches, $prev;
-        }
+        push @branches, $prev;
     }
     return \@branches;
 }
 
+sub browsePriv {
+    my $self = shift;
+    if (defined($self->{BROWSE_PRIV})) {
+        return $self->{BROWSE_PRIV};
+    }
+
+    $self->{BROWSE_PRIV} = &Apache::lonnet::allowed('bre', $self->src());
+}
+
 =pod
 
 =back