--- loncom/interface/lonnavmaps.pm	2005/04/15 21:28:54	1.325
+++ loncom/interface/lonnavmaps.pm	2005/04/15 22:03:23	1.326
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.325 2005/04/15 21:28:54 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.326 2005/04/15 22:03:23 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2112,39 +2112,36 @@ sub generate_course_user_opt {
 
     my $uname=$env{'user.name'};
     my $udom=$env{'user.domain'};
-    my $uhome=$env{'user.home'};
     my $cid=$env{'request.course.id'};
-    my ($cdom,$cnum)=split(/\_/,$cid);
+    my $cdom=$env{'course.'.$cid.'.domain'};
+    my $cnum=$env{'course.'.$cid.'.num'};
     
-    my %useropt; my %courseopt;
-    unless ($uhome eq 'no_host') { 
-# ------------------------------------------------- Get coursedata (if present)
-	%courseopt=&Apache::lonnet::dump('resourcedata',$cdom,$cnum);
-	# Check for network failure
-	my ($tmp)=keys(%courseopt);
+    my $useropt; my $courseopt;
 
-	if ( $tmp =~ /no.such.host/i || $tmp =~ /con_lost/i) {
+# ------------------------------------------------- Get coursedata (if present)
+    my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
+    # Check for network failure
+    if (!ref($courseopt)) {
+	if ( $courseopt =~ /no.such.host/i || $courseopt =~ /con_lost/i) {
 	    $self->{NETWORK_FAILURE} = 1;
-	    undef(%courseopt);
-	} elsif ($tmp=~/^error\:/) {
-	    undef(%courseopt);
 	}
+	undef($courseopt);
+    }
 
 # --------------------------------------------------- Get userdata (if present)
 	
-	%useropt=&Apache::lonnet::dump('resourcedata',$udom,$uname);
-	($tmp)=keys(%courseopt);
-	if ($tmp=~/^error\:/) {
-	    undef(%useropt);
-	} elsif ( $tmp=~/no.such.host/i || $tmp=~/con.lost/i ) {
-	    # check to see if network failed
+    my $useropt=&Apache::lonnet::get_userresdata($uname,$udom);
+    # Check for network failure
+    if (!ref($useropt)) {
+	if ( $useropt =~ /no.such.host/i || $useropt =~ /con_lost/i) {
 	    $self->{NETWORK_FAILURE} = 1;
-	    undef(%useropt);
 	}
-	$self->{COURSE_OPT} = \%courseopt;
-	$self->{USER_OPT} = \%useropt;
+	undef($useropt);
     }
 
+    $self->{COURSE_OPT} = $courseopt;
+    $self->{USER_OPT} = $useropt;
+
     $self->{COURSE_USER_OPT_GENERATED} = 1;
     
     return;
@@ -2156,7 +2153,8 @@ sub generate_email_discuss_status {
     if ($self->{EMAIL_DISCUSS_GENERATED}) { return; }
 
     my $cid=$env{'request.course.id'};
-    my ($cdom,$cnum)=split(/\_/,$cid);
+    my $cdom=$env{'course.'.$cid.'.domain'};
+    my $cnum=$env{'course.'.$cid.'.num'};
     
     my %emailstatus = &Apache::lonnet::dump('email_status');
     my $logoutTime = $emailstatus{'logout'};