--- loncom/interface/lonnavmaps.pm	2004/04/13 15:49:42	1.258
+++ loncom/interface/lonnavmaps.pm	2004/05/05 21:04:14	1.259
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.258 2004/04/13 15:49:42 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.259 2004/05/05 21:04:14 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1813,6 +1813,7 @@ sub generate_course_user_opt {
 
 sub generate_email_discuss_status {
     my $self = shift;
+    my $symb = shift;
     if ($self->{EMAIL_DISCUSS_GENERATED}) { return; }
 
     my $cid=$ENV{'request.course.id'};
@@ -1825,6 +1826,15 @@ sub generate_email_discuss_status {
 			   $courseLeaveTime : $logoutTime);
     my %discussiontime = &Apache::lonnet::dump('discussiontimes', 
 					       $cdom, $cnum);
+    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{$_};
+    }
+
     my %feedback=();
     my %error=();
     my $keys = &Apache::lonnet::reply('keys:'.
@@ -1858,6 +1868,7 @@ sub generate_email_discuss_status {
     $self->{ERROR_MSG} = \%error; # what is this? JB
     $self->{DISCUSSION_TIME} = \%discussiontime;
     $self->{EMAIL_STATUS} = \%emailstatus;
+    $self->{LAST_READ} = \%lastreadtime;
     
     $self->{EMAIL_DISCUSS_GENERATED} = 1;
 }
@@ -1926,8 +1937,20 @@ sub hasDiscussion {
     if (!defined($self->{DISCUSSION_TIME})) { return 0; }
 
     #return defined($self->{DISCUSSION_TIME}->{$symb});
-    return $self->{DISCUSSION_TIME}->{$symb} >
-           $self->{LAST_CHECK};
+
+# backward compatibility (bulletin boards used to be 'wrapped')
+    my $ressymb = $symb;
+    if ($ressymb =~ m|adm/(\w+)/(\w+)/(\d+)/bulletinboard$|) {
+        unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
+            $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard';
+        }
+    }
+
+    if ( defined ( $self->{LAST_READ}->{$ressymb} ) ) {
+        return $self->{DISCUSSION_TIME}->{$ressymb} > $self->{LAST_READ}->{$ressymb};
+    } else {
+        return $self->{DISCUSSION_TIME}->{$ressymb} >  $self->{LAST_CHECK};
+    }
 }
 
 # Private method: Does the given resource (as a symb string) have