--- loncom/interface/lonnavmaps.pm	2006/12/20 23:02:33	1.393
+++ loncom/interface/lonnavmaps.pm	2006/12/24 22:13:19	1.395
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.393 2006/12/20 23:02:33 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.395 2006/12/24 22:13:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -149,7 +149,7 @@ sub getLinkForResource {
         if (defined($res)) {
 	    my $anchor;
 	    if ($res->is_page()) {
-		foreach (@$stack) { if (defined($_)) { $anchor = $_; }  }
+		foreach my $item (@$stack) { if (defined($item)) { $anchor = $item; }  }
 		$anchor=&escape($anchor->shown_symb());
 		return ($res->link(),$res->shown_symb(),$anchor);
 	    }
@@ -167,8 +167,8 @@ sub getLinkForResource {
     # (when we first recurse on a map, it puts an undefined resource
     # on the bottom because $self->{HERE} isn't defined yet, and we
     # want the src for the map anyhow)
-    foreach (@$stack) {
-        if (defined($_)) { $res = $_; }
+    foreach my $item (@$stack) {
+        if (defined($item)) { $res = $item; }
     }
 
     return ($res->link(),$res->shown_symb());
@@ -904,10 +904,10 @@ sub render_communication_status {
     
     if ($resource->getFeedback()) {
         my $feedback = $resource->getFeedback();
-        foreach (split(/\,/, $feedback)) {
-            if ($_) {
+        foreach my $msgid (split(/\,/, $feedback)) {
+            if ($msgid) {
                 $feedbackHTML .= '&nbsp;<a '.$target.' href="/adm/email?display='
-                    . &escape($_) . '">'
+                    . &escape($msgid) . '">'
                     . '<img alt="'.&mt('New Email').'" src="'.$location.'/feedback.gif" '
                     . 'border="0" /></a>';
             }
@@ -917,12 +917,12 @@ sub render_communication_status {
     if ($resource->getErrors()) {
         my $errors = $resource->getErrors();
         my $errorcount = 0;
-        foreach (split(/,/, $errors)) {
+        foreach my $msgid (split(/,/, $errors)) {
             last if ($errorcount>=10); # Only output 10 bombs maximum
-            if ($_) {
+            if ($msgid) {
                 $errorcount++;
                 $errorHTML .= '&nbsp;<a '.$target.' href="/adm/email?display='
-                    . &escape($_) . '">'
+                    . &escape($msgid) . '">'
                     . '<img alt="'.&mt('New Error').'" src="'.$location.'/bomb.gif" '
                     . 'border="0" /></a>';
             }
@@ -1126,9 +1126,9 @@ sub render {
     # marker
     my $filterHash = {};
     # Figure out what we're not displaying
-    foreach (split(/\,/, $env{"form.filter"})) {
-        if ($_) {
-            $filterHash->{$_} = "1";
+    foreach my $item (split(/\,/, $env{"form.filter"})) {
+        if ($item) {
+            $filterHash->{$item} = "1";
         }
     }
 
@@ -1901,10 +1901,10 @@ sub generate_email_discuss_status {
     my %lastread = &Apache::lonnet::dump('nohist_'.$cid.'_discuss',
                                         $env{'user.domain'},$env{'user.name'},'lastread');
     my %lastreadtime = ();
-    foreach (keys %lastread) {
-        my $key = $_;
-        $key =~ s/_lastread$//;
-        $lastreadtime{$key} = $lastread{$_};
+    foreach my $key (keys %lastread) {
+        my $shortkey = $key;
+        $shortkey =~ s/_lastread$//;
+        $lastreadtime{$shortkey} = $lastread{$key};
     }
 
     my %feedback=();
@@ -1914,22 +1914,32 @@ sub generate_email_discuss_status {
     
     foreach my $msgid (@keys) {
 	if ((!$emailstatus{$msgid}) || ($emailstatus{$msgid} eq 'new')) {
-	    my $plain=
-		&LONCAPA::unescape(&LONCAPA::unescape($msgid));
-	    if ($plain=~/ \[([^\]]+)\]\:/) {
-		my $url=$1;
-		if ($plain=~/\:Error \[/) {
-		    $error{$url}.=','.$msgid; 
-		} else {
-		    $feedback{$url}.=','.$msgid;
-		}
-	    }
+            my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid,
+                $symb,$error) = &Apache::lonmsg::unpackmsgid($msgid);
+            if (defined($symb)) {
+                if (defined($error) && $error == 1) {
+                    $error{$symb}.=','.$msgid;
+                } else {
+                    $feedback{$symb}.=','.$msgid;
+                }
+            } else {
+                my $plain=
+                    &LONCAPA::unescape(&LONCAPA::unescape($msgid));
+                if ($plain=~/ \[([^\]]+)\]\:/) {
+                    my $url=$1;
+                    if ($plain=~/\:Error \[/) {
+                        $error{$url}.=','.$msgid;
+                    } else {
+                        $feedback{$url}.=','.$msgid;
+                    }
+                }
+            }
 	}
     }
     
-    #url's of resources that have feedbacks
+    #symbs of resources that have feedbacks (will be urls pre-2.3)
     $self->{FEEDBACK} = \%feedback;
-    #or errors
+    #or errors (will be urls pre 2.3)
     $self->{ERROR_MSG} = \%error;
     $self->{DISCUSSION_TIME} = \%discussiontime;
     $self->{EMAIL_STATUS} = \%emailstatus;
@@ -2116,23 +2126,48 @@ sub unwrap_symb {
 sub getFeedback { 
     my $self = shift;
     my $symb = shift;
+    my $source = shift;
 
     $self->generate_email_discuss_status();
 
     if (!defined($self->{FEEDBACK})) { return ""; }
     
-    return $self->{FEEDBACK}->{$symb};
+    my $feedback;
+    if ($self->{FEEDBACK}->{$symb}) {
+        $feedback = $self->{FEEDBACK}->{$symb};
+        if ($self->{FEEDBACK}->{$source}) {
+            $feedback .= ','.$self->{FEEDBACK}->{$source};
+        }
+    } else {
+        if ($self->{FEEDBACK}->{$source}) {
+            $feedback = $self->{FEEDBACK}->{$source};
+        }
+    }
+    return $feedback;
 }
 
 # Private method: Get the errors for that resource (by source).
 sub getErrors { 
     my $self = shift;
+    my $symb = shift;
     my $src = shift;
 
     $self->generate_email_discuss_status();
 
     if (!defined($self->{ERROR_MSG})) { return ""; }
-    return $self->{ERROR_MSG}->{$src};
+
+    my $errors;
+    if ($self->{ERROR_MSG}->{$symb}) {
+        $errors = $self->{ERROR_MSG}->{$symb};
+        if ($self->{ERROR_MSG}->{$src}) {
+            $errors .= ','.$self->{ERROR_MSG}->{$src};
+        }
+    } else {
+        if ($self->{ERROR_MSG}->{$src}) {
+            $errors = $self->{ERROR_MSG}->{$src};
+        }
+    }
+    return $errors;
 }
 
 =pod
@@ -3122,9 +3157,9 @@ sub next {
 
     # filter the next possibilities to remove things we've 
     # already seen.
-    foreach (@$nextUnfiltered) {
-        if (!defined($self->{ALREADY_SEEN}->{$_->{ID}})) {
-            push @$next, $_;
+    foreach my $item (@$nextUnfiltered) {
+        if (!defined($self->{ALREADY_SEEN}->{$item->{ID}})) {
+            push @$next, $item;
         }
     }
 
@@ -3857,8 +3892,8 @@ for the resource, or the null string if
 email data was not extracted when the nav map was constructed. Usually
 used like this:
 
- for (split(/\,/, $res->getFeedback())) {
-    my $link = &escape($_);
+ for my $url (split(/\,/, $res->getFeedback())) {
+    my $link = &escape($url);
     ...
 
 and use the link as appropriate.
@@ -3883,15 +3918,17 @@ sub discussion_info {
 sub getFeedback {
     my $self = shift;
     my $source = $self->src();
+    my $symb = $self->symb();
     if ($source =~ /^\/res\//) { $source = substr $source, 5; }
-    return $self->{NAV_MAP}->getFeedback($source);
+    return $self->{NAV_MAP}->getFeedback($symb,$source);
 }
 
 sub getErrors {
     my $self = shift;
     my $source = $self->src();
+    my $symb = $self->symb();
     if ($source =~ /^\/res\//) { $source = substr $source, 5; }
-    return $self->{NAV_MAP}->getErrors($source);
+    return $self->{NAV_MAP}->getErrors($symb,$source);
 }
 
 =pod
@@ -4052,8 +4089,8 @@ sub extractParts {
 		$self->{PART_TYPE} = {};
 		return;
 	    }
-	    foreach (split(/\,/,$metadata)) {
-		if ($_ =~ /^(?:part|Task)_(.*)$/) {
+	    foreach my $entry (split(/\,/,$metadata)) {
+		if ($entry =~ /^(?:part|Task)_(.*)$/) {
 		    my $part = $1;
 		    # This floods the logs if it blows up
 		    if (defined($parts{$part})) {
@@ -4078,8 +4115,8 @@ sub extractParts {
 
 
         # Init the responseIdHash
-        foreach (@{$self->{PARTS}}) {
-            $responseIdHash{$_} = [];
+        foreach my $part (@{$self->{PARTS}}) {
+            $responseIdHash{$part} = [];
         }
 
         # Now, the unfortunate thing about this is that parts, part name, and
@@ -4159,13 +4196,13 @@ the completion information.
 Idiomatic usage of these two methods would probably look something
 like
 
- foreach ($resource->parts()) {
-    my $dateStatus = $resource->getDateStatus($_);
-    my $completionStatus = $resource->getCompletionStatus($_);
+ foreach my $part ($resource->parts()) {
+    my $dateStatus = $resource->getDateStatus($part);
+    my $completionStatus = $resource->getCompletionStatus($part);
 
     or
 
-    my $status = $resource->status($_);
+    my $status = $resource->status($part);
 
     ... use it here ...
  }