loncom/interface/loncoursedata.pm - diff

Return to loncoursedata.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/loncoursedata.pm between versions 1.141.2.2 and 1.150

version 1.141.2.2, 2005/04/19 21:41:17	version 1.150, 2005/10/04 18:27:32
Line 50 package Apache::loncoursedata;	Line 50 package Apache::loncoursedata;

use strict;	use strict;
use Apache::Constants qw(:common :http);	use Apache::Constants qw(:common :http);
use Apache::lonnet();	use Apache::lonnet;
use Apache::lonhtmlcommon;	use Apache::lonhtmlcommon;
use Time::HiRes;	use Time::HiRes;
use Apache::lonmysql;	use Apache::lonmysql;
Line 66 and/or itself.	Line 66 and/or itself.

=cut	=cut

####################################################
####################################################

=pod

=item &get_sequence_assessment_data()

Use lonnavmaps to build a data structure describing the order and
assessment contents of each sequence in the current course.

The returned structure is a hash reference.

{ title => 'title',
symb => 'symb',
src => '/s/o/u/r/c/e',
type => (container\|assessment),
num_assess => 2, # only for container
parts => [11,13,15], # only for assessment
response_ids => [12,14,16], # only for assessment
contents => [........] # only for container
}

$hash->{'contents'} is a reference to an array of hashes of the same structure.

Also returned are array references to the sequences and assessments contained
in the course.


=cut

####################################################
####################################################
sub get_sequence_assessment_data {
my $fn=$ENV{'request.course.fn'};
##
## use navmaps
my $navmap = Apache::lonnavmaps::navmap->new();
if (!defined($navmap)) {
return 'Can not open Coursemap';
}
# We explicity grab the top level map because I am not sure we
# are pulling it from the iterator.
my $top_level_map = $navmap->getById('0.0');
#
my $iterator = $navmap->getIterator(undef, undef, undef, 1);
my $curRes = $iterator->next(); # Top level sequence
##
## Prime the pump
##
## We are going to loop until we run out of sequences/pages to explore for
## resources. This means we have to start out with something to look
## at.
my $title = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
my $symb = $top_level_map->symb();
my $src = $top_level_map->src();
my $randompick = $top_level_map->randompick();
#
my @Sequences;
my @Assessments;
my @Nested_Sequences = (); # Stack of sequences, keeps track of depth
my $top = { title => $title,
src => $src,
symb => $symb,
type => 'container',
num_assess => 0,
num_assess_parts => 0,
contents => [],
randompick => $randompick,
};
push (@Sequences,$top);
push (@Nested_Sequences, $top);
#
# We need to keep track of which sequences contain homework problems
#
my $previous_too;
my $previous;
while (scalar(@Nested_Sequences)) {
$previous_too = $previous;
$previous = $curRes;
$curRes = $iterator->next(1);
if (!$curRes) { last; }
my $currentmap = $Nested_Sequences[-1]; # Last one on the stack
if ($curRes == $iterator->BEGIN_MAP()) {
if (! ref($previous)) {
$previous = $previous_too;
}
if (! ref($previous)) {
next;
}
# get the map itself, instead of BEGIN_MAP
$title = $previous->compTitle;
$symb = $previous->symb();
$src = $previous->src();
$randompick = $previous->randompick();
my $newmap = { title => $title,
src => $src,
symb => $symb,
type => 'container',
num_assess => 0,
randompick => $randompick,
contents => [],
};
push (@{$currentmap->{'contents'}},$newmap); # this is permanent
push (@Sequences,$newmap);
push (@Nested_Sequences, $newmap); # this is a stack
next;
}
if ($curRes == $iterator->END_MAP()) {
pop(@Nested_Sequences);
next;
}
next if (! ref($curRes));
next if (! $curRes->is_problem() && $curRes->src() !~ /\.survey$/);
# Okay, from here on out we only deal with assessments
$title = $curRes->compTitle();
$symb = $curRes->symb();
$src = $curRes->src();
my $parts = $curRes->parts();
my %partdata;
foreach my $part (@$parts) {
my @Responses = $curRes->responseType($part);
my @Ids = $curRes->responseIds($part);
$partdata{$part}->{'ResponseTypes'}= \@Responses;
$partdata{$part}->{'ResponseIds'} = \@Ids;
$partdata{$part}->{'Survey'} = $curRes->is_survey($part);
# Count how many responses of each type there are in this part
foreach (@Responses) {
$partdata{$part}->{$_}++;
}
}
my $assessment = { title => $title,
src => $src,
symb => $symb,
type => 'assessment',
parts => $parts,
num_parts => scalar(@$parts),
partdata => \%partdata,
};
push(@Assessments,$assessment);
push(@{$currentmap->{'contents'}},$assessment);
$currentmap->{'num_assess'}++;
$currentmap->{'num_assess_parts'}+= scalar(@$parts);
}
return ($top,\@Sequences,\@Assessments);
}

sub LoadDiscussion {	sub LoadDiscussion {
my ($courseID)=@_;	my ($courseID)=@_;
my %Discuss=();	my %Discuss=();
my %contrib=&Apache::lonnet::dump(	my %contrib=&Apache::lonnet::dump(
$courseID,	$courseID,
$ENV{'course.'.$courseID.'.domain'},	$env{'course.'.$courseID.'.domain'},
$ENV{'course.'.$courseID.'.num'});	$env{'course.'.$courseID.'.num'});

#my %contrib=&DownloadCourseInformation($name, $courseID, 0);	#my %contrib=&DownloadCourseInformation($name, $courseID, 0);

Line 778 sub init_dbs {	Line 632 sub init_dbs {

=item &delete_caches()	=item &delete_caches()

	This routine drops all the tables associated with a course from the
	MySQL database.

	Input: course id (optional, determined by environment if omitted)

	Returns: nothing

=cut	=cut

################################################	################################################
################################################	################################################
sub delete_caches {	sub delete_caches {
my $courseid = shift;	my $courseid = shift;
$courseid = $ENV{'request.course.id'} if (! defined($courseid));	$courseid = $env{'request.course.id'} if (! defined($courseid));
#	#
&setup_table_names($courseid);	&setup_table_names($courseid);
#	#
Line 1000 sub get_student {	Line 861 sub get_student {
sub populate_student_table {	sub populate_student_table {
my ($courseid) = @_;	my ($courseid) = @_;
if (! defined($courseid)) {	if (! defined($courseid)) {
$courseid = $ENV{'request.course.id'};	$courseid = $env{'request.course.id'};
}	}
#	#
&setup_table_names($courseid);	&setup_table_names($courseid);
Line 1008 sub populate_student_table {	Line 869 sub populate_student_table {
my $dbh = &Apache::lonmysql::get_dbh();	my $dbh = &Apache::lonmysql::get_dbh();
my $request = 'INSERT IGNORE INTO '.$student_table.	my $request = 'INSERT IGNORE INTO '.$student_table.
"(student,section,status) VALUES ";	"(student,section,status) VALUES ";
my $classlist = &get_classlist($courseid);	my $cdom = $env{'course.'.$courseid.'.domain'};
	my $cnum = $env{'course.'.$courseid.'.num'};
	my $classlist = &get_classlist($cdom,$cnum);
my $student_count=0;	my $student_count=0;
while (my ($student,$data) = each %$classlist) {	while (my ($student,$data) = each %$classlist) {
my ($section,$status) = ($data->[&CL_SECTION()],	my ($section,$status) = ($data->[&CL_SECTION()],
Line 1059 sub clear_internal_caches {	Line 922 sub clear_internal_caches {
undef(%students_by_id);	undef(%students_by_id);
}	}


################################################	################################################
################################################	################################################

Line 1354 sub update_student_data {	Line 1216 sub update_student_data {
#	#
# Set the students update time	# Set the students update time
if ($Results[0] eq 'okay') {	if ($Results[0] eq 'okay') {
&store_updatetime($student_id,$time_of_retrieval,$time_of_retrieval);	&store_updatetime($student_id,$time_of_retrieval);
}	}
#	#
return @Results;	return @Results;
Line 1410 sub store_student_data {	Line 1272 sub store_student_data {
# make sure the symb is set up properly	# make sure the symb is set up properly
my $symb_id = &get_symb_id($current_symb);	my $symb_id = &get_symb_id($current_symb);
#	#
# Load data into the tables	# Parameters
while (my ($parameter,$value) = each(%$param_hash)) {	while (my ($parameter,$value) = each(%$param_hash)) {
my $newstring;
if ($parameter !~ /(timestamp\|resource\.(.*)\.(solved\|tries\|awarded\|award\|awarddetail\|previous))/) {	if ($parameter !~ /(timestamp\|resource\.(.*)\.(solved\|tries\|awarded\|award\|awarddetail\|previous))/) {
$newstring = "('".join("','",	my $sql_parameter = "('".join("','",
$symb_id,$student_id,	$symb_id,$student_id,
$parameter)."',".	$parameter)."',".
$dbh->quote($value)."),\n";	$dbh->quote($value)."),\n";
$num_parameters ++;	$num_parameters ++;
if ($newstring !~ /''/) {	if ($sql_parameter !~ /''/) {
$store_parameters_command .= $newstring;	$store_parameters_command .= $sql_parameter;
$rows_stored++;	#$rows_stored++;
}	}
}	}
next if ($parameter !~ /^resource\.(.*)\.solved$/);	}
#	# Performance
	my %stored;
	while (my ($parameter,$value) = each(%$param_hash)) {
	next if ($parameter !~ /^resource\.(.*)\.(solved\|awarded)$/);
my $part = $1;	my $part = $1;
	next if (exists($stored{$part}));
	$stored{$part}++;
	#
my $part_id = &get_part_id($part);	my $part_id = &get_part_id($part);
next if (!defined($part_id));	next if (!defined($part_id));
my $solved = $value;	my $solved = $value;
Line 1441 sub store_student_data {	Line 1308 sub store_student_data {
$awarded = '' if (! defined($awarded));	$awarded = '' if (! defined($awarded));
$award = '' if (! defined($award));	$award = '' if (! defined($award));
$awarddetail = '' if (! defined($awarddetail));	$awarddetail = '' if (! defined($awarddetail));
$newstring = "('".join("','",$symb_id,$student_id,$part_id,$part,	my $sql_performance =
$solved,$tries,$awarded,$award,	"('".join("','",$symb_id,$student_id,$part_id,$part,
$awarddetail,$timestamp)."'),\n";	$solved,$tries,$awarded,$award,
$store_performance_command .= $newstring;	$awarddetail,$timestamp)."'),\n";
	$store_performance_command .= $sql_performance;
$rows_stored++;	$rows_stored++;
}	}
}	}
chop $store_parameters_command;	if (! $rows_stored) { return ($returnstatus, undef); }
chop $store_parameters_command;	$store_parameters_command =~ s\|,\n$\|\|;
chop $store_performance_command;	$store_performance_command =~ s\|,\n$\|\|;
chop $store_performance_command;
my $start = Time::HiRes::time;	my $start = Time::HiRes::time;
$dbh->do($store_performance_command);	$dbh->do($store_performance_command);
if ($dbh->err()) {	if ($dbh->err()) {
&Apache::lonnet::logthis(' bigass insert error:'.$dbh->errstr());	&Apache::lonnet::logthis('performance bigass insert error:'.
&Apache::lonnet::logthis('command = '.$store_performance_command);	$dbh->errstr());
	&Apache::lonnet::logthis('command = '.$/.$store_performance_command);
$returnstatus = 'error: unable to insert performance into database';	$returnstatus = 'error: unable to insert performance into database';
return ($returnstatus,$student_data);	return ($returnstatus,$student_data);
}	}
$dbh->do($store_parameters_command) if ($num_parameters>0);	$dbh->do($store_parameters_command) if ($num_parameters>0);
if ($dbh->err()) {	if ($dbh->err()) {
&Apache::lonnet::logthis(' bigass insert error:'.$dbh->errstr());	&Apache::lonnet::logthis('parameters bigass insert error:'.
&Apache::lonnet::logthis('command = '.$store_parameters_command);	$dbh->errstr());
	&Apache::lonnet::logthis('command = '.$/.$store_parameters_command);
&Apache::lonnet::logthis('rows_stored = '.$rows_stored);	&Apache::lonnet::logthis('rows_stored = '.$rows_stored);
&Apache::lonnet::logthis('student_id = '.$student_id);	&Apache::lonnet::logthis('student_id = '.$student_id);
$returnstatus = 'error: unable to insert parameters into database';	$returnstatus = 'error: unable to insert parameters into database';
Line 1491 Returns nothing on success and 'error' o	Line 1360 Returns nothing on success and 'error' o
######################################	######################################
sub ensure_tables_are_set_up {	sub ensure_tables_are_set_up {
my ($courseid) = @_;	my ($courseid) = @_;
$courseid = $ENV{'request.course.id'} if (! defined($courseid));	$courseid = $env{'request.course.id'} if (! defined($courseid));
#	#
# Clean out package variables	# Clean out package variables
&setup_table_names($courseid);	&setup_table_names($courseid);
Line 1548 sub ensure_current_data {	Line 1417 sub ensure_current_data {
my ($sname,$sdom,$courseid) = @_;	my ($sname,$sdom,$courseid) = @_;
my $status = 'okay'; # return value	my $status = 'okay'; # return value
#	#
$courseid = $ENV{'request.course.id'} if (! defined($courseid));	$courseid = $env{'request.course.id'} if (! defined($courseid));
&ensure_tables_are_set_up($courseid);	&ensure_tables_are_set_up($courseid);
#	#
# Get the update time for the user	# Get the update time for the user
Line 1597 sub ensure_current_full_data {	Line 1466 sub ensure_current_full_data {
my ($sname,$sdom,$courseid) = @_;	my ($sname,$sdom,$courseid) = @_;
my $status = 'okay'; # return value	my $status = 'okay'; # return value
#	#
$courseid = $ENV{'request.course.id'} if (! defined($courseid));	$courseid = $env{'request.course.id'} if (! defined($courseid));
&ensure_tables_are_set_up($courseid);	&ensure_tables_are_set_up($courseid);
#	#
# Get the update time for the user	# Get the update time for the user
Line 1773 an empty list is returned.	Line 1642 an empty list is returned.
sub get_current_state {	sub get_current_state {
my ($sname,$sdom,$symb,$courseid,$forcedownload)=@_;	my ($sname,$sdom,$symb,$courseid,$forcedownload)=@_;
#	#
$courseid = $ENV{'request.course.id'} if (! defined($courseid));	$courseid = $env{'request.course.id'} if (! defined($courseid));
#	#
return () if (! defined($sname) \|\| ! defined($sdom));	return () if (! defined($sname) \|\| ! defined($sdom));
#	#
Line 1876 able to answer it correctly.	Line 1745 able to answer it correctly.
sub get_problem_statistics {	sub get_problem_statistics {
my ($Sections,$status,$symb,$part,$courseid,$starttime,$endtime) = @_;	my ($Sections,$status,$symb,$part,$courseid,$starttime,$endtime) = @_;
return if (! defined($symb) \|\| ! defined($part));	return if (! defined($symb) \|\| ! defined($part));
$courseid = $ENV{'request.course.id'} if (! defined($courseid));	$courseid = $env{'request.course.id'} if (! defined($courseid));
#	#
&setup_table_names($courseid);	&setup_table_names($courseid);
my $symb_id = &get_symb_id($symb);	my $symb_id = &get_symb_id($symb);
Line 2025 sub execute_SQL_request {	Line 1894 sub execute_SQL_request {
sub populate_weight_table {	sub populate_weight_table {
my ($courseid) = @_;	my ($courseid) = @_;
if (! defined($courseid)) {	if (! defined($courseid)) {
$courseid = $ENV{'request.course.id'};	$courseid = $env{'request.course.id'};
}	}
#	#
&setup_table_names($courseid);	&setup_table_names($courseid);
my ($top,$sequences,$assessments) = get_sequence_assessment_data();	my $navmap = Apache::lonnavmaps::navmap->new();
if (! defined($top) \|\| ! ref($top)) {	if (!defined($navmap)) {
# There has been an error, better report it	&Apache::lonnet::logthis('loncoursedata::populate_weight_table:'.$/.
&Apache::lonnet::logthis('top is undefined');	' unable to get navmaps resource'.$/.
	' '.join(' ',(caller)));
	return;
	}
	my @sequences = $navmap->retrieveResources(undef,
	sub { shift->is_map(); },1,0,1);
	my @resources;
	foreach my $seq (@sequences) {
	push(@resources,$navmap->retrieveResources($seq,
	sub {shift->is_problem();},
	0,0,0));
	}
	if (! scalar(@resources)) {
	&Apache::lonnet::logthis('loncoursedata::populate_weight_table:'.$/.
	' no resources returned for '.$courseid);
return;	return;
}	}
# Since we use lonnet::EXT to retrieve problem weights,	# Since we use lonnet::EXT to retrieve problem weights,
Line 2042 sub populate_weight_table {	Line 1925 sub populate_weight_table {
my $request = 'INSERT IGNORE INTO '.$weight_table.	my $request = 'INSERT IGNORE INTO '.$weight_table.
"(symb_id,part_id,weight) VALUES ";	"(symb_id,part_id,weight) VALUES ";
my $weight;	my $weight;
foreach my $res (@$assessments) {	foreach my $res (@resources) {
my $symb_id = &get_symb_id($res->{'symb'});	my $symb_id = &get_symb_id($res->symb);
foreach my $part (@{$res->{'parts'}}) {	foreach my $part (@{$res->parts}) {
my $part_id = &get_part_id($part);	my $part_id = &get_part_id($part);
$weight = &Apache::lonnet::EXT('resource.'.$part.'.weight',	$weight = &Apache::lonnet::EXT('resource.'.$part.'.weight',
$res->{'symb'},	$res->symb,
undef,undef,undef);	undef,undef,undef);
if (!defined($weight) \|\| ($weight eq '')) {	if (!defined($weight) \|\| ($weight eq '')) {
$weight=1;	$weight=1;
Line 2161 sub rank_students_by_scores_on_resources	Line 2044 sub rank_students_by_scores_on_resources
my ($resources,$Sections,$enrollment,$courseid,$starttime,$endtime) = @_;	my ($resources,$Sections,$enrollment,$courseid,$starttime,$endtime) = @_;
return if (! defined($resources) \|\| ! ref($resources) eq 'ARRAY');	return if (! defined($resources) \|\| ! ref($resources) eq 'ARRAY');
if (! defined($courseid)) {	if (! defined($courseid)) {
$courseid = $ENV{'request.course.id'};	$courseid = $env{'request.course.id'};
}	}
#	#
&setup_table_names($courseid);	&setup_table_names($courseid);
Line 2219 Returns: the sum of the score on the pro	Line 2102 Returns: the sum of the score on the pro
########################################################	########################################################
########################################################	########################################################
sub get_sum_of_scores {	sub get_sum_of_scores {
my ($resource,$part,$students,$courseid,$starttime,$endtime) = @_;	my ($symb,$part,$students,$courseid,$starttime,$endtime) = @_;
if (! defined($courseid)) {	if (! defined($courseid)) {
$courseid = $ENV{'request.course.id'};	$courseid = $env{'request.course.id'};
}	}
if (defined($students) &&	if (defined($students) &&
((@$students == 0) \|\|	((@$students == 0) \|\|
Line 2238 sub get_sum_of_scores {	Line 2121 sub get_sum_of_scores {
my $request = 'SELECT SUM(a.awarded*w.weight),SUM(w.weight) FROM '.	my $request = 'SELECT SUM(a.awarded*w.weight),SUM(w.weight) FROM '.
$performance_table.' AS a '.	$performance_table.' AS a '.
'NATURAL LEFT JOIN '.$weight_table.' AS w ';	'NATURAL LEFT JOIN '.$weight_table.' AS w ';
$request .= 'WHERE a.symb_id='.&get_symb_id($resource->{'symb'}).	$request .= 'WHERE a.symb_id='.&get_symb_id($symb).
' AND a.part_id='.&get_part_id($part);	' AND a.part_id='.&get_part_id($part);
if (defined($time_limits)) {	if (defined($time_limits)) {
$request .= ' AND '.$time_limits;	$request .= ' AND '.$time_limits;
Line 2285 Returns: minimum, maximum, mean, s.d., n	Line 2168 Returns: minimum, maximum, mean, s.d., n
sub score_stats {	sub score_stats {
my ($Sections,$enrollment,$symbs,$starttime,$endtime,$courseid)=@_;	my ($Sections,$enrollment,$symbs,$starttime,$endtime,$courseid)=@_;
if (! defined($courseid)) {	if (! defined($courseid)) {
$courseid = $ENV{'request.course.id'};	$courseid = $env{'request.course.id'};
}	}
#	#
&setup_table_names($courseid);	&setup_table_names($courseid);
Line 2359 Returns: minimum, maximum, mean, s.d., a	Line 2242 Returns: minimum, maximum, mean, s.d., a
sub count_stats {	sub count_stats {
my ($Sections,$enrollment,$symbs,$starttime,$endtime,$courseid)=@_;	my ($Sections,$enrollment,$symbs,$starttime,$endtime,$courseid)=@_;
if (! defined($courseid)) {	if (! defined($courseid)) {
$courseid = $ENV{'request.course.id'};	$courseid = $env{'request.course.id'};
}	}
#	#
&setup_table_names($courseid);	&setup_table_names($courseid);
Line 2416 sub count_stats {	Line 2299 sub count_stats {
######################################################	######################################################
sub get_student_data {	sub get_student_data {
my ($students,$courseid) = @_;	my ($students,$courseid) = @_;
$courseid = $ENV{'request.course.id'} if (! defined($courseid));	$courseid = $env{'request.course.id'} if (! defined($courseid));
&setup_table_names($courseid);	&setup_table_names($courseid);
my $dbh = &Apache::lonmysql::get_dbh();	my $dbh = &Apache::lonmysql::get_dbh();
return undef if (! defined($dbh));	return undef if (! defined($dbh));
Line 2457 sub get_response_data {	Line 2340 sub get_response_data {
my ($Sections,$enrollment,$symb,$response,$courseid) = @_;	my ($Sections,$enrollment,$symb,$response,$courseid) = @_;
return undef if (! defined($symb) \|\|	return undef if (! defined($symb) \|\|
! defined($response));	! defined($response));
$courseid = $ENV{'request.course.id'} if (! defined($courseid));	$courseid = $env{'request.course.id'} if (! defined($courseid));
#	#
&setup_table_names($courseid);	&setup_table_names($courseid);
my $symb_id = &get_symb_id($symb);	my $symb_id = &get_symb_id($symb);
Line 2530 sub get_response_data_by_student {	Line 2413 sub get_response_data_by_student {
my ($student,$symb,$response,$courseid) = @_;	my ($student,$symb,$response,$courseid) = @_;
return undef if (! defined($symb) \|\|	return undef if (! defined($symb) \|\|
! defined($response));	! defined($response));
$courseid = $ENV{'request.course.id'} if (! defined($courseid));	$courseid = $env{'request.course.id'} if (! defined($courseid));
#	#
&setup_table_names($courseid);	&setup_table_names($courseid);
my $symb_id = &get_symb_id($symb);	my $symb_id = &get_symb_id($symb);
Line 2583 sub RT_tries { return 2; }	Line 2466 sub RT_tries { return 2; }
sub RT_timestamp { return 3; }	sub RT_timestamp { return 3; }

sub get_response_time_data {	sub get_response_time_data {
my ($students,$symb,$part,$courseid) = @_;	my ($sections,$enrollment,$symb,$part,$courseid) = @_;
return undef if (! defined($symb) \|\|	return undef if (! defined($symb) \|\|
! defined($part));	! defined($part));
$courseid = $ENV{'request.course.id'} if (! defined($courseid));	$courseid = $env{'request.course.id'} if (! defined($courseid));
#	#
&setup_table_names($courseid);	&setup_table_names($courseid);
my $symb_id = &get_symb_id($symb);	my $symb_id = &get_symb_id($symb);
	if (! defined($symb_id)) {
	&Apache::lonnet::logthis('Unable to find symb for '.$symb.' in '.$courseid);
	return undef;
	}
my $part_id = &get_part_id($part);	my $part_id = &get_part_id($part);
	if (! defined($part_id)) {
	&Apache::lonnet::logthis('Unable to find id for '.$part.' in '.$courseid);
	return undef;
	}
#	#
my $dbh = &Apache::lonmysql::get_dbh();	my $dbh = &Apache::lonmysql::get_dbh();
return undef if (! defined($dbh));	return undef if (! defined($dbh));
	my ($student_requirements,$enrollment_requirements) =
	&limit_by_section_and_status($sections,$enrollment,'d');
my $request = 'SELECT '.	my $request = 'SELECT '.
'a.student_id, a.awarded, a.tries, b.timestamp '.	'a.student_id, a.awarded, a.tries, b.timestamp '.
'FROM '.$fulldump_part_table.' AS a '.	'FROM '.$fulldump_part_table.' AS a '.
'NATURAL LEFT JOIN '.$fulldump_timestamp_table.' AS b '.	'LEFT JOIN '.$fulldump_timestamp_table.' AS b '.
# 'ON a.symb_id=b.symb_id AND a.student_id=b.student_id AND '.	'ON a.symb_id=b.symb_id AND a.student_id=b.student_id AND '.
# 'a.transaction = b.transaction '.	'a.transaction = b.transaction '.
	'LEFT JOIN '.$student_table.' as d '.
	'ON a.student_id=d.student_id '.
'WHERE '.	'WHERE '.
'a.symb_id='.$symb_id.' AND a.part_id='.$part_id;	'a.symb_id='.$symb_id.' AND a.part_id='.$part_id;
if (defined($students)) {	if (defined($student_requirements) \|\| defined($enrollment_requirements)) {
$request .= ' AND ('.	$request .= ' AND ';
join(' OR ', map {'a.student_id='.	if (defined($student_requirements)) {
&get_student_id($_->{'username'},	$request .= $student_requirements.' AND ';
$_->{'domain'})	}
} @$students	if (defined($enrollment_requirements)) {
).')';	$request .= $enrollment_requirements.' AND ';
	}
	$request =~ s/( AND )$//;
}	}
$request .= ' ORDER BY b.timestamp';	$request .= ' ORDER BY b.timestamp';
# &Apache::lonnet::logthis("request =\n".$request);	# &Apache::lonnet::logthis("request =\n".$request);
Line 2638 sub get_response_time_data {	Line 2535 sub get_response_time_data {
################################################	################################################
################################################	################################################
sub get_student_scores {	sub get_student_scores {
my ($Sections,$Symbs,$enrollment,$courseid,$starttime,$endtime) = @_;	my ($sections,$Symbs,$enrollment,$courseid,$starttime,$endtime) = @_;
$courseid = $ENV{'request.course.id'} if (! defined($courseid));	$courseid = $env{'request.course.id'} if (! defined($courseid));
&setup_table_names($courseid);	&setup_table_names($courseid);
my $dbh = &Apache::lonmysql::get_dbh();	my $dbh = &Apache::lonmysql::get_dbh();
return (undef) if (! defined($dbh));	return (undef) if (! defined($dbh));
my $tmptable = $courseid.'_temp_'.time;	my $tmptable = $courseid.'_temp_'.time;
	my $request = 'DROP TABLE IF EXISTS '.$tmptable;
	# &Apache::lonnet::logthis('request = '.$/.$request);
	$dbh->do($request);
#	#
my $symb_requirements;	my $symb_requirements;
if (defined($Symbs) && @$Symbs) {	if (defined($Symbs) && @$Symbs) {
Line 2654 sub get_student_scores {	Line 2554 sub get_student_scores {
} @$Symbs).')';	} @$Symbs).')';
}	}
#	#
my $student_requirements;	my ($student_requirements,$enrollment_requirements) =
if ( (defined($Sections) && $Sections->[0] ne 'all')) {	&limit_by_section_and_status($sections,$enrollment,'b');
$student_requirements = '('.
join(' OR ', map { "b.section='".$_."'" } @$Sections
).')';
}
#
my $enrollment_requirements=undef;
if (defined($enrollment) && $enrollment ne 'Any') {
$enrollment_requirements = "b.status='".$enrollment."'";
}
#	#
my $time_requirements = undef;	my $time_requirements = &limit_by_start_end_time($starttime,$endtime,'a');
if (defined($starttime)) {
$time_requirements .= "a.timestamp>='".$starttime."'";
if (defined($endtime)) {
$time_requirements .= " AND a.timestamp<='".$endtime."'";
}
} elsif (defined($endtime)) {
$time_requirements .= "a.timestamp<='".$endtime."'";
}
##	##
##	$request = 'CREATE TEMPORARY TABLE IF NOT EXISTS '.$tmptable.
my $request = 'CREATE TEMPORARY TABLE IF NOT EXISTS '.$tmptable.	' SELECT a.student_id,SUM(a.awarded*c.weight) AS score FROM '.
' SELECT a.student_id,SUM(a.awarded) AS score FROM '.
$performance_table.' AS a ';	$performance_table.' AS a ';
	$request .= "LEFT JOIN ".$weight_table.' AS c ON a.symb_id=c.symb_id AND a.part_id=c.part_id ';
if (defined($student_requirements) \|\| defined($enrollment_requirements)) {	if (defined($student_requirements) \|\| defined($enrollment_requirements)) {
$request .= ' NATURAL LEFT JOIN '.$student_table.' AS b ';	$request .= ' LEFT JOIN '.$student_table.' AS b ON a.student_id=b.student_id';
}	}
if (defined($symb_requirements) \|\|	if (defined($symb_requirements) \|\|
defined($student_requirements) \|\|	defined($student_requirements) \|\|
Line 2743 Cleans up the package variables for loca	Line 2626 Cleans up the package variables for loca
sub setup_table_names {	sub setup_table_names {
my ($courseid) = @_;	my ($courseid) = @_;
if (! defined($courseid)) {	if (! defined($courseid)) {
$courseid = $ENV{'request.course.id'};	$courseid = $env{'request.course.id'};
}	}
#	#
if (! defined($current_course) \|\| $current_course ne $courseid) {	if (! defined($current_course) \|\| $current_course ne $courseid) {
Line 2816 Retrieve the classist of a given class o	Line 2699 Retrieve the classist of a given class o
information is returned from the classlist.db file and, if needed,	information is returned from the classlist.db file and, if needed,
from the students environment.	from the students environment.

Optional arguments are $cid, $cdom, and $cnum (course id, course domain,	Optional arguments are $cdom, and $cnum (course domain,
and course number, respectively). Any omitted arguments will be taken	and course number, respectively). If either is ommitted the course
from the current environment ($ENV{'request.course.id'},	will be taken from the current environment ($env{'request.course.id'},
$ENV{'course.'.$cid.'.domain'}, and $ENV{'course.'.$cid.'.num'}).	$env{'course.'.$cid.'.domain'}, and $env{'course.'.$cid.'.num'}).

Returns a reference to a hash which contains:	Returns a reference to a hash which contains:
keys '$sname:$sdom'	keys '$sname:$sdom'
Line 2846 sub CL_TYPE { return 8; }	Line 2729 sub CL_TYPE { return 8; }
sub CL_LOCKEDTYPE { return 9; }	sub CL_LOCKEDTYPE { return 9; }

sub get_classlist {	sub get_classlist {
my ($cid,$cdom,$cnum) = @_;	my ($cdom,$cnum) = @_;
$cid = $cid \|\| $ENV{'request.course.id'};	my $cid = $cdom.'_'.$cnum;
$cdom = $cdom \|\| $ENV{'course.'.$cid.'.domain'};	if (!defined($cdom) \|\| !defined($cnum)) {
$cnum = $cnum \|\| $ENV{'course.'.$cid.'.num'};	$cid = $env{'request.course.id'};
	$cdom = $env{'course.'.$cid.'.domain'};
	$cnum = $env{'course.'.$cid.'.num'};
	}
my $now = time;	my $now = time;
#	#
my %classlist=&Apache::lonnet::dump('classlist',$cdom,$cnum);	my %classlist=&Apache::lonnet::dump('classlist',$cdom,$cnum);

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.141.2.2
changed lines
	Added in v.1.150