--- loncom/interface/loncoursedata.pm 2002/07/24 14:52:32 1.4
+++ loncom/interface/loncoursedata.pm 2002/08/14 13:13:37 1.14
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# (Publication Handler
#
-# $Id: loncoursedata.pm,v 1.4 2002/07/24 14:52:32 stredwic Exp $
+# $Id: loncoursedata.pm,v 1.14 2002/08/14 13:13:37 stredwic Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -51,6 +51,7 @@ package Apache::loncoursedata;
use strict;
use Apache::Constants qw(:common :http);
use Apache::lonnet();
+use Apache::lonhtmlcommon;
use HTML::TokeParser;
use GDBM_File;
@@ -182,24 +183,34 @@ database.
=cut
sub DownloadCourseInformation {
- my ($namedata,$courseID,$lastDownloadTime)=@_;
+ my ($namedata,$courseID,$lastDownloadTime,$WhatIWant)=@_;
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';
+
+ if($lastDownloadTime >= $modifiedTime && $modifiedTime >= 0) {
+ $courseData{$namedata.':lastDownloadTime'}=time;
+ $courseData{$namedata.':UpToDate'} = 'true';
return \%courseData;
}
# Download course data
- %courseData=&Apache::lonnet::dump($courseID, $domain, $name);
+ if(!defined($WhatIWant)) {
+ $WhatIWant = '.';
+ }
+ %courseData=&Apache::lonnet::dump($courseID, $domain, $name, $WhatIWant);
$courseData{'UpToDate'} = 'false';
$courseData{'lastDownloadTime'}=time;
- return \%courseData;
+
+ my %newData;
+ foreach (keys(%courseData)) {
+ $newData{$namedata.':'.$_} = $courseData{$_};
+ }
+
+ return \%newData;
}
# ----- END DOWNLOAD INFORMATION ---------------------------------------
@@ -254,7 +265,7 @@ sub ProcessTopResourceMap {
if($c->aborted()) {
return;
}
- if(tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER,0640)) {
+ if(tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640)) {
last;
}
$tieTries++;
@@ -277,13 +288,16 @@ sub ProcessTopResourceMap {
$currentSequence=-1;
my $topLevelSequenceNumber = $currentSequence;
+ my %sequenceRecord;
while(1) {
if($c->aborted()) {
last;
}
# HANDLE NEW SEQUENCE!
#if page || sequence
- if(defined($hash{'map_pc_'.$hash{'src_'.$currentResourceID}})) {
+ if(defined($hash{'map_pc_'.$hash{'src_'.$currentResourceID}}) &&
+ !defined($sequenceRecord{$currentResourceID})) {
+ $sequenceRecord{$currentResourceID}++;
push(@sequences, $currentSequence);
push(@currentResource, $currentResourceID);
push(@finishResource, $lastResourceID);
@@ -313,6 +327,7 @@ sub ProcessTopResourceMap {
last;
}
}
+ next;
}
# Handle gradable resources: exams, problems, etc
@@ -321,7 +336,10 @@ sub ProcessTopResourceMap {
my $partB=$2;
if($hash{'src_'.$currentResourceID}=~
/\.(problem|exam|quiz|assess|survey|form)$/ &&
- $partA eq $currentSequence) {
+ $partA eq $currentSequence &&
+ !defined($sequenceRecord{$currentSequence.':'.
+ $currentResourceID})) {
+ $sequenceRecord{$currentSequence.':'.$currentResourceID}++;
my $Problem = &Apache::lonnet::symbclean(
&Apache::lonnet::declutter($hash{'map_id_'.$partA}).
'___'.$partB.'___'.
@@ -341,38 +359,53 @@ sub ProcessTopResourceMap {
# &Apache::lonnet::metdata($meta,'title');
$cache->{$currentResourceID.':title'}=
$hash{'title_'.$currentResourceID};
+ $cache->{$currentResourceID.':source'}=
+ $hash{'src_'.$currentResourceID};
# Get Parts for problem
- foreach (split(/\,/,&Apache::lonnet::metadata($meta,'keys'))) {
- if($_=~/^stores\_(\d+)\_tries$/) {
- my $Part=&Apache::lonnet::metadata($meta,$_.'.part');
- if(!defined($cache->{$currentSequence.':'.
- $currentResourceID.':parts'})) {
- $cache->{$currentSequence.':'.$currentResourceID.
- ':parts'}=$Part;
- } else {
- $cache->{$currentSequence.':'.$currentResourceID.
- ':parts'}.=':'.$Part;
+ my %beenHere;
+ foreach (split(/\,/,&Apache::lonnet::metadata($meta,'packages'))) {
+ if(/^\w+response_\d+.*/) {
+ my (undef, $partId, $responseId) = split(/_/,$_);
+ if($beenHere{'p:'.$partId} == 0) {
+ $beenHere{'p:'.$partId}++;
+ if(!defined($cache->{$currentSequence.':'.
+ $currentResourceID.':parts'})) {
+ $cache->{$currentSequence.':'.$currentResourceID.
+ ':parts'}=$partId;
+ } else {
+ $cache->{$currentSequence.':'.$currentResourceID.
+ ':parts'}.=':'.$partId;
+ }
+ }
+ if($beenHere{'r:'.$partId.':'.$responseId} == 0) {
+ $beenHere{'r:'.$partId.':'.$responseId}++;
+ if(!defined($cache->{$currentSequence.':'.
+ $currentResourceID.':'.$partId.
+ ':responseIDs'})) {
+ $cache->{$currentSequence.':'.$currentResourceID.
+ ':'.$partId.':responseIDs'}=$responseId;
+ } else {
+ $cache->{$currentSequence.':'.$currentResourceID.
+ ':'.$partId.':responseIDs'}.=':'.
+ $responseId;
+ }
}
- foreach (split(/\,/,
- &Apache::lonnet::metadata($meta,'packages'))) {
- if($_=~/^optionresponse\_($Part)\_(\w+)$/) {
- if(defined($cache->{'OptionResponses'})) {
- $cache->{'OptionResponses'}.= ':::'.
- $hash{'src_'.$currentResourceID}.'::'.
- $hash{'title_'.$currentResourceID}.'::'.
- $Part.'::'.$Problem;
- } else {
- $cache->{'OptionResponses'}=
- $hash{'src_'.$currentResourceID}.'::'.
- $hash{'title_'.$currentResourceID}.'::'.
- $Part.'::'.$Problem;
- }
+ if(/^optionresponse/ &&
+ $beenHere{'o:'.$partId.':'.$currentResourceID} == 0) {
+ $beenHere{'o:'.$partId.$currentResourceID}++;
+ if(defined($cache->{'OptionResponses'})) {
+ $cache->{'OptionResponses'}.= ':::'.
+ $currentResourceID.':'.
+ $partId.':'.$responseId;
+ } else {
+ $cache->{'OptionResponses'}= $currentResourceID.
+ ':'.$partId.':'.$responseId;
}
}
}
- }
- }
+ }
+ }
# if resource == finish resource, then it is the end of a sequence/page
if($currentResourceID eq $lastResourceID) {
@@ -421,17 +454,24 @@ sub ProcessTopResourceMap {
if($currentSequence eq $topLevelSequenceNumber) {
last;
}
- }
+ }
# MOVE!!!
# move to next resource
unless(defined($hash{'to_'.$currentResourceID})) {
# big problem, need to handle. Next is probably wrong
+ my $errorMessage = 'Big problem in ';
+ $errorMessage .= 'loncoursedata::ProcessTopLevelMap.';
+ $errorMessage .= ' bighash to_$currentResourceID not defined!';
+ &Apache::lonnet::logthis($errorMessage);
last;
}
my @nextResources=();
foreach (split(/\,/,$hash{'to_'.$currentResourceID})) {
- push(@nextResources, $hash{'goesto_'.$_});
+ if(!defined($sequenceRecord{$currentSequence.':'.
+ $hash{'goesto_'.$_}})) {
+ push(@nextResources, $hash{'goesto_'.$_});
+ }
}
push(@currentResource, @nextResources);
# Set the next resource to be processed
@@ -513,8 +553,10 @@ sub ProcessClasslist {
$cache->{$name.':username'}=$studentName;
$cache->{$name.':domain'}=$studentDomain;
+ # Initialize timestamp for student
if(!defined($cache->{$name.':lastDownloadTime'})) {
$cache->{$name.':lastDownloadTime'}='Not downloaded';
+ $cache->{$name.':updateTime'}=' Not updated';
}
my ($checkForError)=keys(%$studentInformation);
@@ -558,6 +600,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;
@@ -602,53 +655,196 @@ will only exist if an error occured. Th
sub ProcessStudentData {
my ($cache,$courseData,$name)=@_;
- if($courseData->{'UpToDate'} eq 'true') {
- $cache->{$name.':lastDownloadTime'}=$courseData->{'lastDownloadTime'};
+ if(!&CheckDateStampError($courseData, $cache, $name)) {
return;
}
- my @courseKeys = keys(%$courseData);
+ foreach (keys %$courseData) {
+ $cache->{$_}=$courseData->{$_};
+ }
- foreach (@courseKeys) {
- if(/^(con_lost|error|no_such_host)/i) {
- $cache->{$name.':error'}='Could not download course data.';
- return;
- }
+ return;
+}
+
+sub ExtractStudentData {
+ my ($input, $output, $data, $name)=@_;
+
+ if(!&CheckDateStampError($input, $data, $name)) {
+ return;
}
- $cache->{$name.':lastDownloadTime'}=$courseData->{'lastDownloadTime'};
- foreach (@courseKeys) {
- $cache->{$name.':'.$_}=$courseData->{$_};
+ my ($username,$domain)=split(':',$name);
+
+ my $Version;
+ my $problemsCorrect = 0;
+ my $totalProblems = 0;
+ my $problemsSolved = 0;
+ my $numberOfParts = 0;
+ my $totalAwarded = 0;
+ foreach my $sequence (split(':', $data->{'orderedSequences'})) {
+ foreach my $problemID (split(':', $data->{$sequence.':problems'})) {
+ my $problem = $data->{$problemID.':problem'};
+ my $LatestVersion = $input->{$name.':version:'.$problem};
+
+ # Output dashes for all the parts of this problem if there
+ # is no version information about the current problem.
+ if(!$LatestVersion) {
+ foreach my $part (split(/\:/,$data->{$sequence.':'.
+ $problemID.
+ ':parts'})) {
+ $totalProblems++;
+ }
+ $output->{$name.':'.$problemID.':'.$part.':tries'} = 0;
+ $output->{$name.':'.$problemID.':'.$part.':awarded'} = 0;
+ $output->{$name.':'.$problemID.':'.$part.':code'} = ' ';
+ $output->{$name.':'.$problemID.':NoVersion'} = 'true';
+ next;
+ }
+
+ my %partData=undef;
+ # Initialize part data, display skips correctly
+ # Skip refers to when a student made no submissions on that
+ # part/problem.
+ foreach my $part (split(/\:/,$data->{$sequence.':'.
+ $problemID.
+ ':parts'})) {
+ $partData{$part.':tries'}=0;
+ $partData{$part.':code'}=' ';
+ $partData{$part.':awarded'}=0;
+ $partData{$part.':timestamp'}=0;
+ foreach my $response (split(':', $data->{$sequence.':'.
+ $problemID.':'.
+ $part.':responseIDs'})) {
+ $partData{$part.':'.$response.':submission'}='';
+ }
+ }
+
+ # Looping through all the versions of each part, starting with the
+ # oldest version. Basically, it gets the most recent
+ # set of grade data for each part.
+ my @submissions = ();
+ for(my $Version=1; $Version<=$LatestVersion; $Version++) {
+ foreach my $part (split(/\:/,$data->{$sequence.':'.
+ $problemID.
+ ':parts'})) {
+
+ if(!defined($input->{"$name:$Version:$problem".
+ ":resource.$part.solved"})) {
+ # No grade for this submission, so skip
+ next;
+ }
+
+ my $tries=0;
+ my $code=' ';
+ my $awarded=0;
+
+ $tries = $input->{$name.':'.$Version.':'.$problem.
+ ':resource.'.$part.'.tries'};
+ $awarded = $input->{$name.':'.$Version.':'.$problem.
+ ':resource.'.$part.'.awarded'};
+
+ $partData{$part.':awarded'}=($awarded) ? $awarded : 0;
+ $partData{$part.':tries'}=($tries) ? $tries : 0;
+
+ $partData{$part.':timestamp'}=$input->{$name.':'.$Version.':'.
+ $problem.
+ ':timestamp'};
+ if(!$input->{$name.':'.$Version.':'.$problem.':resource.'.$part.
+ '.previous'}) {
+ foreach my $response (split(':',
+ $data->{$sequence.':'.
+ $problemID.':'.
+ $part.':responseIDs'})) {
+ @submissions=($input->{$name.':'.$Version.':'.
+ $problem.
+ ':resource.'.$part.'.'.
+ $response.'.submission'},
+ @submissions);
+ }
+ }
+
+ my $val = $input->{$name.':'.$Version.':'.$problem.
+ ':resource.'.$part.'.solved'};
+ if ($val eq 'correct_by_student') {$code = '*';}
+ elsif ($val eq 'correct_by_override') {$code = '+';}
+ elsif ($val eq 'incorrect_attempted') {$code = '.';}
+ elsif ($val eq 'incorrect_by_override'){$code = '-';}
+ elsif ($val eq 'excused') {$code = 'x';}
+ elsif ($val eq 'ungraded_attempted') {$code = '#';}
+ else {$code = ' ';}
+ $partData{$part.':code'}=$code;
+ }
+ }
+
+ foreach my $part (split(/\:/,$data->{$sequence.':'.$problemID.
+ ':parts'})) {
+ $output->{$name.':'.$problemID.':'.$part.':wrong'} =
+ $partData{$part.':tries'};
+
+ if($partData{$part.':code'} eq '*') {
+ $output->{$name.':'.$problemID.':'.$part.':wrong'}--;
+ $problemsCorrect++;
+ } elsif($partData{$part.':code'} eq '+') {
+ $output->{$name.':'.$problemID.':'.$part.':wrong'}--;
+ $problemsCorrect++;
+ }
+
+ $output->{$name.':'.$problemID.':'.$part.':tries'} =
+ $partData{$part.':tries'};
+ $output->{$name.':'.$problemID.':'.$part.':code'} =
+ $partData{$part.':code'};
+ $output->{$name.':'.$problemID.':'.$part.':awarded'} =
+ $partData{$part.':awarded'};
+ $totalAwarded += $partData{$part.':awarded'};
+ $output->{$name.':'.$problemID.':'.$part.':timestamp'} =
+ $partData{$part.':timestamp'};
+ foreach my $response (split(':', $data->{$sequence.':'.
+ $problemID.':'.
+ $part.':responseIDs'})) {
+ $output->{$name.':'.$problemID.':'.$part.':'.$response.
+ ':submission'}=join(':::',@submissions);
+ }
+
+ if($partData{$part.':code'} ne 'x') {
+ $totalProblems++;
+ }
+ }
+ }
+
+ $output->{$name.':'.$sequence.':problemsCorrect'} = $problemsCorrect;
+ $problemsSolved += $problemsCorrect;
+ $problemsCorrect=0;
}
+ $output->{$name.':problemsSolved'} = $problemsSolved;
+ $output->{$name.':totalProblems'} = $totalProblems;
+ $output->{$name.':totalAwarded'} = $totalAwarded;
+
return;
}
sub LoadDiscussion {
-# my $symb=shift;
-# $r->print('
$cid ... '.$symb);
-# my %contrib=&Apache::lonnet::dump('msu_2964385f9033c63msul1','msu','2964385f9033c63msul1');
- my ($name, $courseID, $Discuss)=@_;
- my %contrib=&DownloadCourseInformation($name, $courseID, 0);
-
+ my ($courseID)=@_;
+ my %Discuss=();
+ my %contrib=&Apache::lonnet::dump(
+ $courseID,
+ $ENV{'course.'.$courseID.'.domain'},
+ $ENV{'course.'.$courseID.'.num'});
+
+ #my %contrib=&DownloadCourseInformation($name, $courseID, 0);
+
foreach my $temp(keys %contrib) {
if ($temp=~/^version/) {
my $ver=$contrib{$temp};
my ($dummy,$prb)=split(':',$temp);
for (my $idx=1; $idx<=$ver; $idx++ ) {
my $name=$contrib{"$idx:$prb:sendername"};
- $Discuss->{"$name:$prb"}=$idx;
+ $Discuss{"$name:$prb"}=$idx;
}
}
}
-# $r->print('
cid='.$cid);
-# my %contrib=&Apache::lonnet::restore($symb,$cid,
-# $ENV{$cid.'.domain'},
-# $ENV{'course.'.$cid.'.num'});
-
-# $Apache::lonxml::debug=1;
-# &Apache::lonhomework::showhash(%Discuss);
-# $Apache::lonxml::debug=0;
+
+ return \%Discuss;
}
# ----- END PROCESSING FUNCTIONS ---------------------------------------
@@ -664,6 +860,36 @@ jobs.
# ----- HELPER FUNCTIONS -----------------------------------------------
+sub CheckDateStampError {
+ my ($courseData, $cache, $name)=@_;
+ if($courseData->{$name.':UpToDate'} eq 'true') {
+ $cache->{$name.':lastDownloadTime'} =
+ $courseData->{$name.':lastDownloadTime'};
+ if($courseData->{$name.':lastDownloadTime'} eq 'Not downloaded') {
+ $cache->{$name.':updateTime'} = ' Not updated';
+ } else {
+ $cache->{$name.':updateTime'}=
+ localtime($courseData->{$name.':lastDownloadTime'});
+ }
+ return 0;
+ }
+
+ $cache->{$name.':lastDownloadTime'}=$courseData->{$name.':lastDownloadTime'};
+ if($courseData->{$name.':lastDownloadTime'} eq 'Not downloaded') {
+ $cache->{$name.':updateTime'} = ' Not updated';
+ } else {
+ $cache->{$name.':updateTime'}=
+ localtime($courseData->{$name.':lastDownloadTime'});
+ }
+
+ if(defined($courseData->{$name.':error'})) {
+ $cache->{$name.':error'}=$courseData->{$name.':error'};
+ return 0;
+ }
+
+ return 1;
+}
+
=pod
=item &ProcessFullName()
@@ -759,9 +985,9 @@ sub TestCacheData {
while($tieTries < $totalDelay) {
my $result=0;
if($isCached) {
- $result=tie(%testData,'GDBM_File',$ChartDB,&GDBM_READER,0640);
+ $result=tie(%testData,'GDBM_File',$ChartDB,&GDBM_READER(),0640);
} else {
- $result=tie(%testData,'GDBM_File',$ChartDB,&GDBM_NEWDB,0640);
+ $result=tie(%testData,'GDBM_File',$ChartDB,&GDBM_NEWDB(),0640);
}
if($result) {
last;
@@ -778,6 +1004,215 @@ sub TestCacheData {
return $isCached;
}
+sub DownloadStudentCourseData {
+ my ($students,$checkDate,$cacheDB,$extract,$status,$courseID,$r,$c)=@_;
+
+ my $title = 'LON-CAPA Statistics';
+ my $heading = 'Download and Process Course Data';
+ my $studentCount = scalar(@$students);
+ my %cache;
+
+ my $WhatIWant;
+ $WhatIWant = '(^version:(\w|\/|\.|-)+?$|';
+ $WhatIWant .= '^\d+:(\w|\/|\.|-)+?:(resource\.\d+\.';
+ $WhatIWant .= '(solved|tries|previous|awarded|(\d+\.submission))\s*$';
+ $WhatIWant .= '|timestamp)';
+ $WhatIWant .= ')';
+
+ if($status eq 'true') {
+ &Apache::lonhtmlcommon::Create_PrgWin($r, $title, $heading);
+ }
+ my $count=1;
+ foreach (@$students) {
+ if($c->aborted()) { return 'Aborted'; }
+
+ if($status eq 'true') {
+ my $displayString = $count.'/'.$studentCount.': '.$_;
+ &Apache::lonhtmlcommon::Update_PrgWin($displayString, $r);
+ }
+
+ my $downloadTime='Not downloaded';
+ if($checkDate eq 'true' &&
+ tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
+ $downloadTime = $cache{$_.':lastDownloadTime'};
+ untie(%cache);
+ }
+
+ if($c->aborted()) { return 'Aborted'; }
+
+ if($downloadTime eq 'Not downloaded') {
+ my $courseData =
+ &DownloadCourseInformation($_, $courseID, $downloadTime,
+ $WhatIWant);
+ if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_WRCREAT(),0640)) {
+ foreach my $key (keys(%$courseData)) {
+ if($key =~ /^(con_lost|error|no_such_host)/i) {
+ $courseData->{$_.':error'} = 'No course data for '.$_;
+ last;
+ }
+ }
+ if($extract eq 'true') {
+ &ExtractStudentData($courseData, \%cache, \%cache, $_);
+ } else {
+ &ProcessStudentData(\%cache, $courseData, $_);
+ }
+ untie(%cache);
+ } else {
+ next;
+ }
+ }
+ $count++;
+ }
+ if($status eq 'true') { &Apache::lonhtmlcommon::Close_PrgWin($r); }
+
+ return 'OK';
+}
+
+sub DownloadStudentCourseDataSeparate {
+ my ($students,$checkDate,$cacheDB,$extract,$status,$courseID,$r,$c)=@_;
+ my $residualFile = '/home/httpd/perl/tmp/'.$courseID.'DownloadFile.db';
+ my $title = 'LON-CAPA Statistics';
+ my $heading = 'Download Course Data';
+
+ my $WhatIWant;
+ $WhatIWant = '(^version:(\w|\/|\.|-)+?$|';
+ $WhatIWant .= '^\d+:(\w|\/|\.|-)+?:(resource\.\d+\.';
+ $WhatIWant .= '(solved|tries|previous|awarded|(\d+\.submission))\s*$';
+ $WhatIWant .= '|timestamp)';
+ $WhatIWant .= ')';
+
+ &CheckForResidualDownload($courseID, $cacheDB, $students, $c);
+
+ my %cache;
+ my %downloadData;
+ unless(tie(%downloadData,'GDBM_File',$residualFile,&GDBM_NEWDB(),0640)) {
+ return 'Failed to tie temporary download hash.';
+ }
+
+ my $studentCount = scalar(@$students);
+ if($status eq 'true') {
+ &Apache::lonhtmlcommon::Create_PrgWin($r, $title, $heading);
+ }
+ my $count=1;
+ foreach (@$students) {
+ if($c->aborted()) {
+ untie(%downloadData);
+ return 'Aborted';
+ }
+
+ if($status eq 'true') {
+ my $displayString = $count.'/'.$studentCount.': '.$_;
+ &Apache::lonhtmlcommon::Update_PrgWin($displayString, $r);
+ }
+
+ my $downloadTime='Not downloaded';
+ if($checkDate eq 'true' &&
+ tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
+ $downloadTime = $cache{$_.':lastDownloadTime'};
+ untie(%cache);
+ }
+
+ if($c->aborted()) {
+ untie(%downloadData);
+ return 'Aborted';
+ }
+
+ if($downloadTime eq 'Not downloaded') {
+ my $error = 0;
+ my $courseData =
+ &DownloadCourseInformation($_, $courseID, $downloadTime,
+ $WhatIWant);
+ foreach my $key (keys(%$courseData)) {
+ $downloadData{$key} = $courseData->{$key};
+ if($key =~ /^(con_lost|error|no_such_host)/i) {
+ $error = 1;
+ last;
+ }
+ }
+ if($error) {
+ foreach my $deleteKey (keys(%$courseData)) {
+ delete $downloadData{$deleteKey};
+ }
+ $downloadData{$_.':error'} = 'No course data for '.$_;
+ }
+ }
+ $count++;
+ }
+ if($status eq 'true') { &Apache::lonhtmlcommon::Close_PrgWin($r); }
+
+ return &CheckForResidualDownload($cacheDB, 'true', 'true',
+ $courseID, $r, $c);
+}
+
+sub CheckForResidualDownload {
+ my ($cacheDB,$extract,$status,$courseID,$r,$c)=@_;
+
+ my $residualFile = '/home/httpd/perl/tmp/'.$courseID.'DownloadFile.db';
+ if(!-e $residualFile) {
+ return;
+ }
+
+ my %downloadData;
+ my %cache;
+ unless(tie(%downloadData,'GDBM_File',$residualFile,&GDBM_READER(),0640) &&
+ tie(%cache,'GDBM_File',$cacheDB,&GDBM_WRCREAT(),0640)) {
+ return;
+ }
+
+ my @dataKeys=keys(%downloadData);
+ my @students=();
+ my %checkStudent;
+ foreach(@dataKeys) {
+ my @temp = split(':', $_);
+ my $student = $temp[0].':'.$temp[1];
+ if(!defined($checkStudent{$student})) {
+ $checkStudent{$student}++;
+ push(@students, $student);
+ }
+ }
+
+ my $heading = 'Process Course Data';
+ my $title = 'LON-CAPA Statistics';
+ my $studentCount = scalar(@students);
+ if($status eq 'true') {
+ &Apache::lonhtmlcommon::Create_PrgWin($r, $title, $heading);
+ }
+
+ my $count=1;
+ foreach my $name (@students) {
+ last if($c->aborted());
+
+ if($status eq 'true') {
+ my $displayString = $count.'/'.$studentCount.': '.$_;
+ &Apache::lonhtmlcommon::Update_PrgWin($displayString, $r);
+ }
+
+ if($extract eq 'true') {
+ &ExtractStudentData(\%downloadData, \%cache, \%cache, $name);
+ } else {
+ &ProcessStudentData(\%cache, \%downloadData, $name);
+ }
+ foreach (@dataKeys) {
+ if(/^$name/) {
+ delete $downloadData{$_};
+ }
+ }
+ $count++;
+ }
+
+ if($status eq 'true') { &Apache::lonhtmlcommon::Close_PrgWin($r); }
+
+ untie(%cache);
+ untie(%downloadData);
+
+ if(!$c->aborted()) {
+ my @files = ($residualFile);
+ unlink(@files);
+ }
+
+ return 'OK';
+}
+
sub GetFileTimestamp {
my ($studentDomain,$studentName,$filename,$root)=@_;
$studentDomain=~s/\W//g;
@@ -790,7 +1225,7 @@ sub GetFileTimestamp {
$root);
my $fileStat = $dir[0];
my @stats = split('&', $fileStat);
- if(@stats) {
+ if($stats[0] ne 'empty' && $stats[0] ne 'no_such_dir') {
return $stats[9];
} else {
return -1;