version 1.14, 2002/08/14 13:13:37
|
version 1.26, 2002/08/30 17:11:43
|
Line 35 loncoursedata
|
Line 35 loncoursedata
|
|
|
=head1 SYNOPSIS |
=head1 SYNOPSIS |
|
|
Set of functions that download and process student information. |
Set of functions that download and process student and course information. |
|
|
=head1 PACKAGES USED |
=head1 PACKAGES USED |
|
|
Apache::Constants qw(:common :http) |
Apache::Constants qw(:common :http) |
Apache::lonnet() |
Apache::lonnet() |
|
Apache::lonhtmlcommon |
HTML::TokeParser |
HTML::TokeParser |
GDBM_File |
GDBM_File |
|
|
Line 59 use GDBM_File;
|
Line 60 use GDBM_File;
|
|
|
=head1 DOWNLOAD INFORMATION |
=head1 DOWNLOAD INFORMATION |
|
|
This section contains all the files that get data from other servers |
This section contains all the functions that get data from other servers |
and/or itself. There is one function that has a call to get remote |
and/or itself. |
information but isn't included here which is ProcessTopLevelMap. The |
|
usage was small enough to be ignored, but that portion may be moved |
|
here in the future. |
|
|
|
=cut |
=cut |
|
|
Line 74 here in the future.
|
Line 72 here in the future.
|
=item &DownloadClasslist() |
=item &DownloadClasslist() |
|
|
Collects lastname, generation, middlename, firstname, PID, and section for each |
Collects lastname, generation, middlename, firstname, PID, and section for each |
student from their environment database. The list of students is built from |
student from their environment database. The section data is also download, though |
collecting a classlist for the course that is to be displayed. |
it is in a rough format, and is processed later. The list of students is built from |
|
collecting a classlist for the course that is to be displayed. Once the classlist |
|
has been downloaded, its date stamp is recorded. Unless the datestamp for the |
|
class database is reset or is modified, this data will not be downloaded again. |
|
Also, there was talk about putting the fullname and section |
|
and perhaps other pieces of data into the classlist file. This would |
|
reduce the number of different file accesses and reduce the amount of |
|
processing on this side. |
|
|
=over 4 |
=over 4 |
|
|
Input: $courseID, $c |
Input: $courseID, $lastDownloadTime, $c |
|
|
$courseID: The id of the course |
$courseID: The id of the course |
|
|
|
$lastDownloadTime: This is the date stamp for when this information was |
|
last gathered. If it is set to Not downloaded, it will gather the data |
|
again, though it currently does not remove the old data. |
|
|
$c: The connection class that can determine if the browser has aborted. It |
$c: The connection class that can determine if the browser has aborted. It |
is used to short circuit this function so that it doesn't continue to |
is used to short circuit this function so that it does not continue to |
get information when there is no need. |
get information when there is no need. |
|
|
Output: \%classlist |
Output: \%classlist |
Line 94 Output: \%classlist
|
Line 103 Output: \%classlist
|
-A list of student name:domain (as keys) (known below as $name) |
-A list of student name:domain (as keys) (known below as $name) |
|
|
-A hash pointer for each student containing lastname, generation, firstname, |
-A hash pointer for each student containing lastname, generation, firstname, |
middlename, and PID : Key is $name.'studentInformation' |
middlename, and PID : Key is $name.studentInformation |
|
|
-A hash pointer to each students section data : Key is $name.section |
-A hash pointer to each students section data : Key is $name.section |
|
|
|
-If there was an error in dump, it will be returned in the hash. See |
|
the error codes for dump in lonnet. Also, an error key will be |
|
generated if an abort occurs. |
|
|
=back |
=back |
|
|
=cut |
=cut |
Line 107 sub DownloadClasslist {
|
Line 120 sub DownloadClasslist {
|
my ($courseDomain,$courseNumber)=split(/\_/,$courseID); |
my ($courseDomain,$courseNumber)=split(/\_/,$courseID); |
my %classlist; |
my %classlist; |
|
|
my $modifiedTime = &GetFileTimestamp($courseDomain, $courseNumber, |
my $modifiedTime = &Apache::lonnet::GetFileTimestamp($courseDomain, $courseNumber, |
'classlist.db', |
'classlist.db', |
$Apache::lonnet::perlvar{'lonUsersDir'}); |
$Apache::lonnet::perlvar{'lonUsersDir'}); |
|
|
|
# Always download the information if lastDownloadTime is set to |
|
# Not downloaded, otherwise it is only downloaded if the file |
|
# has been updated and has a more recent date stamp |
if($lastDownloadTime ne 'Not downloaded' && |
if($lastDownloadTime ne 'Not downloaded' && |
$lastDownloadTime >= $modifiedTime && $modifiedTime >= 0) { |
$lastDownloadTime >= $modifiedTime && $modifiedTime >= 0) { |
|
# Data is not gathered so return UpToDate as true. This |
|
# will be interpreted in ProcessClasslist |
$classlist{'lastDownloadTime'}=time; |
$classlist{'lastDownloadTime'}=time; |
$classlist{'UpToDate'} = 'true'; |
$classlist{'UpToDate'} = 'true'; |
return \%classlist; |
return \%classlist; |
} |
} |
|
|
%classlist=&Apache::lonnet::dump('classlist',$courseDomain, $courseNumber); |
%classlist=&Apache::lonnet::dump('classlist',$courseDomain, $courseNumber); |
my ($checkForError)=keys (%classlist); |
foreach(keys (%classlist)) { |
if($checkForError =~ /^(con_lost|error|no_such_host)/i) { |
if(/^(con_lost|error|no_such_host)/i) { |
return \%classlist; |
return \%classlist; |
|
} |
} |
} |
|
|
foreach my $name (keys(%classlist)) { |
foreach my $name (keys(%classlist)) { |
if($c->aborted()) { |
if(defined($c) && ($c->aborted())) { |
$classlist{'error'}='aborted'; |
$classlist{'error'}='aborted'; |
return \%classlist; |
return \%classlist; |
} |
} |
Line 160 sub DownloadClasslist {
|
Line 179 sub DownloadClasslist {
|
|
|
=item &DownloadCourseInformation() |
=item &DownloadCourseInformation() |
|
|
Dump of all the course information for a single student. There is no |
Dump of all the course information for a single student. The data can be |
pruning of data, it is all stored in a hash and returned. It also |
pruned by making use of dumps regular expression arguement. This function |
|
also takes a regular expression which it passes straight through to dump. |
|
The data is no escaped, because it is done elsewhere. It also |
checks the timestamp of the students course database file and only downloads |
checks the timestamp of the students course database file and only downloads |
if it has been modified since the last download. |
if it has been modified since the last download. |
|
|
=over 4 |
=over 4 |
|
|
Input: $name, $courseID |
Input: $namedata, $courseID, $lastDownloadTime, $WhatIWant |
|
|
$name: student name:domain |
$namedata: student name:domain |
|
|
$courseID: The id of the course |
$courseID: The id of the course |
|
|
|
$lastDownloadTime: This is the date stamp for when this information was |
|
last gathered. If it is set to Not downloaded, it will gather the data |
|
again, though it currently does not remove the old data. |
|
|
|
$WhatIWant: Regular expression used to get selected data with dump |
|
|
Output: \%courseData |
Output: \%courseData |
|
|
\%courseData: A hash pointer to the raw data from the student's course |
\%courseData: A hash pointer to the raw data from the students course |
database. |
database. |
|
|
=back |
=back |
Line 187 sub DownloadCourseInformation {
|
Line 214 sub DownloadCourseInformation {
|
my %courseData; |
my %courseData; |
my ($name,$domain) = split(/\:/,$namedata); |
my ($name,$domain) = split(/\:/,$namedata); |
|
|
my $modifiedTime = &GetFileTimestamp($domain, $name, |
my $modifiedTime = &Apache::lonnet::GetFileTimestamp($domain, $name, |
$courseID.'.db', |
$courseID.'.db', |
$Apache::lonnet::perlvar{'lonUsersDir'}); |
$Apache::lonnet::perlvar{'lonUsersDir'}); |
|
|
if($lastDownloadTime >= $modifiedTime && $modifiedTime >= 0) { |
if($lastDownloadTime >= $modifiedTime && $modifiedTime >= 0) { |
|
# Data is not gathered so return UpToDate as true. This |
|
# will be interpreted in ProcessClasslist |
$courseData{$namedata.':lastDownloadTime'}=time; |
$courseData{$namedata.':lastDownloadTime'}=time; |
$courseData{$namedata.':UpToDate'} = 'true'; |
$courseData{$namedata.':UpToDate'} = 'true'; |
return \%courseData; |
return \%courseData; |
Line 199 sub DownloadCourseInformation {
|
Line 228 sub DownloadCourseInformation {
|
|
|
# Download course data |
# Download course data |
if(!defined($WhatIWant)) { |
if(!defined($WhatIWant)) { |
|
# set the regular expression to everything by setting it to period |
$WhatIWant = '.'; |
$WhatIWant = '.'; |
} |
} |
%courseData=&Apache::lonnet::dump($courseID, $domain, $name, $WhatIWant); |
%courseData=&Apache::lonnet::dump($courseID, $domain, $name, $WhatIWant); |
Line 207 sub DownloadCourseInformation {
|
Line 237 sub DownloadCourseInformation {
|
|
|
my %newData; |
my %newData; |
foreach (keys(%courseData)) { |
foreach (keys(%courseData)) { |
|
# need to have the keys to be prepended with the name:domain of the |
|
# student to reduce data collision later. |
$newData{$namedata.':'.$_} = $courseData{$_}; |
$newData{$namedata.':'.$_} = $courseData{$_}; |
} |
} |
|
|
Line 220 sub DownloadCourseInformation {
|
Line 252 sub DownloadCourseInformation {
|
=head1 PROCESSING FUNCTIONS |
=head1 PROCESSING FUNCTIONS |
|
|
These functions process all the data for all the students. Also, they |
These functions process all the data for all the students. Also, they |
are the only functions that access the cache database for writing. Thus |
are the functions that access the cache database for writing the majority of |
they are the only functions that cache data. The downloading and caching |
the time. The downloading and caching were separated to reduce problems |
were separated to reduce problems with stopping downloading then can't |
with stopping downloading then can not tie hash to database later. |
tie hash to database later. |
|
|
|
=cut |
=cut |
|
|
Line 396 sub ProcessTopResourceMap {
|
Line 427 sub ProcessTopResourceMap {
|
$beenHere{'o:'.$partId.$currentResourceID}++; |
$beenHere{'o:'.$partId.$currentResourceID}++; |
if(defined($cache->{'OptionResponses'})) { |
if(defined($cache->{'OptionResponses'})) { |
$cache->{'OptionResponses'}.= ':::'. |
$cache->{'OptionResponses'}.= ':::'. |
$currentResourceID.':'. |
$currentSequence.':'.$currentResourceID.':'. |
$partId.':'.$responseId; |
$partId.':'.$responseId; |
} else { |
} else { |
$cache->{'OptionResponses'}= $currentResourceID. |
$cache->{'OptionResponses'}= $currentSequence.':'. |
':'.$partId.':'.$responseId; |
$currentResourceID.':'. |
|
$partId.':'.$responseId; |
} |
} |
} |
} |
} |
} |
Line 500 Takes data downloaded for a student and
|
Line 532 Takes data downloaded for a student and
|
stored in cache data. The username, domain, class related date, PID, |
stored in cache data. The username, domain, class related date, PID, |
full name, and section are all processed here. |
full name, and section are all processed here. |
|
|
|
|
=over 4 |
=over 4 |
|
|
Input: $cache, $classlist, $courseID, $ChartDB, $c |
Input: $cache, $classlist, $courseID, $ChartDB, $c |
Line 509 $cache: A hash pointer to store the data
|
Line 540 $cache: A hash pointer to store the data
|
|
|
$classlist: The hash of data collected about a student from |
$classlist: The hash of data collected about a student from |
&DownloadClasslist(). The hash contains a list of students, a pointer |
&DownloadClasslist(). The hash contains a list of students, a pointer |
to a hash of student information for each student, and each student's section |
to a hash of student information for each student, and each students section |
number. |
number. |
|
|
$courseID: The course ID |
$courseID: The course ID |
Line 545 sub ProcessClasslist {
|
Line 576 sub ProcessClasslist {
|
if($c->aborted()) { |
if($c->aborted()) { |
return (); |
return (); |
} |
} |
push(@names,$name); |
|
my $studentInformation = $classlist->{$name.':studentInformation'}, |
my $studentInformation = $classlist->{$name.':studentInformation'}, |
my $sectionData = $classlist->{$name.':sections'}, |
my $sectionData = $classlist->{$name.':sections'}, |
my $date = $classlist->{$name}, |
my $date = $classlist->{$name}, |
Line 559 sub ProcessClasslist {
|
Line 589 sub ProcessClasslist {
|
$cache->{$name.':updateTime'}=' Not updated'; |
$cache->{$name.':updateTime'}=' Not updated'; |
} |
} |
|
|
my ($checkForError)=keys(%$studentInformation); |
my $error = 0; |
if($checkForError =~ /^(con_lost|error|no_such_host)/i) { |
foreach(keys(%$studentInformation)) { |
$cache->{$name.':error'}= |
if(/^(con_lost|error|no_such_host)/i) { |
'Could not download student environment data.'; |
$cache->{$name.':error'}= |
$cache->{$name.':fullname'}=''; |
'Could not download student environment data.'; |
$cache->{$name.':id'}=''; |
$cache->{$name.':fullname'}=''; |
} else { |
$cache->{$name.':id'}=''; |
$cache->{$name.':fullname'}=&ProcessFullName( |
$error = 1; |
|
} |
|
} |
|
next if($error); |
|
push(@names,$name); |
|
$cache->{$name.':fullname'}=&ProcessFullName( |
$studentInformation->{'lastname'}, |
$studentInformation->{'lastname'}, |
$studentInformation->{'generation'}, |
$studentInformation->{'generation'}, |
$studentInformation->{'firstname'}, |
$studentInformation->{'firstname'}, |
$studentInformation->{'middlename'}); |
$studentInformation->{'middlename'}); |
$cache->{$name.':id'}=$studentInformation->{'id'}; |
$cache->{$name.':id'}=$studentInformation->{'id'}; |
} |
|
|
|
my ($end, $start)=split(':',$date); |
my ($end, $start)=split(':',$date); |
$courseID=~s/\_/\//g; |
$courseID=~s/\_/\//g; |
Line 627 Takes the course data downloaded for a s
|
Line 661 Takes the course data downloaded for a s
|
&DownloadCourseInformation() and breaks it up into key value pairs |
&DownloadCourseInformation() and breaks it up into key value pairs |
to be stored in the cached data. The keys are comprised of the |
to be stored in the cached data. The keys are comprised of the |
$username:$domain:$keyFromCourseDatabase. The student username:domain is |
$username:$domain:$keyFromCourseDatabase. The student username:domain is |
stored away signifying that the student's information has been downloaded and |
stored away signifying that the students information has been downloaded and |
can be reused from cached data. |
can be reused from cached data. |
|
|
=over 4 |
=over 4 |
Line 659 sub ProcessStudentData {
|
Line 693 sub ProcessStudentData {
|
return; |
return; |
} |
} |
|
|
|
if(defined($cache->{$name.':keys'})) { |
|
foreach (split(':::', $cache->{$name.':keys'})) { |
|
delete $cache->{$name.':'.$_}; |
|
} |
|
} |
|
|
|
my %courseKeys; |
|
# user name:domain was prepended earlier in DownloadCourseInformation |
foreach (keys %$courseData) { |
foreach (keys %$courseData) { |
|
my $currentKey =~ s/^$name//; |
|
$courseKeys{$currentKey}++; |
$cache->{$_}=$courseData->{$_}; |
$cache->{$_}=$courseData->{$_}; |
} |
} |
|
|
|
$cache->{$name.':keys'} = join(':::', keys(%courseKeys)); |
|
|
return; |
return; |
} |
} |
|
|
|
=pod |
|
|
|
=item &ExtractStudentData() |
|
|
|
HISTORY: This function originally existed in every statistics module, |
|
and performed different tasks, the had some overlap. Due to the need |
|
for the data from the different modules, they were combined into |
|
a single function. |
|
|
|
This function now extracts all the necessary course data for a student |
|
from what was downloaded from their homeserver. There is some extra |
|
time overhead compared to the ProcessStudentInformation function, but |
|
it would have had to occurred at some point anyways. This is now |
|
typically called while downloading the data it will process. It is |
|
the brother function to ProcessStudentInformation. |
|
|
|
=over 4 |
|
|
|
Input: $input, $output, $data, $name |
|
|
|
$input: A hash that contains the input data to be processed |
|
|
|
$output: A hash to contain the processed data |
|
|
|
$data: A hash containing the information on what is to be |
|
processed and how (basically). |
|
|
|
$name: username:domain |
|
|
|
The input is slightly different here, but is quite simple. |
|
It is currently used where the $input, $output, and $data |
|
can and are often the same hashes, but they do not need |
|
to be. |
|
|
|
Output: None |
|
|
|
*NOTE: There is no output, but an error message is stored away in the cache |
|
data. This is checked in &FormatStudentData(). The key username:domain:error |
|
will only exist if an error occured. The error is an error from |
|
&DownloadCourseInformation(). |
|
|
|
=back |
|
|
|
=cut |
|
|
sub ExtractStudentData { |
sub ExtractStudentData { |
my ($input, $output, $data, $name)=@_; |
my ($input, $output, $data, $name)=@_; |
|
|
Line 673 sub ExtractStudentData {
|
Line 764 sub ExtractStudentData {
|
return; |
return; |
} |
} |
|
|
|
my %allkeys; |
|
if(defined($output->{$name.':keys'})) { |
|
foreach (split(':::', $output->{$name.':keys'})) { |
|
delete $output->{$name.':'.$_}; |
|
} |
|
} |
|
|
my ($username,$domain)=split(':',$name); |
my ($username,$domain)=split(':',$name); |
|
|
my $Version; |
my $Version; |
Line 692 sub ExtractStudentData {
|
Line 790 sub ExtractStudentData {
|
foreach my $part (split(/\:/,$data->{$sequence.':'. |
foreach my $part (split(/\:/,$data->{$sequence.':'. |
$problemID. |
$problemID. |
':parts'})) { |
':parts'})) { |
|
$output->{$name.':'.$problemID.':'.$part.':tries'} = 0; |
|
$output->{$name.':'.$problemID.':'.$part.':awarded'} = 0; |
|
$output->{$name.':'.$problemID.':'.$part.':code'} = ' '; |
|
$allkeys{$name.':'.$problemID.':'.$part.':tries'}++; |
|
$allkeys{$name.':'.$problemID.':'.$part.':awarded'}++; |
|
$allkeys{$name.':'.$problemID.':'.$part.':code'}++; |
$totalProblems++; |
$totalProblems++; |
} |
} |
$output->{$name.':'.$problemID.':'.$part.':tries'} = 0; |
|
$output->{$name.':'.$problemID.':'.$part.':awarded'} = 0; |
|
$output->{$name.':'.$problemID.':'.$part.':code'} = ' '; |
|
$output->{$name.':'.$problemID.':NoVersion'} = 'true'; |
$output->{$name.':'.$problemID.':NoVersion'} = 'true'; |
|
$allkeys{$name.':'.$problemID.':NoVersion'}++; |
next; |
next; |
} |
} |
|
|
Line 780 sub ExtractStudentData {
|
Line 882 sub ExtractStudentData {
|
':parts'})) { |
':parts'})) { |
$output->{$name.':'.$problemID.':'.$part.':wrong'} = |
$output->{$name.':'.$problemID.':'.$part.':wrong'} = |
$partData{$part.':tries'}; |
$partData{$part.':tries'}; |
|
$allkeys{$name.':'.$problemID.':'.$part.':wrong'}++; |
|
|
if($partData{$part.':code'} eq '*') { |
if($partData{$part.':code'} eq '*') { |
$output->{$name.':'.$problemID.':'.$part.':wrong'}--; |
$output->{$name.':'.$problemID.':'.$part.':wrong'}--; |
Line 795 sub ExtractStudentData {
|
Line 898 sub ExtractStudentData {
|
$partData{$part.':code'}; |
$partData{$part.':code'}; |
$output->{$name.':'.$problemID.':'.$part.':awarded'} = |
$output->{$name.':'.$problemID.':'.$part.':awarded'} = |
$partData{$part.':awarded'}; |
$partData{$part.':awarded'}; |
|
$allkeys{$name.':'.$problemID.':'.$part.':tries'}++; |
|
$allkeys{$name.':'.$problemID.':'.$part.':code'}++; |
|
$allkeys{$name.':'.$problemID.':'.$part.':awarded'}++; |
|
|
$totalAwarded += $partData{$part.':awarded'}; |
$totalAwarded += $partData{$part.':awarded'}; |
$output->{$name.':'.$problemID.':'.$part.':timestamp'} = |
$output->{$name.':'.$problemID.':'.$part.':timestamp'} = |
$partData{$part.':timestamp'}; |
$partData{$part.':timestamp'}; |
|
$allkeys{$name.':'.$problemID.':'.$part.':timestamp'}++; |
|
|
foreach my $response (split(':', $data->{$sequence.':'. |
foreach my $response (split(':', $data->{$sequence.':'. |
$problemID.':'. |
$problemID.':'. |
$part.':responseIDs'})) { |
$part.':responseIDs'})) { |
$output->{$name.':'.$problemID.':'.$part.':'.$response. |
$output->{$name.':'.$problemID.':'.$part.':'.$response. |
':submission'}=join(':::',@submissions); |
':submission'}=join(':::',@submissions); |
|
$allkeys{$name.':'.$problemID.':'.$part.':'.$response. |
|
':submission'}++; |
} |
} |
|
|
if($partData{$part.':code'} ne 'x') { |
if($partData{$part.':code'} ne 'x') { |
Line 812 sub ExtractStudentData {
|
Line 923 sub ExtractStudentData {
|
} |
} |
|
|
$output->{$name.':'.$sequence.':problemsCorrect'} = $problemsCorrect; |
$output->{$name.':'.$sequence.':problemsCorrect'} = $problemsCorrect; |
|
$allkeys{$name.':'.$sequence.':problemsCorrect'}++; |
$problemsSolved += $problemsCorrect; |
$problemsSolved += $problemsCorrect; |
$problemsCorrect=0; |
$problemsCorrect=0; |
} |
} |
Line 819 sub ExtractStudentData {
|
Line 931 sub ExtractStudentData {
|
$output->{$name.':problemsSolved'} = $problemsSolved; |
$output->{$name.':problemsSolved'} = $problemsSolved; |
$output->{$name.':totalProblems'} = $totalProblems; |
$output->{$name.':totalProblems'} = $totalProblems; |
$output->{$name.':totalAwarded'} = $totalAwarded; |
$output->{$name.':totalAwarded'} = $totalAwarded; |
|
$allkeys{$name.':problemsSolved'}++; |
|
$allkeys{$name.':totalProblems'}++; |
|
$allkeys{$name.':totalAwarded'}++; |
|
|
|
$output->{$name.':keys'} = join(':::', keys(%allkeys)); |
|
|
return; |
return; |
} |
} |
Line 854 sub LoadDiscussion {
|
Line 971 sub LoadDiscussion {
|
=head1 HELPER FUNCTIONS |
=head1 HELPER FUNCTIONS |
|
|
These are just a couple of functions do various odd and end |
These are just a couple of functions do various odd and end |
jobs. |
jobs. There was also a couple of bulk functions added. These are |
|
&DownloadStudentCourseData(), &DownloadStudentCourseDataSeparate(), and |
|
&CheckForResidualDownload(). These functions now act as the interface |
|
for downloading student course data. The statistical modules should |
|
no longer make the calls to dump and download and process etc. They |
|
make calls to these bulk functions to get their data. |
|
|
=cut |
=cut |
|
|
Line 958 $ChartDB: The name of the cache database
|
Line 1080 $ChartDB: The name of the cache database
|
|
|
Output: -1, 0, 1 |
Output: -1, 0, 1 |
|
|
-1: Couldn't tie database |
-1: Could not tie database |
0: Use cached data |
0: Use cached data |
1: New cache database created, use that. |
1: New cache database created, use that. |
|
|
Line 1010 sub DownloadStudentCourseData {
|
Line 1132 sub DownloadStudentCourseData {
|
my $title = 'LON-CAPA Statistics'; |
my $title = 'LON-CAPA Statistics'; |
my $heading = 'Download and Process Course Data'; |
my $heading = 'Download and Process Course Data'; |
my $studentCount = scalar(@$students); |
my $studentCount = scalar(@$students); |
my %cache; |
|
|
|
my $WhatIWant; |
my $WhatIWant; |
$WhatIWant = '(^version:(\w|\/|\.|-)+?$|'; |
$WhatIWant = '(^version:|'; |
$WhatIWant .= '^\d+:(\w|\/|\.|-)+?:(resource\.\d+\.'; |
$WhatIWant .= '^\d+:.+?:(resource\.\d+\.'; |
$WhatIWant .= '(solved|tries|previous|awarded|(\d+\.submission))\s*$'; |
$WhatIWant .= '(solved|tries|previous|awarded|(\d+\.submission))\s*$'; |
$WhatIWant .= '|timestamp)'; |
$WhatIWant .= '|timestamp)'; |
$WhatIWant .= ')'; |
$WhatIWant .= ')'; |
|
# $WhatIWant = '.'; |
|
|
if($status eq 'true') { |
if($status eq 'true') { |
&Apache::lonhtmlcommon::Create_PrgWin($r, $title, $heading); |
&Apache::lonhtmlcommon::Create_PrgWin($r, $title, $heading); |
} |
} |
my $count=1; |
|
|
my $displayString; |
|
my $count=0; |
foreach (@$students) { |
foreach (@$students) { |
|
my %cache; |
|
|
if($c->aborted()) { return 'Aborted'; } |
if($c->aborted()) { return 'Aborted'; } |
|
|
if($status eq 'true') { |
if($status eq 'true') { |
|
$count++; |
my $displayString = $count.'/'.$studentCount.': '.$_; |
my $displayString = $count.'/'.$studentCount.': '.$_; |
&Apache::lonhtmlcommon::Update_PrgWin($displayString, $r); |
&Apache::lonhtmlcommon::Update_PrgWin($displayString, $r); |
} |
} |
Line 1040 sub DownloadStudentCourseData {
|
Line 1167 sub DownloadStudentCourseData {
|
|
|
if($c->aborted()) { return 'Aborted'; } |
if($c->aborted()) { return 'Aborted'; } |
|
|
if($downloadTime eq 'Not downloaded') { |
#if($downloadTime ne 'Not downloaded') { |
my $courseData = |
# next; |
&DownloadCourseInformation($_, $courseID, $downloadTime, |
#} |
$WhatIWant); |
my $courseData = |
if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_WRCREAT(),0640)) { |
&DownloadCourseInformation($_, $courseID, $downloadTime, |
foreach my $key (keys(%$courseData)) { |
$WhatIWant); |
if($key =~ /^(con_lost|error|no_such_host)/i) { |
if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_WRCREAT(),0640)) { |
$courseData->{$_.':error'} = 'No course data for '.$_; |
foreach my $key (keys(%$courseData)) { |
last; |
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 { |
if($extract eq 'true') { |
&ProcessStudentData(\%cache, $courseData, $_); |
&ExtractStudentData($courseData, \%cache, \%cache, $_); |
} |
} else { |
untie(%cache); |
&ProcessStudentData(\%cache, $courseData, $_); |
} else { |
} |
next; |
untie(%cache); |
} |
} else { |
} |
next; |
$count++; |
} |
} |
} |
if($status eq 'true') { &Apache::lonhtmlcommon::Close_PrgWin($r); } |
if($status eq 'true') { &Apache::lonhtmlcommon::Close_PrgWin($r); } |
|
|
Line 1075 sub DownloadStudentCourseDataSeparate {
|
Line 1202 sub DownloadStudentCourseDataSeparate {
|
my $heading = 'Download Course Data'; |
my $heading = 'Download Course Data'; |
|
|
my $WhatIWant; |
my $WhatIWant; |
$WhatIWant = '(^version:(\w|\/|\.|-)+?$|'; |
$WhatIWant = '(^version:|'; |
$WhatIWant .= '^\d+:(\w|\/|\.|-)+?:(resource\.\d+\.'; |
$WhatIWant .= '^\d+:.+?:(resource\.\d+\.'; |
$WhatIWant .= '(solved|tries|previous|awarded|(\d+\.submission))\s*$'; |
$WhatIWant .= '(solved|tries|previous|awarded|(\d+\.submission))\s*$'; |
$WhatIWant .= '|timestamp)'; |
$WhatIWant .= '|timestamp)'; |
$WhatIWant .= ')'; |
$WhatIWant .= ')'; |
|
|
&CheckForResidualDownload($courseID, $cacheDB, $students, $c); |
&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); |
my $studentCount = scalar(@$students); |
if($status eq 'true') { |
if($status eq 'true') { |
&Apache::lonhtmlcommon::Create_PrgWin($r, $title, $heading); |
&Apache::lonhtmlcommon::Create_PrgWin($r, $title, $heading); |
} |
} |
my $count=1; |
my $count=0; |
|
my $displayString=''; |
foreach (@$students) { |
foreach (@$students) { |
if($c->aborted()) { |
if($c->aborted()) { |
untie(%downloadData); |
|
return 'Aborted'; |
return 'Aborted'; |
} |
} |
|
|
if($status eq 'true') { |
if($status eq 'true') { |
my $displayString = $count.'/'.$studentCount.': '.$_; |
$count++; |
|
$displayString = $count.'/'.$studentCount.': '.$_; |
&Apache::lonhtmlcommon::Update_PrgWin($displayString, $r); |
&Apache::lonhtmlcommon::Update_PrgWin($displayString, $r); |
} |
} |
|
|
|
my %cache; |
my $downloadTime='Not downloaded'; |
my $downloadTime='Not downloaded'; |
if($checkDate eq 'true' && |
if($checkDate eq 'true' && |
tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) { |
tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) { |
Line 1113 sub DownloadStudentCourseDataSeparate {
|
Line 1236 sub DownloadStudentCourseDataSeparate {
|
} |
} |
|
|
if($c->aborted()) { |
if($c->aborted()) { |
untie(%downloadData); |
|
return 'Aborted'; |
return 'Aborted'; |
} |
} |
|
|
if($downloadTime eq 'Not downloaded') { |
#if($downloadTime eq 'Not downloaded') { |
my $error = 0; |
my $error = 0; |
my $courseData = |
my $courseData = |
&DownloadCourseInformation($_, $courseID, $downloadTime, |
&DownloadCourseInformation($_, $courseID, $downloadTime, |
$WhatIWant); |
$WhatIWant); |
|
my %downloadData; |
|
unless(tie(%downloadData,'GDBM_File',$residualFile, |
|
&GDBM_WRCREAT(),0640)) { |
|
return 'Failed to tie temporary download hash.'; |
|
} |
foreach my $key (keys(%$courseData)) { |
foreach my $key (keys(%$courseData)) { |
$downloadData{$key} = $courseData->{$key}; |
$downloadData{$key} = $courseData->{$key}; |
if($key =~ /^(con_lost|error|no_such_host)/i) { |
if($key =~ /^(con_lost|error|no_such_host)/i) { |
Line 1135 sub DownloadStudentCourseDataSeparate {
|
Line 1262 sub DownloadStudentCourseDataSeparate {
|
} |
} |
$downloadData{$_.':error'} = 'No course data for '.$_; |
$downloadData{$_.':error'} = 'No course data for '.$_; |
} |
} |
} |
untie(%downloadData); |
$count++; |
#} |
} |
} |
if($status eq 'true') { &Apache::lonhtmlcommon::Close_PrgWin($r); } |
if($status eq 'true') { &Apache::lonhtmlcommon::Close_PrgWin($r); } |
|
|
Line 1149 sub CheckForResidualDownload {
|
Line 1276 sub CheckForResidualDownload {
|
|
|
my $residualFile = '/home/httpd/perl/tmp/'.$courseID.'DownloadFile.db'; |
my $residualFile = '/home/httpd/perl/tmp/'.$courseID.'DownloadFile.db'; |
if(!-e $residualFile) { |
if(!-e $residualFile) { |
return; |
return 'OK'; |
} |
} |
|
|
my %downloadData; |
my %downloadData; |
my %cache; |
my %cache; |
unless(tie(%downloadData,'GDBM_File',$residualFile,&GDBM_READER(),0640) && |
unless(tie(%downloadData,'GDBM_File',$residualFile,&GDBM_READER(),0640)) { |
tie(%cache,'GDBM_File',$cacheDB,&GDBM_WRCREAT(),0640)) { |
return 'Can not tie database for check for residual download: tempDB'; |
return; |
} |
|
unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_WRCREAT(),0640)) { |
|
untie(%downloadData); |
|
return 'Can not tie database for check for residual download: cacheDB'; |
} |
} |
|
|
my @dataKeys=keys(%downloadData); |
|
my @students=(); |
my @students=(); |
my %checkStudent; |
my %checkStudent; |
foreach(@dataKeys) { |
my $key; |
my @temp = split(':', $_); |
while(($key, undef) = each %downloadData) { |
|
my @temp = split(':', $key); |
my $student = $temp[0].':'.$temp[1]; |
my $student = $temp[0].':'.$temp[1]; |
if(!defined($checkStudent{$student})) { |
if(!defined($checkStudent{$student})) { |
$checkStudent{$student}++; |
$checkStudent{$student}++; |
Line 1183 sub CheckForResidualDownload {
|
Line 1313 sub CheckForResidualDownload {
|
last if($c->aborted()); |
last if($c->aborted()); |
|
|
if($status eq 'true') { |
if($status eq 'true') { |
my $displayString = $count.'/'.$studentCount.': '.$_; |
my $displayString = $count.'/'.$studentCount.': '.$name; |
&Apache::lonhtmlcommon::Update_PrgWin($displayString, $r); |
&Apache::lonhtmlcommon::Update_PrgWin($displayString, $r); |
} |
} |
|
|
Line 1192 sub CheckForResidualDownload {
|
Line 1322 sub CheckForResidualDownload {
|
} else { |
} else { |
&ProcessStudentData(\%cache, \%downloadData, $name); |
&ProcessStudentData(\%cache, \%downloadData, $name); |
} |
} |
foreach (@dataKeys) { |
|
if(/^$name/) { |
|
delete $downloadData{$_}; |
|
} |
|
} |
|
$count++; |
$count++; |
} |
} |
|
|
Line 1213 sub CheckForResidualDownload {
|
Line 1338 sub CheckForResidualDownload {
|
return 'OK'; |
return 'OK'; |
} |
} |
|
|
sub GetFileTimestamp { |
|
my ($studentDomain,$studentName,$filename,$root)=@_; |
|
$studentDomain=~s/\W//g; |
|
$studentName=~s/\W//g; |
|
my $subdir=$studentName.'__'; |
|
$subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/; |
|
my $proname="$studentDomain/$subdir/$studentName"; |
|
$proname .= '/'.$filename; |
|
my @dir = &Apache::lonnet::dirlist($proname, $studentDomain, $studentName, |
|
$root); |
|
my $fileStat = $dir[0]; |
|
my @stats = split('&', $fileStat); |
|
if($stats[0] ne 'empty' && $stats[0] ne 'no_such_dir') { |
|
return $stats[9]; |
|
} else { |
|
return -1; |
|
} |
|
} |
|
|
|
# ----- END HELPER FUNCTIONS -------------------------------------------- |
# ----- END HELPER FUNCTIONS -------------------------------------------- |
|
|
1; |
1; |