--- loncom/interface/lonnavmaps.pm	2005/04/07 06:56:23	1.320
+++ loncom/interface/lonnavmaps.pm	2005/04/15 21:08:37	1.324
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.320 2005/04/07 06:56:23 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.324 2005/04/15 21:08:37 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1588,13 +1588,7 @@ END
 	    my @allres=$navmap->retrieveResources();
 	    foreach my $resource (@allres) {
 		if ($resource->hasDiscussion()) {
-		    my $ressymb;
-		    if ($resource->symb() =~ m-(___adm/\w+/\w+)/(\d+)/bulletinboard$-) {
-			$ressymb = 'bulletin___'.$2.$1.'/'.$2.'/bulletinboard';
-		    } else {
-			$ressymb = $resource->symb();
-		    }
-		    $haveDisc .= $ressymb.':';
+		    $haveDisc .= $resource->wrap_symb().':';
 		    $totdisc ++;
 		}
 	    }
@@ -2128,16 +2122,14 @@ sub generate_course_user_opt {
     my %courserdatas; my %useropt; my %courseopt; my %userrdatas;
     unless ($uhome eq 'no_host') { 
 # ------------------------------------------------- Get coursedata (if present)
-	unless ((time-$courserdatas{$cid.'.last_cache'})<240) {
-	    my $reply=&Apache::lonnet::reply('dump:'.$cdom.':'.$cnum.
-					     ':resourcedata',$chome);
-	    # Check for network failure
-	    if ( $reply =~ /no.such.host/i || $reply =~ /con_lost/i) {
-		$self->{NETWORK_FAILURE} = 1;
-	    } elsif ($reply!~/^error\:/) {
-		$courserdatas{$cid}=$reply;
-		$courserdatas{$cid.'.last_cache'}=time;
-	    }
+	my $reply=&Apache::lonnet::reply('dump:'.$cdom.':'.$cnum.
+					 ':resourcedata',$chome);
+	# Check for network failure
+	if ( $reply =~ /no.such.host/i || $reply =~ /con_lost/i) {
+	    $self->{NETWORK_FAILURE} = 1;
+	} elsif ($reply!~/^error\:/) {
+	    $courserdatas{$cid}=$reply;
+	    $courserdatas{$cid.'.last_cache'}=time;
 	}
 	foreach (split(/\&/,$courserdatas{$cid})) {
 	    my ($name,$value)=split(/\=/,$_);
@@ -2145,17 +2137,15 @@ sub generate_course_user_opt {
 		&Apache::lonnet::unescape($value);
 	}
 # --------------------------------------------------- Get userdata (if present)
-	unless ((time-$userrdatas{$uname.'___'.$udom.'.last_cache'})<240) {
-	    my $reply=&Apache::lonnet::reply('dump:'.$udom.':'.$uname.':resourcedata',$uhome);
-	    if ($reply!~/^error\:/) {
-		$userrdatas{$uname.'___'.$udom}=$reply;
-		$userrdatas{$uname.'___'.$udom.'.last_cache'}=time;
-	    }
-	    # check to see if network failed
-	    elsif ( $reply=~/no.such.host/i || $reply=~/con.*lost/i )
-	    {
-		$self->{NETWORK_FAILURE} = 1;
-	    }
+	my $reply=&Apache::lonnet::reply('dump:'.$udom.':'.$uname.':resourcedata',$uhome);
+	if ($reply!~/^error\:/) {
+	    $userrdatas{$uname.'___'.$udom}=$reply;
+	    $userrdatas{$uname.'___'.$udom.'.last_cache'}=time;
+	}
+	# check to see if network failed
+	elsif ( $reply=~/no.such.host/i || $reply=~/con.*lost/i )
+	{
+	    $self->{NETWORK_FAILURE} = 1;
 	}
 	foreach (split(/\&/,$userrdatas{$uname.'___'.$udom})) {
 	    my ($name,$value)=split(/\=/,$_);
@@ -2281,21 +2271,14 @@ sub getIterator {
 sub hasDiscussion {
     my $self = shift;
     my $symb = shift;
-    
     $self->generate_email_discuss_status();
 
     if (!defined($self->{DISCUSSION_TIME})) { return 0; }
 
     #return defined($self->{DISCUSSION_TIME}->{$symb});
 
-# backward compatibility (bulletin boards used to be 'wrapped')
-    my $ressymb = $symb;
-    if ($ressymb =~ m|adm/(\w+)/(\w+)/(\d+)/bulletinboard$|) {
-        unless ($ressymb =~ m|adm/wrapper/adm|) {
-            $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard';
-        }
-    }
-
+    # backward compatibility (bulletin boards used to be 'wrapped')
+    my $ressymb = $self->wrap_symb($symb);
     if ( defined ( $self->{LAST_READ}->{$ressymb} ) ) {
         return $self->{DISCUSSION_TIME}->{$ressymb} > $self->{LAST_READ}->{$ressymb};
     } else {
@@ -2304,9 +2287,21 @@ sub hasDiscussion {
     }
 }
 
+sub wrap_symb {
+    my $self = shift;
+    my $symb = shift;
+    if ($symb =~ m-___(adm/\w+/\w+/)(\d+)(/bulletinboard)$-) {
+        unless ($symb =~ m|adm/wrapper/adm|) {
+            $symb = 'bulletin___'.$2.'___adm/wrapper/'.$1.$2.$3;
+        }
+    }
+    return $symb;
+}
+
 # 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 { 
     my $self = shift;
     my $symb = shift;
@@ -3531,6 +3526,10 @@ sub symb {
         . '___' . $second . '___' . $symbSrc;
     return &Apache::lonnet::symbclean($symb);
 }
+sub wrap_symb {
+    my $self = shift;
+    return $self->{NAV_MAP}->wrap_symb($self->symb());
+}
 sub title { 
     my $self=shift; 
     if ($self->{ID} eq '0.0') {