--- loncom/interface/lonnavmaps.pm 2001/01/06 19:59:29 1.3 +++ loncom/interface/lonnavmaps.pm 2002/02/11 18:59:36 1.25 @@ -1,6 +1,30 @@ # The LearningOnline Network with CAPA # Navigate Maps Handler # +# $Id: lonnavmaps.pm,v 1.25 2002/02/11 18:59:36 albertel Exp $ +# +# Copyright Michigan State University Board of Trustees +# +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). +# +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ +# # (Page Handler # # (TeX Content Handler @@ -9,13 +33,17 @@ # 08/30,08/31,09/06,09/14,09/15,09/16,09/19,09/20,09/21,09/23, # 10/02,10/10,10/14,10/16,10/18,10/19,10/31,11/6,11/14,11/16 Gerd Kortemeyer) # -# 3/1/1,6/1 Gerd Kortemeyer +# 3/1/1,6/1,17/1,29/1,30/1,2/8,9/21,9/24,9/25 Gerd Kortemeyer +# YEAR=2002 +# 1/1 Gerd Kortemeyer +# package Apache::lonnavmaps; use strict; use Apache::Constants qw(:common :http); use Apache::lonnet(); +use Apache::loncommon(); use HTML::TokeParser; use GDBM_File; @@ -23,6 +51,22 @@ use GDBM_File; my %hash; my @rows; +# +# These cache hashes need to be independent of user, resource and course +# (user and course can/should be in the keys) +# + +my %courserdatas; +my %userrdatas; + +# +# These global hashes are dependent on user, course and resource, +# and need to be initialized every time when a sheet is calculated +# +my %courseopt; +my %useropt; +my %parmhash; + # ------------------------------------------------------------------ Euclid gcd sub euclid { @@ -36,6 +80,190 @@ sub euclid { return $b; } +# --------------------------------------------------------------------- Parmval + +# -------------------------------------------- Figure out a cascading parameter +# +# For this function to work +# +# * parmhash needs to be tied +# * courseopt and useropt need to be initialized for this user and course +# + +sub parmval { + my ($what,$symb)=@_; + my $cid=$ENV{'request.course.id'}; + my $csec=$ENV{'request.course.sec'}; + my $uname=$ENV{'user.name'}; + my $udom=$ENV{'user.domain'}; + + unless ($symb) { return ''; } + my $result=''; + + my ($mapname,$id,$fn)=split(/\_\_\_/,$symb); + +# ----------------------------------------------------- Cascading lookup scheme + my $rwhat=$what; + $what=~s/^parameter\_//; + $what=~s/\_/\./; + + my $symbparm=$symb.'.'.$what; + my $mapparm=$mapname.'___(all).'.$what; + my $usercourseprefix=$uname.'_'.$udom.'_'.$cid; + + my $seclevel= $usercourseprefix.'.['.$csec.'].'.$what; + my $seclevelr=$usercourseprefix.'.['.$csec.'].'.$symbparm; + my $seclevelm=$usercourseprefix.'.['.$csec.'].'.$mapparm; + + my $courselevel= $usercourseprefix.'.'.$what; + my $courselevelr=$usercourseprefix.'.'.$symbparm; + my $courselevelm=$usercourseprefix.'.'.$mapparm; + +# ---------------------------------------------------------- first, check user + if ($uname) { + if ($useropt{$courselevelr}) { return $useropt{$courselevelr}; } + if ($useropt{$courselevelm}) { return $useropt{$courselevelm}; } + if ($useropt{$courselevel}) { return $useropt{$courselevel}; } + } + +# ------------------------------------------------------- second, check course + if ($csec) { + if ($courseopt{$seclevelr}) { return $courseopt{$seclevelr}; } + if ($courseopt{$seclevelm}) { return $courseopt{$seclevelm}; } + if ($courseopt{$seclevel}) { return $courseopt{$seclevel}; } + } + + if ($courseopt{$courselevelr}) { return $courseopt{$courselevelr}; } + if ($courseopt{$courselevelm}) { return $courseopt{$courselevelm}; } + if ($courseopt{$courselevel}) { return $courseopt{$courselevel}; } + +# ----------------------------------------------------- third, check map parms + + my $thisparm=$parmhash{$symbparm}; + if ($thisparm) { return $thisparm; } + +# ----------------------------------------------------- fourth , check default + + my $default=&Apache::lonnet::metadata($fn,$rwhat.'.default'); + if ($default) { return $default} + +# --------------------------------------------------- fifth , cascade up parts + + my ($space,@qualifier)=split(/\./,$rwhat); + my $qualifier=join('.',@qualifier); + unless ($space eq '0') { + my ($part,$id)=split(/\_/,$space); + if ($id) { + my $partgeneral=&parmval($part.".$qualifier",$symb); + if ($partgeneral) { return $partgeneral; } + } else { + my $resourcegeneral=&parmval("0.$qualifier",$symb); + if ($resourcegeneral) { return $resourcegeneral; } + } + } + return ''; +} + + + +# ------------------------------------------------------------- Find out status +# return codes +# tcode (timecode) +# 1: will open later +# 2: is open and not past due yet +# 3: is past due date +# 4: due in the next 24 hours +# +# code (curent solved status) +# 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. +sub astatus { + my $rid=shift; + my $code=1; + my $ctext=''; + $rid=~/(\d+)\.(\d+)/; + my $symb=&Apache::lonnet::declutter($hash{'map_id_'.$1}).'___'.$2.'___'. + &Apache::lonnet::declutter($hash{'src_'.$rid}); + $Apache::lonxml::debug=1; + my %duedate=(); + my %opendate=(); + my %answerdate=(); + # need to always check part 0's open/due/answer status + foreach (sort(split(/\,/,&Apache::lonnet::metadata($hash{'src_'.$rid},'keys')))) { + if ($_=~/^parameter\_(.*)\_opendate$/) { + my $part=$1; + $duedate{$part}=&parmval($part.'.duedate',$symb); + $opendate{$part}=&parmval($part.'.opendate',$symb); + $answerdate{$part}=&parmval($part.'.answerdate',$symb); + } + } + my $now=time; + my $tcode=0; + + my %returnhash=&Apache::lonnet::restore($symb); + + foreach (sort(keys(%opendate))) { + my $duedate=$duedate{$_}; + my $opendate=$opendate{$_}; + my $answerdate=$answerdate{$_}; + my $preface=''; + unless ($_ eq '0') { $preface=' Part: '.$_.' '; } + if ($opendate) { + if ($now<$duedate || (!$duedate)) { + unless ($tcode==4) { $tcode=2; } + if ($duedate) { + $ctext.=$preface.'Due: '.localtime($duedate); + } else { + $ctext.=$preface.'No Due Date'; + } + if ($now<$opendate) { + unless ($tcode) { $tcode=1; } + $ctext.=$preface.'Open: '.localtime($opendate); + } + if ($duedate && $duedate-$now<86400) { + $tcode=4; + $ctext.=$preface.'Due: '.localtime($duedate); + } + } else { + unless (($tcode==4) || ($tcode eq 2)) { $tcode=3; } + if ($now<$answerdate) { + $ctext.='Answer: '.localtime($duedate); + } + } + } else { + unless (($tcode==2) || ($tcode==4)) { $tcode=1; } + } + + my $status=$returnhash{'resource.'.$_.'.solved'}; + + if ($status eq 'correct_by_student') { + unless ($code==2) { $code=3; } + $ctext.=' solved'; + } elsif ($status eq 'correct_by_override') { + unless ($code==2) { $code=3; } + $ctext.=' override'; + } elsif ($status eq 'incorrect_attempted') { + $code=2; + $ctext.=' ('. + ($returnhash{'resource.'.$_.'.tries'}? + $returnhash{'resource.'.$_.'.tries'}:'0'); + my $numtries = &parmval($_.'.maxtries',$symb); + if ($numtries) { $ctext.='/'.$numtries.' tries'; } + $ctext.=')'; + } elsif ($status eq 'incorrect_by_override') { + $code=2; + $ctext.=' override'; + } elsif ($status eq 'excused') { + unless ($code==2) { $code=3; } + $ctext.=' excused'; + } + } + + return 'p'.$code.$tcode.'"'.$ctext.'"'; +} + # ------------------------------------------------------------ Build page table sub tracetable { @@ -45,8 +273,20 @@ sub tracetable { $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}}))) { + (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}}, @@ -55,10 +295,16 @@ sub tracetable { 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].='&'.$frid; + $rows[$sofar].='&'.$pprefix.$frid; } else { - $rows[$sofar]=$frid; + $rows[$sofar]=$pprefix.$frid; } } } @@ -68,10 +314,15 @@ sub tracetable { 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].='&'.$rid; + $rows[$sofar].='&'.$pprefix.$rid; } else { - $rows[$sofar]=$rid; + $rows[$sofar]=$pprefix.$rid; } } } @@ -122,18 +373,67 @@ sub handler { $r->send_http_header; return OK; } - my $requrl=$r->uri; # ----------------------------------------------------------------- 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)) { + if ((tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER,0640)) && + (tie(%parmhash,'GDBM_File', + $ENV{'request.course.fn'}.'_parms.db',&GDBM_READER,0640))) { # ------------------------------------------------------------------- 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)) { # ----------------------------------------------------------------- Render page +# -------------------------------------------------------------- Set parameters + + +# ---------------------------- initialize coursedata and userdata for this user + 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 $userprefix=$uname.'_'.$udom.'_'; + + 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; + } + } + map { + my ($name,$value)=split(/\=/,$_); + $courseopt{$userprefix.&Apache::lonnet::unescape($name)}= + &Apache::lonnet::unescape($value); + } split(/\&/,$courserdatas{$cid}); +# --------------------------------------------------- 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; + } + } + map { + my ($name,$value)=split(/\=/,$_); + $useropt{$userprefix.&Apache::lonnet::unescape($name)}= + &Apache::lonnet::unescape($value); + } split(/\&/,$userrdatas{$uname.'___'.$udom}); + } @rows=(); @@ -149,6 +449,7 @@ sub handler { # ------------------------------------------------------------------ Page parms my $j; + my $i; my $lcm=1; my $contents=0; @@ -162,25 +463,108 @@ sub handler { } } + unless ($contents) { $r->content_type('text/html'); $r->send_http_header; $r->print('Empty Map.'); } else { + # ------------------------------------------------------------------ Build page + 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; - $r->print( - 'Navigate LON-CAPA Maps'); - $r->print(''. - '

Navigate Course Map

'); - $r->rflush(); + 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; + } + } + } + } +# ----------------------------------------------------------- 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

'); + } +# ----------------------------------------------------- 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}.'
'); + } + } + } + } # ----------------------------------------------------------------- Start table - $r->print(''); + $r->print('
'); for ($i=0;$i<=$#rows;$i++) { if ($rows[$i]) { $r->print("\n"); @@ -188,16 +572,97 @@ sub handler { my $avespan=$lcm/($#colcont+1); for ($j=0;$j<=$#colcont;$j++) { my $rid=$colcont[$j]; - $r->print(''); + my $add=''; + my $hwk=''; + my $hwke=''; + if ($rid=~/^h(.+)/) { + $rid=$1; + $add= + ''; + } + 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=''; + } + } + $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
'. - $hash{'title_'.$rid}.''); - $r->print('  '; + my $adde=''; + $adde=''; + } + if ($code eq '3') { + $add=''; + } else { + $add=''; + if ($tcode eq '2') { + $add=''; + } + if ($tcode eq '4') { + $add=''; + $adde='
"); - $r->print(''); # -------------------------------------------------------------------- End page } @@ -212,6 +677,10 @@ sub handler { &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 500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.