version 1.11, 2002/08/03 18:47:24
|
version 1.12, 2002/08/05 14:16:19
|
Line 182 database.
|
Line 182 database.
|
=cut |
=cut |
|
|
sub DownloadCourseInformation { |
sub DownloadCourseInformation { |
my ($namedata,$courseID,$lastDownloadTime)=@_; |
my ($namedata,$courseID,$lastDownloadTime,$WhatIWant)=@_; |
my %courseData; |
my %courseData; |
my ($name,$domain) = split(/\:/,$namedata); |
my ($name,$domain) = split(/\:/,$namedata); |
|
|
Line 197 sub DownloadCourseInformation {
|
Line 197 sub DownloadCourseInformation {
|
} |
} |
|
|
# Download course data |
# Download course data |
my $WhatIWant = '(version:(\w|\/|\.)+?$|'; |
if(!defined($WhatIWant)) { |
$WhatIWant .= '\d+?:(\w|\/|\.)+?:(resource\.\d+\.'; |
$WhatIWant = '.'; |
$WhatIWant .= '(solved|tries|previous|awarded|(\d+\.submission))'; |
} |
$WhatIWant .= '|timestamp)'; |
%courseData=&Apache::lonnet::dump($courseID, $domain, $name, $WhatIWant); |
$WhatIWant .= ')'; |
|
# %courseData=&Apache::lonnet::dump($courseID, $domain, $name, $WhatIWant); |
|
%courseData=&Apache::lonnet::dump($courseID, $domain, $name); |
|
$courseData{'UpToDate'} = 'false'; |
$courseData{'UpToDate'} = 'false'; |
$courseData{'lastDownloadTime'}=time; |
$courseData{'lastDownloadTime'}=time; |
return \%courseData; |
return \%courseData; |
Line 284 sub ProcessTopResourceMap {
|
Line 281 sub ProcessTopResourceMap {
|
$currentSequence=-1; |
$currentSequence=-1; |
my $topLevelSequenceNumber = $currentSequence; |
my $topLevelSequenceNumber = $currentSequence; |
|
|
|
my $problemCount=0; |
|
my $problemCount2=0; |
my %sequenceRecord; |
my %sequenceRecord; |
|
my $sequenceCount=0; |
|
my $sequenceCount2=0; |
while(1) { |
while(1) { |
if($c->aborted()) { |
if($c->aborted()) { |
last; |
last; |
Line 293 sub ProcessTopResourceMap {
|
Line 294 sub ProcessTopResourceMap {
|
#if page || sequence |
#if page || sequence |
if(defined($hash{'map_pc_'.$hash{'src_'.$currentResourceID}}) && |
if(defined($hash{'map_pc_'.$hash{'src_'.$currentResourceID}}) && |
!defined($sequenceRecord{$currentResourceID})) { |
!defined($sequenceRecord{$currentResourceID})) { |
|
$sequenceCount++; |
$sequenceRecord{$currentResourceID}++; |
$sequenceRecord{$currentResourceID}++; |
push(@sequences, $currentSequence); |
push(@sequences, $currentSequence); |
push(@currentResource, $currentResourceID); |
push(@currentResource, $currentResourceID); |
Line 323 sub ProcessTopResourceMap {
|
Line 325 sub ProcessTopResourceMap {
|
last; |
last; |
} |
} |
} |
} |
|
next; |
} |
} |
|
|
# Handle gradable resources: exams, problems, etc |
# Handle gradable resources: exams, problems, etc |
$currentResourceID=~/(\d+)\.(\d+)/; |
$currentResourceID=~/(\d+)\.(\d+)/; |
my $partA=$1; |
my $partA=$1; |
my $partB=$2; |
my $partB=$2; |
|
if($hash{'src_'.$currentResourceID}=~/\.problem$/) { |
|
$problemCount++; |
|
} |
if($hash{'src_'.$currentResourceID}=~ |
if($hash{'src_'.$currentResourceID}=~ |
/\.(problem|exam|quiz|assess|survey|form)$/ && |
/\.(problem|exam|quiz|assess|survey|form)$/ && |
$partA eq $currentSequence && |
$partA eq $currentSequence && |
!defined($sequenceRecord{$currentSequence.':'. |
!defined($sequenceRecord{$currentSequence.':'. |
$currentResourceID})) { |
$currentResourceID})) { |
|
$problemCount2++; |
$sequenceRecord{$currentSequence.':'.$currentResourceID}++; |
$sequenceRecord{$currentSequence.':'.$currentResourceID}++; |
my $Problem = &Apache::lonnet::symbclean( |
my $Problem = &Apache::lonnet::symbclean( |
&Apache::lonnet::declutter($hash{'map_id_'.$partA}). |
&Apache::lonnet::declutter($hash{'map_id_'.$partA}). |
Line 409 sub ProcessTopResourceMap {
|
Line 416 sub ProcessTopResourceMap {
|
$lastResourceID=pop(@finishResource); |
$lastResourceID=pop(@finishResource); |
|
|
if(defined($cache->{$currentSequence.':problems'})) { |
if(defined($cache->{$currentSequence.':problems'})) { |
|
$sequenceCount2++; |
# Capture sequence information here |
# Capture sequence information here |
$cache->{$currentSequence.':title'}= |
$cache->{$currentSequence.':title'}= |
$hash{'title_'.$currentResourceID}; |
$hash{'title_'.$currentResourceID}; |
Line 473 sub ProcessTopResourceMap {
|
Line 481 sub ProcessTopResourceMap {
|
$currentResourceID=pop(@currentResource); |
$currentResourceID=pop(@currentResource); |
} |
} |
|
|
|
$cache->{'jasoncount'}=$problemCount; |
|
$cache->{'jasoncount2'}=$problemCount2; |
|
$cache->{'jasonseq'}=$sequenceCount; |
|
$cache->{'jasonseq2'}=$sequenceCount2; |
unless (untie(%hash)) { |
unless (untie(%hash)) { |
&Apache::lonnet::logthis("<font color=blue>WARNING: ". |
&Apache::lonnet::logthis("<font color=blue>WARNING: ". |
"Could not untie coursemap $fn (browse)". |
"Could not untie coursemap $fn (browse)". |