[LON-CAPA-cvs] cvs: loncom(version_1_2_X) /interface lonnavmaps.pm

[albertel]

albertel		Tue Sep 21 15:28:34 2004 EDT

  Modified files:              (Branch: version_1_2_X)
    /loncom/interface	lonnavmaps.pm 
  Log:
  - backport 1.295
  
  
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.267.2.6 loncom/interface/lonnavmaps.pm:1.267.2.7
--- loncom/interface/lonnavmaps.pm:1.267.2.6	Mon Sep 20 11:28:10 2004
+++ loncom/interface/lonnavmaps.pm	Tue Sep 21 15:28:34 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.267.2.6 2004/09/20 15:28:10 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.267.2.7 2004/09/21 19:28:34 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1879,17 +1879,11 @@
     
     foreach my $msgid (split(/\&/, $keys)) {
 	$msgid=&Apache::lonnet::unescape($msgid);
-	my $plain=&Apache::lonnet::unescape(&Apache::lonnet::unescape($msgid));
-	if ($plain=~/(Error|Feedback) \[([^\]]+)\]/) {
-	    my ($what,$url)=($1,$2);
-	    my %status=
-		&Apache::lonnet::get('email_status',[$msgid]);
-	    if ($status{$msgid}=~/^error\:/) { 
-		$status{$msgid}=''; 
-	    }
-	    
-	    if (($status{$msgid} eq 'new') || 
-		(!$status{$msgid})) { 
+	if ((!$emailstatus{$msgid}) || ($emailstatus{$msgid} eq 'new')) {
+	    my $plain=
+		&Apache::lonnet::unescape(&Apache::lonnet::unescape($msgid));
+	    if ($plain=~/(Error|Feedback) \[([^\]]+)\]/) {
+		my ($what,$url)=($1,$2);
 		if ($what eq 'Error') {
 		    $error{$url}.=','.$msgid; 
 		} else {
@@ -1899,8 +1893,10 @@
 	}
     }
     
+    #url's of resources that have feedbacks
     $self->{FEEDBACK} = \%feedback;
-    $self->{ERROR_MSG} = \%error; # what is this? JB
+    #or errors
+    $self->{ERROR_MSG} = \%error;
     $self->{DISCUSSION_TIME} = \%discussiontime;
     $self->{EMAIL_STATUS} = \%emailstatus;
     $self->{LAST_READ} = \%lastreadtime;