--- loncom/interface/lonnavmaps.pm 2002/02/28 19:45:14 1.27
+++ loncom/interface/lonnavmaps.pm 2002/06/24 14:28:10 1.36
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Navigate Maps Handler
#
-# $Id: lonnavmaps.pm,v 1.27 2002/02/28 19:45:14 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.36 2002/06/24 14:28:10 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -178,10 +178,11 @@ sub parmval {
# 1: not attempted
# 2: attempted but wrong, or incorrect by instructor
# 3: solved or correct by instructor
-# "excused" needs to be supported, but is not yet. Could be code=4.
+# 4: partially correct (one or more parts correct)
+# "excused" needs to be supported, but is not yet.
sub astatus {
my $rid=shift;
- my $code=1;
+ my $code=0;
my $ctext='';
$rid=~/(\d+)\.(\d+)/;
my $symb=&Apache::lonnet::declutter($hash{'map_id_'.$1}).'___'.$2.'___'.
@@ -238,13 +239,14 @@ sub astatus {
my $status=$returnhash{'resource.'.$_.'.solved'};
if ($status eq 'correct_by_student') {
- unless ($code==2) { $code=3; }
+ if ($code==0||$code==3) { $code=3; } else { $code=4; }
$ctext.=' solved';
} elsif ($status eq 'correct_by_override') {
- unless ($code==2) { $code=3; }
+ if ($code==0||$code==3) { $code=3; } else { $code=4; }
$ctext.=' override';
} elsif ($status eq 'incorrect_attempted') {
- $code=2;
+ if ($code!=4 && $code!=3) { $code=2; }
+ if ($code==3) { $code=4; }
$ctext.=' ('.
($returnhash{'resource.'.$_.'.tries'}?
$returnhash{'resource.'.$_.'.tries'}:'0');
@@ -252,443 +254,491 @@ sub astatus {
if ($numtries) { $ctext.='/'.$numtries.' tries'; }
$ctext.=')';
} elsif ($status eq 'incorrect_by_override') {
- $code=2;
+ if ($code!=4 && $code!=3) { $code=2; }
+ if ($code==3) { $code=4; }
$ctext.=' override';
} elsif ($status eq 'excused') {
- unless ($code==2) { $code=3; }
+ if ($code==0||$code==3) { $code=3; } else { $code=4; }
$ctext.=' excused';
+ } else {
+ if ($code==0) { $code=1; }
}
}
return 'p'.$code.$tcode.'"'.$ctext.'"';
}
+
+sub addresource {
+ my ($resource,$sofar,$rid,$showtypes,$indent,$linkid)=@_;
+ if ($showtypes eq 'problems') {
+ if ($resource!~/\.(problem|exam|quiz|assess|survey|form)$/) {
+ return;
+ }
+ }
+ my $brepriv=&Apache::lonnet::allowed('bre',$resource);
+ if ($hash{'src_'.$rid}) {
+ if ((($brepriv eq '2') && (!$hash{'randomout_'.$rid}))
+ || ($brepriv eq 'F')) {
+ my $pprefix='';
+ if ($resource=~/\.(problem|exam|quiz|assess|survey|form)$/) {
+ $pprefix=&astatus($rid);
+ }
+ $$sofar++;
+ if ($indent) { $pprefix='i'.$indent.','.$pprefix; }
+ if ($linkid) { $pprefix='l'.$linkid.','.$pprefix; }
+ if (defined($rows[$$sofar])) {
+ $rows[$$sofar].='&'.$pprefix.$rid;
+ } else {
+ $rows[$$sofar]=$pprefix.$rid;
+ }
+ }
+ }
+}
+
+sub followlinks () {
+ my ($rid,$sofar,$beenhere,$further,$showtypes,$indent,$linkid)=@_;
+ my $mincond=1;
+ my $next='';
+ foreach (split(/\,/,$hash{'to_'.$rid})) {
+ my $thiscond=
+ &Apache::lonnet::directcondval($hash{'condid_'.$hash{'undercond_'.$_}});
+ if ($thiscond>=$mincond) {
+ if ($next) {
+ $next.=','.$_.':'.$thiscond;
+ } else {
+ $next=$_.':'.$thiscond;
+ }
+ if ($thiscond>$mincond) { $mincond=$thiscond; }
+ }
+ }
+ my $col=0;
+ &Apache::lonxml::debug("following links -$next-");
+ foreach (split(/\,/,$next)) {
+ my ($nextlinkid,$condval)=split(/\:/,$_);
+ if ($condval>=$mincond) {
+ my $now=&tracetable($sofar,$hash{'goesto_'.$nextlinkid},
+ $beenhere,$showtypes,$indent,$linkid);
+ if ($now>$further) {
+ if ($col>0) {
+ my $string;
+ for(my $i=0;$i<$col;$i++) { $string.='&'; }
+ for(my $i=$further+1;$now-1>$i;$i++) {
+ $rows[$i]=$string.$rows[$i];
+ }
+ }
+ $further=$now;
+ }
+ }
+ $col++;
+ }
+ return $further;
+}
# ------------------------------------------------------------ Build page table
sub tracetable {
- my ($sofar,$rid,$beenhere)=@_;
+ my ($sofar,$rid,$beenhere,$showtypes,$indent,$linkid)=@_;
+ my $newshowtypes=$showtypes;
my $further=$sofar;
- unless ($beenhere=~/\&$rid\&/) {
- $beenhere.=$rid.'&';
-
- if (defined($hash{'is_map_'.$rid})) {
- $sofar++;
- my $tprefix='';
- if ($hash{'map_type_'.$hash{'map_pc_'.$hash{'src_'.$rid}}}
- eq 'sequence') {
- $tprefix='h';
- }
- if (defined($rows[$sofar])) {
- $rows[$sofar].='&'.$tprefix.$rid;
- } else {
- $rows[$sofar]=$tprefix.$rid;
- }
- if ((defined($hash{'map_start_'.$hash{'src_'.$rid}})) &&
- (defined($hash{'map_finish_'.$hash{'src_'.$rid}})) &&
- ($tprefix eq 'h')) {
- my $frid=$hash{'map_finish_'.$hash{'src_'.$rid}};
- $sofar=
- &tracetable($sofar,$hash{'map_start_'.$hash{'src_'.$rid}},
- '&'.$frid.'&');
- $sofar++;
- if ($hash{'src_'.$frid}) {
- my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$frid});
- if (($brepriv eq '2') || ($brepriv eq 'F')) {
- my $pprefix='';
- if ($hash{'src_'.$frid}=~
- /\.(problem|exam|quiz|assess|survey|form)$/) {
- $pprefix=&astatus($frid);
-
- }
- if (defined($rows[$sofar])) {
- $rows[$sofar].='&'.$pprefix.$frid;
- } else {
- $rows[$sofar]=$pprefix.$frid;
- }
- }
- }
- }
- } else {
- $sofar++;
- if ($hash{'src_'.$rid}) {
- my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$rid});
- if (($brepriv eq '2') || ($brepriv eq 'F')) {
- my $pprefix='';
- if ($hash{'src_'.$rid}=~
- /\.(problem|exam|quiz|assess|survey|form)$/) {
- $pprefix=&astatus($rid);
- }
- if (defined($rows[$sofar])) {
- $rows[$sofar].='&'.$pprefix.$rid;
- } else {
- $rows[$sofar]=$pprefix.$rid;
- }
- }
- }
- }
-
- if (defined($hash{'to_'.$rid})) {
- my $mincond=1;
- my $next='';
- foreach (split(/\,/,$hash{'to_'.$rid})) {
- my $thiscond=
- &Apache::lonnet::directcondval($hash{'condid_'.$hash{'undercond_'.$_}});
- if ($thiscond>=$mincond) {
- if ($next) {
- $next.=','.$_.':'.$thiscond;
- } else {
- $next=$_.':'.$thiscond;
- }
- if ($thiscond>$mincond) { $mincond=$thiscond; }
- }
- }
- foreach (split(/\,/,$next)) {
- my ($linkid,$condval)=split(/\:/,$_);
- if ($condval>=$mincond) {
- my $now=&tracetable($sofar,$hash{'goesto_'.$linkid},$beenhere);
- if ($now>$further) { $further=$now; }
- }
- }
+ #$Apache::lonxml::debug=1;
+ &Apache::lonxml::debug("$rid ; $linkid ; $sofar ; $beenhere ; ".$hash{'src_'.$rid});
+ if ($beenhere=~/\&$rid\&/) { return $further; }
+ $beenhere.=$rid.'&';
+
+ if (defined($hash{'is_map_'.$rid})) {
+ $sofar++;
+ my $tprefix='';
+ if ($hash{'map_type_'.$hash{'map_pc_'.$hash{'src_'.$rid}}}
+ eq 'sequence') {
+ $tprefix='h';
+ } elsif ($hash{'map_type_'.$hash{'map_pc_'.$hash{'src_'.$rid}}}
+ eq 'page') {
+ $tprefix='j';
+ if ($indent) { $tprefix='i'.$indent.','.$tprefix; }
+ if ($linkid) { $tprefix='l'.$linkid.','.$tprefix; }
+ $newshowtypes='problems';
+ $indent++;
+ #if in a .page continue to link the encompising .page
+ if (!$linkid) { $linkid=$rid; }
+ }
+ if (defined($rows[$sofar])) {
+ $rows[$sofar].='&'.$tprefix.$rid;
+ } else {
+ $rows[$sofar]=$tprefix.$rid;
+ }
+ if ((defined($hash{'map_start_'.$hash{'src_'.$rid}})) &&
+ (defined($hash{'map_finish_'.$hash{'src_'.$rid}}))) {
+ my $frid=$hash{'map_finish_'.$hash{'src_'.$rid}};
+ $sofar=&tracetable($sofar,$hash{'map_start_'.$hash{'src_'.$rid}},
+ '&'.$frid.'&',$newshowtypes,$indent,$linkid);
+ &addresource($hash{'src_'.$frid},\$sofar,$frid,$newshowtypes,
+ $indent,$linkid);
+ if ($tprefix =~ /j$/) { $indent--; $linkid=''; }
+ }
+ } else {
+ &addresource($hash{'src_'.$rid},\$sofar,$rid,$showtypes,
+ $indent,$linkid);
+ }
- }
+ if (defined($hash{'to_'.$rid})) {
+ $further=&followlinks($rid,$sofar,$beenhere,$further,$showtypes,
+ $indent,$linkid);
}
+
return $further;
}
# ================================================================ Main Handler
sub handler {
- my $r=shift;
+ my $r=shift;
# ------------------------------------------- Set document type for header only
- if ($r->header_only) {
- if ($ENV{'browser.mathml'}) {
- $r->content_type('text/xml');
- } else {
- $r->content_type('text/html');
- }
- $r->send_http_header;
- return OK;
- }
- my $requrl=$r->uri;
+ if ($r->header_only) {
+ if ($ENV{'browser.mathml'}) {
+ $r->content_type('text/xml');
+ } else {
+ $r->content_type('text/html');
+ }
+ $r->send_http_header;
+ return OK;
+ }
+ my $requrl=$r->uri;
+ my $hashtied;
# ----------------------------------------------------------------- Tie db file
- if ($ENV{'request.course.fn'}) {
- my $fn=$ENV{'request.course.fn'};
- if (-e "$fn.db") {
- if ((tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER,0640)) &&
- (tie(%parmhash,'GDBM_File',
- $ENV{'request.course.fn'}.'_parms.db',&GDBM_READER,0640))) {
+ my $fn;
+ if ($ENV{'request.course.fn'}) {
+ $fn=$ENV{'request.course.fn'};
+ if (-e "$fn.db") {
+ if ((tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER,0640)) &&
+ (tie(%parmhash,'GDBM_File',
+ $ENV{'request.course.fn'}.'_parms.db',
+ &GDBM_READER,0640))) {
+ $hashtied=1;
+ }
+ }
+ }
+ if (!$hashtied) {
+ $ENV{'user.error.msg'}="$requrl:bre:0:0:Course not initialized";
+ return HTTP_NOT_ACCEPTABLE;
+ }
+
# ------------------------------------------------------------------- Hash tied
- my $firstres=$hash{'map_start_/res/'.$ENV{'request.course.uri'}};
- my $lastres=$hash{'map_finish_/res/'.$ENV{'request.course.uri'}};
- if (($firstres) && ($lastres)) {
+
+ if ($ENV{'browser.mathml'}) {
+ $r->content_type('text/xml');
+ } else {
+ $r->content_type('text/html');
+ }
+ &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'}};
+ if (!(($firstres) && ($lastres))) {
+ $r->print('Coursemap undefined.');
+ } else {
+
# ----------------------------------------------------------------- Render page
# -------------------------------------------------------------- Set parameters
# ---------------------------- initialize coursedata and userdata for this user
- undef %courseopt;
- undef %useropt;
+ undef %courseopt;
+ undef %useropt;
- my $uname=$ENV{'user.name'};
- my $udom=$ENV{'user.domain'};
- my $uhome=$ENV{'user.home'};
- my $cid=$ENV{'request.course.id'};
- my $chome=$ENV{'course.'.$cid.'.home'};
- my ($cdom,$cnum)=split(/\_/,$cid);
+ my $uname=$ENV{'user.name'};
+ my $udom=$ENV{'user.domain'};
+ my $uhome=$ENV{'user.home'};
+ my $cid=$ENV{'request.course.id'};
+ my $chome=$ENV{'course.'.$cid.'.home'};
+ my ($cdom,$cnum)=split(/\_/,$cid);
- my $userprefix=$uname.'_'.$udom.'_';
+ my $userprefix=$uname.'_'.$udom.'_';
- unless ($uhome eq 'no_host') {
+ unless ($uhome eq 'no_host') {
# -------------------------------------------------------------- Get coursedata
- unless
- ((time-$courserdatas{$cid.'.last_cache'})<240) {
- my $reply=&Apache::lonnet::reply('dump:'.$cdom.':'.$cnum.
- ':resourcedata',$chome);
- if ($reply!~/^error\:/) {
- $courserdatas{$cid}=$reply;
- $courserdatas{$cid.'.last_cache'}=time;
- }
- }
- foreach (split(/\&/,$courserdatas{$cid})) {
- my ($name,$value)=split(/\=/,$_);
- $courseopt{$userprefix.&Apache::lonnet::unescape($name)}=
- &Apache::lonnet::unescape($value);
- }
+ unless ((time-$courserdatas{$cid.'.last_cache'})<240) {
+ my $reply=&Apache::lonnet::reply('dump:'.$cdom.':'.$cnum.
+ ':resourcedata',$chome);
+ if ($reply!~/^error\:/) {
+ $courserdatas{$cid}=$reply;
+ $courserdatas{$cid.'.last_cache'}=time;
+ }
+ }
+ foreach (split(/\&/,$courserdatas{$cid})) {
+ my ($name,$value)=split(/\=/,$_);
+ $courseopt{$userprefix.&Apache::lonnet::unescape($name)}=
+ &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;
- }
- }
- foreach (split(/\&/,$userrdatas{$uname.'___'.$udom})) {
- my ($name,$value)=split(/\=/,$_);
- $useropt{$userprefix.&Apache::lonnet::unescape($name)}=
- &Apache::lonnet::unescape($value);
- }
- }
-
- @rows=();
-
- &tracetable(0,$firstres,'&'.$lastres.'&');
- if ($hash{'src_'.$lastres}) {
- my $brepriv=
- &Apache::lonnet::allowed('bre',$hash{'src_'.$lastres});
- if (($brepriv eq '2') || ($brepriv eq 'F')) {
- $rows[$#rows+1]=''.$lastres;
- }
- }
+ 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;
+ }
+ }
+ foreach (split(/\&/,$userrdatas{$uname.'___'.$udom})) {
+ my ($name,$value)=split(/\=/,$_);
+ $useropt{$userprefix.&Apache::lonnet::unescape($name)}=
+ &Apache::lonnet::unescape($value);
+ }
+ }
+
+ @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;
+ }
+ }
# ------------------------------------------------------------------ Page parms
- my $j;
- my $i;
- my $lcm=1;
- my $contents=0;
+ my $j;
+ my $i;
+ my $lcm=1;
+ my $contents=0;
# ---------------------------------------------- Go through table to get layout
- for ($i=0;$i<=$#rows;$i++) {
- if ($rows[$i]) {
- $contents++;
- my @colcont=split(/\&/,$rows[$i]);
- $lcm*=($#colcont+1)/euclid($lcm,($#colcont+1));
- }
- }
+ for ($i=0;$i<=$#rows;$i++) {
+ if ($rows[$i]) {
+ &Apache::lonxml::debug("Row $i is:".$rows[$i]);
+ $contents++;
+ my @colcont=split(/\&/,$rows[$i]);
+ $lcm*=($#colcont+1)/euclid($lcm,($#colcont+1));
+ }
+ }
- unless ($contents) {
- $r->content_type('text/html');
- $r->send_http_header;
- $r->print('Empty Map.');
- } else {
+ unless ($contents) {
+ $r->print('Empty Map.');
+ } else {
# ------------------------------------------------------------------ Build page
- my $currenturl=$ENV{'form.postdata'};
- $currenturl=~s/^http\:\/\///;
- $currenturl=~s/^[^\/]+//;
+ my $currenturl=$ENV{'form.postdata'};
+ $currenturl=~s/^http\:\/\///;
+ $currenturl=~s/^[^\/]+//;
# ---------------------------------------------------------------- Send headers
- $r->content_type('text/html');
- &Apache::loncommon::no_cache($r);
- $r->send_http_header;
-
- my $date=localtime;
- my $now=time;
+ my $date=localtime;
+ my $now=time;
# ----------------------------------------- Get email status and discussiontime
- my %emailstatus=&Apache::lonnet::dump('email_status');
- my $logouttime=$emailstatus{'logout'};
- my $courseleave=
- $emailstatus{'logout_'.$ENV{'request.course.id'}};
- my $lastcheck=
- ($courseleave>$logouttime?$courseleave:$logouttime);
-
- my %discussiontimes=&Apache::lonnet::dump(
- 'discussiontimes',
- $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-
- my %feedback=();
- my %error=();
- foreach my $msgid (
- split(/\&/,&Apache::lonnet::reply('keys:'.
- $ENV{'user.domain'}.':'.
- $ENV{'user.name'}.':nohist_email',
- $ENV{'user.home'}))) {
- $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 ($what eq 'Error') {
- $error{$url}.=','.$msgid;
- } else {
- $feedback{$url}.=','.$msgid;
- }
- }
- }
- }
+ my %emailstatus=&Apache::lonnet::dump('email_status');
+ my $logouttime=$emailstatus{'logout'};
+ my $courseleave=$emailstatus{'logout_'.$ENV{'request.course.id'}};
+ my $lastcheck=($courseleave>$logouttime?$courseleave:$logouttime);
+
+ my %discussiontimes=&Apache::lonnet::dump('discussiontimes',
+ $cdom,$cnum);
+
+ my %feedback=();
+ my %error=();
+ foreach my $msgid (split(/\&/,&Apache::lonnet::reply('keys:'.
+ $ENV{'user.domain'}.':'.
+ $ENV{'user.name'}.':nohist_email',
+ $ENV{'user.home'}))) {
+ $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 ($what eq 'Error') {
+ $error{$url}.=','.$msgid;
+ } else {
+ $feedback{$url}.=','.$msgid;
+ }
+ }
+ }
+ }
# ----------------------------------------------------------- Start Page Output
- $r->print(
- 'Navigate LON-CAPA Maps');
- $r->print('print(' onLoad="window.location.hash='.
- "'curloc'".'"');
- }
- $r->print('>'.
- '
'.
- 'Navigate Course Map
'.
- "$date
");
- $r->rflush();
- $r->print(
- '
New discussion since '.
- localtime($lastcheck).
- '
New message (click to open)');
- if (($currenturl=~/^\/res/) &&
- ($currenturl!~/^\/res\/adm/)) {
- $r->print('Current Location
');
- }
+ $r->print('
Navigate LON-CAPA Maps');
+ $r->print('print(' onLoad="window.location.hash='."'curloc'".'"');
+ }
+ $r->print('>'.
+ ''.
+ 'Navigate Course Map
'.
+ "$date
");
+ $r->rflush();
+ $r->print(' New discussion since '.
+ localtime($lastcheck).
+ '
New message (click to open)');
+ if (($currenturl=~/^\/res/) &&
+ ($currenturl!~/^\/res\/adm/)) {
+ $r->print('Current Location
');
+ }
# ----------------------------------------------------- The little content list
- for ($i=0;$i<=$#rows;$i++) {
- if ($rows[$i]) {
- my @colcont=split(/\&/,$rows[$i]);
- my $avespan=$lcm/($#colcont+1);
- for ($j=0;$j<=$#colcont;$j++) {
- my $rid=$colcont[$j];
- if ($rid=~/^h(.+)/) {
- $rid=$1;
- $r->print(
- ' '.$hash{'title_'.$rid}.'
');
- }
- }
- }
- }
+ for ($i=0;$i<=$#rows;$i++) {
+ if ($rows[$i]) {
+ my @colcont=split(/\&/,$rows[$i]);
+ my $avespan=$lcm/($#colcont+1);
+ for ($j=0;$j<=$#colcont;$j++) {
+ my $rid=$colcont[$j];
+ if ($rid=~/^h(.+)/) {
+ $rid=$1;
+ $r->print(' '.$hash{'title_'.$rid}.
+ '
');
+ }
+ }
+ }
+ }
# ----------------------------------------------------------------- Start table
- $r->print('
');
- for ($i=0;$i<=$#rows;$i++) {
- if ($rows[$i]) {
- $r->print("\n");
- my @colcont=split(/\&/,$rows[$i]);
- my $avespan=$lcm/($#colcont+1);
- for ($j=0;$j<=$#colcont;$j++) {
- my $rid=$colcont[$j];
- my $add='| ';
- my $adde=' | ';
- my $hwk='';
- my $hwke='';
- if ($rid=~/^h(.+)/) {
- $rid=$1;
- $add=
- '';
- $adde=' | ';
- }
- if ($rid=~/^p(\d)(\d)\"([\w\: \(\)\/\,]*)\"(.+)/) {
- # sub astatus describes what code/tcode mean
- my $code=$1;
- my $tcode=$2;
- my $ctext=$3;
- $rid=$4;
- if ($tcode eq '1') {
- $add='';
- }
- if ($code eq '3') {
- $add=' | ';
- } else {
- $add=' | ';
- if ($tcode eq '2') {
- $add=' | ';
- }
- if ($tcode eq '4') {
- $add=' | ';
- $adde=' | ';
- }
- }
- $hwk='';
- $hwke='';
- if ($code eq '1') {
- $hwke=' ('.$ctext.')';
- }
- if ($code eq '2') {
- $hwk='';
- $hwke=' ('.$ctext.')';
- }
- if ($code eq '3') {
- $hwk='';
- $hwke=' ('.$ctext.')';
- }
- }
- if ($hash{'src_'.$rid} eq $currenturl) {
- $add=$add.''.
- '> ';
- $adde=
- ' <'.$adde;
- }
- my $src=
- &Apache::lonnet::declutter($hash{'src_'.$rid});
- $rid=~/^(\d+)\.(\d+)$/;
- my $symb=
- &Apache::lonnet::declutter($hash{'map_id_'.$1}).'___'.$2.'___'.$src;
- if ($discussiontimes{$symb}>$lastcheck) {
- $adde=
- ''.
- $adde;
- }
- if ($error{$src}) {
- foreach (split(/\,/,$error{$src})) {
- if ($_) {
- $adde=
- ' 
'
- .$adde;
- }
- }
- }
- if ($feedback{$src}) {
- foreach (split(/\,/,$feedback{$src})) {
- if ($_) {
- $adde=
- ' '
- .$adde;
- }
- }
- }
- $r->print($add.''.$hwk.
- $hash{'title_'.$rid}.$hwke.''.$adde);
- }
- $r->print('
');
- }
- }
- $r->print("\n
");
- $r->print('');
+ $r->print('
');
+ for ($i=0;$i<=$#rows;$i++) {
+ if ($rows[$i]) {
+ $r->print("\n");
+ my @colcont=split(/\&/,$rows[$i]);
+ my $avespan=$lcm/($#colcont+1);
+ for ($j=0;$j<=$#colcont;$j++) {
+ my $indent;my $indentstr;
+ my $linkid;
+ my $rid=$colcont[$j];
+ $rid=~/(\d+)\.(\d+)$/;
+ my $src=
+ &Apache::lonnet::declutter($hash{'src_'.$1.'.'.$2});
+ my $symb=
+ &Apache::lonnet::declutter($hash{'map_id_'.$1}).'___'.$2.'___'.$src;
+ my $add='| ';
+ my $adde=' | ';
+ my $hwk='';
+ my $hwke='';
+ if ($rid=~/^l(\d+\.\d+),(.+)/) { $linkid=$1; $rid=$2; }
+ if ($rid=~/^i(\d+),(.+)/) { $indent=$1; $rid=$2; }
+ if ($rid=~/^h(.+)/) {
+ $rid=$1;
+ $add='';
+ $adde=' | ';
+ if (($ENV{'user.adv'}) &&
+ ($parmhash{$symb.'.0.parameter_randompick'})) {
+ $adde=' (randomly select '.
+ $parmhash{$symb.'.0.parameter_randompick'}.
+ ')';
+ }
+ }
+ if ($rid=~/^j(.+)/) { $rid=$1; }
+ if ($rid=~/^p(\d)(\d)\"([\w\: \(\)\/\,]*)\"(.+)/) {
+ # sub astatus describes what code/tcode mean
+ my $code=$1;
+ my $tcode=$2;
+ my $ctext=$3;
+ $rid=$4;
+ if ($tcode eq '1') {
+ $add='';
+ }
+ if ($code eq '3') {
+ $add=' | ';
+ } elsif ($code eq '4') {
+ $add=' | ';
+ } else {
+ $add=' | ';
+ if ($tcode eq '2') {
+ $add=' | ';
+ }
+ if ($tcode eq '4') {
+ $add=' | ';
+ $adde=' | ';
+ }
+ }
+ $hwk='';
+ $hwke='';
+ if ($code eq '1') {
+ $hwke=' ('.$ctext.')';
+ }
+ if ($code eq '2' || $code eq '4') {
+ $hwk='';
+ $hwke=' ('.$ctext.')';
+ }
+ if ($code eq '3') {
+ $hwk='';
+ $hwke=' ('.$ctext.')';
+ }
+ }
+ if ($rid && $hash{'src_'.$rid} eq $currenturl) {
+ $add=$add.''.
+ '> ';
+ $adde=
+ ' <'.$adde;
+ }
+ if ($discussiontimes{$symb}>$lastcheck) {
+ $adde=
+ ''.
+ $adde;
+ }
+ if ($error{$src}) {
+ foreach (split(/\,/,$error{$src})) {
+ if ($_) {
+ $adde=
+ ' '
+ .$adde;
+ }
+ }
+ }
+ if ($feedback{$src}) {
+ foreach (split(/\,/,$feedback{$src})) {
+ if ($_) {
+ $adde=
+ ' '
+ .$adde;
+ }
+ }
+ }
+ if ($indent) {
+ my $is=" ";
+ for(my $i=-1;$i<$indent;$i++) { $indentstr.=$is; }
+ }
+ if (!$linkid) { $linkid=$rid; }
+ $r->print($add.$indentstr);
+ if ($rid) {
+ $r->print(''.
+ $hwk.$hash{'title_'.$rid}.$hwke.'');
+ }
+ $r->print($adde);
+ }
+ $r->print('
');
+ }
+ }
+ $r->print("\n
");
+ $r->print('');
# -------------------------------------------------------------------- End page
- }
+ }
# ------------------------------------------------------------- End render page
- } else {
- $r->content_type('text/html');
- $r->send_http_header;
- $r->print('Coursemap undefined.');
- }
+ }
# ------------------------------------------------------------------ Untie hash
- unless (untie(%hash)) {
- &Apache::lonnet::logthis("WARNING: ".
- "Could not untie coursemap $fn (browse).");
- }
- unless (untie(%parmhash)) {
- &Apache::lonnet::logthis("WARNING: ".
- "Could not untie parmhash (browse).");
- }
-# -------------------------------------------------------------------- All done
- return OK;
-# ----------------------------------------------- Errors, hash could no be tied
- }
- }
- }
-
- $ENV{'user.error.msg'}="$requrl:bre:0:0:Course not initialized";
- return HTTP_NOT_ACCEPTABLE;
+ unless (untie(%hash)) {
+ &Apache::lonnet::logthis("WARNING: ".
+ "Could not untie coursemap $fn (browse).");
+ }
+ unless (untie(%parmhash)) {
+ &Apache::lonnet::logthis("WARNING: ".
+ "Could not untie parmhash (browse).");
+ }
+ return OK;
}
1;