--- loncom/interface/loncoursedata.pm 2002/08/05 14:16:19 1.12 +++ loncom/interface/loncoursedata.pm 2002/08/13 00:37:18 1.13 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # (Publication Handler # -# $Id: loncoursedata.pm,v 1.12 2002/08/05 14:16:19 stredwic Exp $ +# $Id: loncoursedata.pm,v 1.13 2002/08/13 00:37:18 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; @@ -190,9 +191,9 @@ sub DownloadCourseInformation { $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; } @@ -203,7 +204,13 @@ sub DownloadCourseInformation { %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 --------------------------------------- @@ -281,11 +288,7 @@ sub ProcessTopResourceMap { $currentSequence=-1; my $topLevelSequenceNumber = $currentSequence; - my $problemCount=0; - my $problemCount2=0; my %sequenceRecord; - my $sequenceCount=0; - my $sequenceCount2=0; while(1) { if($c->aborted()) { last; @@ -294,7 +297,6 @@ sub ProcessTopResourceMap { #if page || sequence if(defined($hash{'map_pc_'.$hash{'src_'.$currentResourceID}}) && !defined($sequenceRecord{$currentResourceID})) { - $sequenceCount++; $sequenceRecord{$currentResourceID}++; push(@sequences, $currentSequence); push(@currentResource, $currentResourceID); @@ -332,15 +334,11 @@ sub ProcessTopResourceMap { $currentResourceID=~/(\d+)\.(\d+)/; my $partA=$1; my $partB=$2; - if($hash{'src_'.$currentResourceID}=~/\.problem$/) { - $problemCount++; - } if($hash{'src_'.$currentResourceID}=~ /\.(problem|exam|quiz|assess|survey|form)$/ && $partA eq $currentSequence && !defined($sequenceRecord{$currentSequence.':'. $currentResourceID})) { - $problemCount2++; $sequenceRecord{$currentSequence.':'.$currentResourceID}++; my $Problem = &Apache::lonnet::symbclean( &Apache::lonnet::declutter($hash{'map_id_'.$partA}). @@ -416,7 +414,6 @@ sub ProcessTopResourceMap { $lastResourceID=pop(@finishResource); if(defined($cache->{$currentSequence.':problems'})) { - $sequenceCount2++; # Capture sequence information here $cache->{$currentSequence.':title'}= $hash{'title_'.$currentResourceID}; @@ -481,10 +478,6 @@ sub ProcessTopResourceMap { $currentResourceID=pop(@currentResource); } - $cache->{'jasoncount'}=$problemCount; - $cache->{'jasoncount2'}=$problemCount2; - $cache->{'jasonseq'}=$sequenceCount; - $cache->{'jasonseq2'}=$sequenceCount2; unless (untie(%hash)) { &Apache::lonnet::logthis("WARNING: ". "Could not untie coursemap $fn (browse)". @@ -662,42 +655,170 @@ 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($courseData->{'lastDownloadTime'} eq 'Not downloaded') { - $cache->{$name.':updateTime'} = ' Not updated'; - } else { - $cache->{$name.':updateTime'}= - localtime($courseData->{'lastDownloadTime'}); - } + if(!&CheckDateStampError($courseData, $cache, $name)) { return; } - my @courseKeys = keys(%$courseData); - - foreach (@courseKeys) { - if(/^(con_lost|error|no_such_host)/i) { - $cache->{$name.':error'}='Could not download course data.'; - return; - } + foreach (keys %$courseData) { + $cache->{$_}=$courseData->{$_}; } - $cache->{$name.':lastDownloadTime'}=$courseData->{'lastDownloadTime'}; - if($courseData->{'lastDownloadTime'} eq 'Not downloaded') { - $cache->{$name.':updateTime'} = ' Not updated'; - } else { - $cache->{$name.':updateTime'}= - localtime($courseData->{'lastDownloadTime'}); + return; +} + +sub ExtractStudentData { + my ($input, $output, $data, $name)=@_; + + if(!&CheckDateStampError($input, $data, $name)) { + return; } - foreach (@courseKeys) { - $cache->{$name.':'.$_}=$courseData->{$_}; + + my ($username,$domain)=split(':',$name); + + my $Version; + my $problemsCorrect = 0; + my $totalProblems = 0; + my $problemsSolved = 0; + my $numberOfParts = 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.':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'}; + $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; + return; } sub LoadDiscussion { - my ( $courseID)=@_; + my ($courseID)=@_; my %Discuss=(); my %contrib=&Apache::lonnet::dump( $courseID, @@ -733,6 +854,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() @@ -847,6 +998,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; @@ -859,7 +1219,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;