--- loncom/interface/lonnavmaps.pm	2006/12/20 23:25:13	1.394
+++ 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.394 2006/12/20 23:25:13 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.395 2006/12/24 22:13:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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
@@ -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