--- loncom/interface/loncoursedata.pm 2002/07/25 21:23:51 1.6 +++ loncom/interface/loncoursedata.pm 2002/07/26 16:22:09 1.7 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # (Publication Handler # -# $Id: loncoursedata.pm,v 1.6 2002/07/25 21:23:51 stredwic Exp $ +# $Id: loncoursedata.pm,v 1.7 2002/07/26 16:22:09 stredwic Exp $ # # Copyright Michigan State University Board of Trustees # @@ -106,16 +106,16 @@ sub DownloadClasslist { my ($courseDomain,$courseNumber)=split(/\_/,$courseID); my %classlist; -# my $modifiedTime = &GetFileTimestamp($courseDomain, $courseNumber, -# 'classlist.db', -# $Apache::lonnet::perlvar{'lonUsersDir'}); - -# if($lastDownloadTime ne 'Not downloaded' && -# $lastDownloadTime >= $modifiedTime && $modifiedTime >= 0) { -# $classlist{'lastDownloadTime'}=time; -# $classlist{'UpToDate'} = 'true'; -# return \%classlist; -# } + my $modifiedTime = &GetFileTimestamp($courseDomain, $courseNumber, + 'classlist.db', + $Apache::lonnet::perlvar{'lonUsersDir'}); + + if($lastDownloadTime ne 'Not downloaded' && + $lastDownloadTime >= $modifiedTime && $modifiedTime >= 0) { + $classlist{'lastDownloadTime'}=time; + $classlist{'UpToDate'} = 'true'; + return \%classlist; + } %classlist=&Apache::lonnet::dump('classlist',$courseDomain, $courseNumber); my ($checkForError)=keys (%classlist); @@ -186,14 +186,15 @@ sub DownloadCourseInformation { my %courseData; my ($name,$domain) = split(/\:/,$namedata); -# my $modifiedTime = &GetFileTimestamp($domain, $name, -# $courseID.'.db', -# $Apache::lonnet::perlvar{'lonUsersDir'}); -# if($lastDownloadTime >= $modifiedTime) { -# $courseData{'lastDownloadTime'}=time; -# $courseData{'UpToDate'} = 'true'; -# return \%courseData; -# } + my $modifiedTime = &GetFileTimestamp($domain, $name, + $courseID.'.db', + $Apache::lonnet::perlvar{'lonUsersDir'}); + + if($lastDownloadTime >= $modifiedTime) { + $courseData{'lastDownloadTime'}=time; + $courseData{'UpToDate'} = 'true'; + return \%courseData; + } # Download course data %courseData=&Apache::lonnet::dump($courseID, $domain, $name); @@ -559,6 +560,17 @@ sub ProcessClasslist { } $cache->{$name.':Status'}=$status; $cache->{$name.':section'}=$sec; + + if($sec eq '' || !defined($sec) || $sec eq ' ') { + $sec = 'none'; + } + if(defined($cache->{'sectionList'})) { + if($cache->{'sectionList'} !~ /(^$sec:|^$sec$|:$sec$|:$sec:)/) { + $cache->{'sectionList'} .= ':'.$sec; + } + } else { + $cache->{'sectionList'} = $sec; + } } $cache->{'ClasslistTimestamp'}=time;