--- loncom/interface/lonnavmaps.pm 2002/08/12 18:21:42 1.40
+++ loncom/interface/lonnavmaps.pm 2002/09/05 19:47:29 1.48
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Navigate Maps Handler
#
-# $Id: lonnavmaps.pm,v 1.40 2002/08/12 18:21:42 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.48 2002/09/05 19:47:29 bowersj2 Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -67,6 +67,10 @@ my %courseopt;
my %useropt;
my %parmhash;
+# This parameter keeps track of whether obtaining the user's information
+# failed, which the colorizer in astatus can use
+my $networkFailedFlag = 0;
+
# ------------------------------------------------------------------ Euclid gcd
sub euclid {
@@ -339,7 +343,7 @@ sub tracetable {
my ($sofar,$rid,$beenhere,$showtypes,$indent,$linkid)=@_;
my $newshowtypes=$showtypes;
my $further=$sofar;
- #$Apache::lonxml::debug=1;
+# $Apache::lonxml::debug=1;
&Apache::lonxml::debug("$rid ; $linkid ; $sofar ; $beenhere ; ".$hash{'src_'.$rid});
if ($beenhere=~/\&$rid\&/) { return $further; }
$beenhere.=$rid.'&';
@@ -434,8 +438,10 @@ sub handler {
&Apache::loncommon::no_cache($r);
$r->send_http_header;
- my $firstres=$hash{'map_start_/res/'.$ENV{'request.course.uri'}};
- my $lastres=$hash{'map_finish_/res/'.$ENV{'request.course.uri'}};
+ my $firstres=$hash{'map_start_'.
+ &Apache::lonnet::clutter($ENV{'request.course.uri'})};
+ my $lastres=$hash{'map_finish_'.
+ &Apache::lonnet::clutter($ENV{'request.course.uri'})};
if (!(($firstres) && ($lastres))) {
$r->print('Coursemap undefined.');
} else {
@@ -456,9 +462,9 @@ sub handler {
my ($cdom,$cnum)=split(/\_/,$cid);
my $userprefix=$uname.'_'.$udom.'_';
-
+
unless ($uhome eq 'no_host') {
-# -------------------------------------------------------------- Get coursedata
+# ------------------------------------------------- Get coursedata (if present)
unless ((time-$courserdatas{$cid.'.last_cache'})<240) {
my $reply=&Apache::lonnet::reply('dump:'.$cdom.':'.$cnum.
':resourcedata',$chome);
@@ -466,6 +472,11 @@ sub handler {
$courserdatas{$cid}=$reply;
$courserdatas{$cid.'.last_cache'}=time;
}
+ # check to see if network failed
+ elsif ( $reply=~/no.such.host/i || $reply=~/con.*lost/i )
+ {
+ $networkFailedFlag = 1;
+ }
}
foreach (split(/\&/,$courserdatas{$cid})) {
my ($name,$value)=split(/\=/,$_);
@@ -489,13 +500,7 @@ sub handler {
@rows=();
- &tracetable(0,$firstres,'&'.$lastres.'&','',0);
- if ($hash{'src_'.$lastres}) {
- my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$lastres});
- if (($brepriv eq '2') || ($brepriv eq 'F')) {
- $rows[$#rows+1]=''.$lastres;
- }
- }
+ &tracetable(0,$firstres,'&','',0);
# ------------------------------------------------------------------ Page parms
@@ -567,16 +572,19 @@ sub handler {
}
}
# ----------------------------------------------------------- Start Page Output
- $r->print('Navigate LON-CAPA Maps');
- $r->print('print(
+ 'Navigate Course Map');
if (($currenturl=~/^\/res/) &&
($currenturl!~/^\/res\/adm/)) {
- $r->print(' onLoad="window.location.hash='."'curloc'".'"');
+ $bodytagadd='onLoad="window.location.hash='."'curloc'".'"';
}
- $r->print('>'.
- '
'.
- 'Navigate Course Map
'.
- "$date
");
+ $r->print(&Apache::loncommon::bodytag('Navigate Course Map','',
+ $bodytagadd));
+ $r->print('');
+ my $desc=$ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+ if (defined($desc)) { $r->print("$desc
\n"); }
+ $r->print("$date
\n");
$r->rflush();
$r->print('
New discussion since '.
localtime($lastcheck).
@@ -585,6 +593,15 @@ sub handler {
($currenturl!~/^\/res\/adm/)) {
$r->print('Current Location');
}
+
+ # Handle a network error
+
+ if ($networkFailedFlag)
+ {
+ $r->print('
LON-CAPA network failure.
'."\n");
+ $r->print("LON-CAPA's network is having difficulties, some problem" .
+ " information, such as due dates, will not be available.");
+ }
# ----------------------------------------------------- The little content list
for ($i=0;$i<=$#rows;$i++) {
if ($rows[$i]) {
@@ -608,6 +625,8 @@ sub handler {
$r->print("\n
");
my @colcont=split(/\&/,$rows[$i]);
my $avespan=$lcm/($#colcont+1);
+
+ # for each item I wish to print on this row...
for ($j=0;$j<=$#colcont;$j++) {
my $indent;my $indentstr;
my $linkid;
@@ -641,19 +660,36 @@ sub handler {
my $tcode=$2;
my $ctext=$3;
$rid=$4;
- if ($tcode eq '1') {
+
+ # will open later
+ if ($tcode eq '1') {
$add='| ';
}
+
+ # solved/correct
if ($code eq '3') {
$add=' | ';
- } elsif ($code eq '4') {
+ } elsif ($code eq '4') { # partially correct
$add=' | ';
} else {
- $add=' | ';
- if ($tcode eq '2') {
+ # not attempted
+
+ # we end up here on network failure, so pick a neutral
+ # color if the network failed instead of bright red.
+ if ( $networkFailedFlag )
+ {
+ $add = ' | ';
+ }
+ else
+ {
+ $add=' | ';
+ }
+
+ if ($tcode eq '2') { # open, not past due
$add=' | ';
}
- if ($tcode eq '4') {
+
+ if ($tcode eq '4') { # due in next 24 hours
$add=' | ';
$adde=' | ';
}
@@ -671,6 +707,10 @@ sub handler {
$hwk='';
$hwke=' ('.$ctext.')';
}
+ if ($networkFailedFlag)
+ {
+ $hwke=' (status unavailable)';
+ }
}
if ($rid && $hash{'src_'.$rid} eq $currenturl) {
$add=$add.''.