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.66 and 1.79

version 1.66, 2003/04/01 16:53:50	version 1.79, 2003/06/19 12:45:54
Line 109 sub get_sequence_assessment_data {	Line 109 sub get_sequence_assessment_data {
if (!defined($navmap)) {	if (!defined($navmap)) {
return 'Can not open Coursemap';	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 $iterator = $navmap->getIterator(undef, undef, undef, 1);
my $curRes = $iterator->next(); # Top level sequence	my $curRes = $iterator->next(); # Top level sequence
##	##
Line 118 sub get_sequence_assessment_data {	Line 122 sub get_sequence_assessment_data {
## resources. This means we have to start out with something to look	## resources. This means we have to start out with something to look
## at.	## at.
my $title = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};	my $title = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
my $symb = 'top';	my $symb = $top_level_map->symb();
my $src = 'not applicable';	my $src = $top_level_map->src();
	my $randompick = $top_level_map->randompick();
#	#
my @Sequences;	my @Sequences;
my @Assessments;	my @Assessments;
Line 130 sub get_sequence_assessment_data {	Line 135 sub get_sequence_assessment_data {
type => 'container',	type => 'container',
num_assess => 0,	num_assess => 0,
num_assess_parts => 0,	num_assess_parts => 0,
contents => [], };	contents => [],
	randompick => $randompick,
	};
push (@Sequences,$top);	push (@Sequences,$top);
push (@Nested_Sequences, $top);	push (@Nested_Sequences, $top);
#	#
# We need to keep track of which sequences contain homework problems	# We need to keep track of which sequences contain homework problems
#	#
	my $previous_too;
my $previous;	my $previous;
$curRes = $iterator->next(); # BEGIN_MAP
$curRes = $iterator->next(); # The first item in the top level map.
while (scalar(@Nested_Sequences)) {	while (scalar(@Nested_Sequences)) {
	$previous_too = $previous;
$previous = $curRes;	$previous = $curRes;
$curRes = $iterator->next();	$curRes = $iterator->next();
my $currentmap = $Nested_Sequences[-1]; # Last one on the stack	my $currentmap = $Nested_Sequences[-1]; # Last one on the stack
if ($curRes == $iterator->BEGIN_MAP()) {	if ($curRes == $iterator->BEGIN_MAP()) {
	if (! ref($previous)) {
	$previous = $previous_too;
	}
	if (! ref($previous)) {
	next;
	}
# get the map itself, instead of BEGIN_MAP	# get the map itself, instead of BEGIN_MAP
$title = $previous->title();	$title = $previous->title();
$symb = $previous->symb();	$symb = $previous->symb();
$src = $previous->src();	$src = $previous->src();
	$randompick = $previous->randompick();
my $newmap = { title => $title,	my $newmap = { title => $title,
src => $src,	src => $src,
symb => $symb,	symb => $symb,
type => 'container',	type => 'container',
num_assess => 0,	num_assess => 0,
	randompick => $randompick,
contents => [],	contents => [],
};	};
push (@{$currentmap->{'contents'}},$newmap); # this is permanent	push (@{$currentmap->{'contents'}},$newmap); # this is permanent
Line 211 sub LoadDiscussion {	Line 226 sub LoadDiscussion {
return \%Discuss;	return \%Discuss;
}	}

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

	=pod

	=item &GetUserName(username,userdomain)

	Returns a hash with the following entries:
	'firstname', 'middlename', 'lastname', 'generation', and 'fullname'

	'fullname' is the result of &Apache::loncoursedata::ProcessFullName.

	=cut

	################################################
	################################################
	sub GetUserName {
	my ($username,$userdomain) = @_;
	$username = $ENV{'user.name'} if (! defined($username));
	$userdomain = $ENV{'user.domain'} if (! defined($username));
	my %userenv = &Apache::lonnet::get('environment',
	['firstname','middlename','lastname','generation'],
	$userdomain,$username);
	$userenv{'fullname'} = &ProcessFullName($userenv{'lastname'},
	$userenv{'generation'},
	$userenv{'firstname'},
	$userenv{'middlename'});
	return %userenv;
	}

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

=pod	=pod

=item &ProcessFullName()	=item &ProcessFullName()
Line 221 is Lastname generation, firstname middle	Line 269 is Lastname generation, firstname middle

=cut	=cut

	################################################
	################################################
sub ProcessFullName {	sub ProcessFullName {
my ($lastname, $generation, $firstname, $middlename)=@_;	my ($lastname, $generation, $firstname, $middlename)=@_;
my $Str = '';	my $Str = '';
Line 422 sub init_dbs {	Line 472 sub init_dbs {
my $courseid = shift;	my $courseid = shift;
&setup_table_names($courseid);	&setup_table_names($courseid);
#	#
	# Drop any of the existing tables
	foreach my $table ($symb_table,$part_table,$student_table,
	$updatetime_table,$performance_table,
	$parameters_table) {
	&Apache::lonmysql::drop_table($table);
	}
	#
# Note - changes to this table must be reflected in the code that	# Note - changes to this table must be reflected in the code that
# stores the data (calls &Apache::lonmysql::store_row with this table	# stores the data (calls &Apache::lonmysql::store_row with this table
# id	# id
Line 494 sub init_dbs {	Line 551 sub init_dbs {
{ name => 'part_id',	{ name => 'part_id',
type => 'MEDIUMINT UNSIGNED',	type => 'MEDIUMINT UNSIGNED',
restrictions => 'NOT NULL' },	restrictions => 'NOT NULL' },
	{ name => 'part',
	type => 'VARCHAR(100)',
	restrictions => 'NOT NULL'},
{ name => 'solved',	{ name => 'solved',
type => 'TINYTEXT' },	type => 'TINYTEXT' },
{ name => 'tries',	{ name => 'tries',
Line 581 sub init_dbs {	Line 641 sub init_dbs {

=pod	=pod

	=item &delete_caches()

	=cut

	################################################
	################################################
	sub delete_caches {
	my $courseid = shift;
	$courseid = $ENV{'request.course.id'} if (! defined($courseid));
	#
	&setup_table_names($courseid);
	#
	my $dbh = &Apache::lonmysql::get_dbh();
	foreach my $table ($symb_table,$part_table,$student_table,
	$updatetime_table,$performance_table,
	$parameters_table ){
	my $command = 'DROP TABLE '.$table.';';
	$dbh->do($command);
	if ($dbh->err) {
	&Apache::lonnet::logthis($command.' resulted in error: '.$dbh->errstr);
	}
	}
	return;
	}

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

	=pod

=item &get_part_id()	=item &get_part_id()

Get the MySQL id of a problem part string.	Get the MySQL id of a problem part string.
Line 826 sub update_student_data {	Line 916 sub update_student_data {
$sname.':'.$sdom.' in course '.$courseid.	$sname.':'.$sdom.' in course '.$courseid.
':'.$tmp[0]);	':'.$tmp[0]);
$returnstatus = 'error getting data';	$returnstatus = 'error getting data';
return $returnstatus;	return ($returnstatus,undef);
}	}
if (scalar(@tmp) < 1) {	if (scalar(@tmp) < 1) {
return ('no data',undef);	return ('no data',undef);
Line 850 sub update_student_data {	Line 940 sub update_student_data {
my $num_parameters = 0;	my $num_parameters = 0;
my $store_performance_command = 'INSERT INTO '.$performance_table.	my $store_performance_command = 'INSERT INTO '.$performance_table.
' VALUES '."\n";	' VALUES '."\n";
return 'error' if (! defined($dbh));	return ('error',undef) if (! defined($dbh));
while (my ($current_symb,$param_hash) = each(%student_data)) {	while (my ($current_symb,$param_hash) = each(%student_data)) {
#	#
# make sure the symb is set up properly	# make sure the symb is set up properly
Line 862 sub update_student_data {	Line 952 sub update_student_data {
if ($parameter !~ /(timestamp\|resource\.(.*)\.(solved\|tries\|awarded\|award\|awarddetail\|previous))/) {	if ($parameter !~ /(timestamp\|resource\.(.*)\.(solved\|tries\|awarded\|award\|awarddetail\|previous))/) {
$newstring = "('".join("','",	$newstring = "('".join("','",
$symb_id,$student_id,	$symb_id,$student_id,
$parameter,$value)."'),\n";	$parameter)."',".
	$dbh->quote($value)."),\n";
$num_parameters ++;	$num_parameters ++;
if ($newstring !~ /''/) {	if ($newstring !~ /''/) {
$store_parameters_command .= $newstring;	$store_parameters_command .= $newstring;
Line 881 sub update_student_data {	Line 972 sub update_student_data {
my $awarddetail = $param_hash->{'resource.'.$part.'.awarddetail'};	my $awarddetail = $param_hash->{'resource.'.$part.'.awarddetail'};
my $timestamp = $param_hash->{'timestamp'};	my $timestamp = $param_hash->{'timestamp'};
#	#
$solved = '' if (! defined($awarded));	$solved = '' if (! defined($solved));
$tries = '' if (! defined($tries));	$tries = '' if (! defined($tries));
$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,	$newstring = "('".join("','",$symb_id,$student_id,$part_id,$part,
$solved,$tries,$awarded,$award,	$solved,$tries,$awarded,$award,
$awarddetail,$timestamp)."'),\n";	$awarddetail,$timestamp)."'),\n";
$store_performance_command .= $newstring;	$store_performance_command .= $newstring;
Line 903 sub update_student_data {	Line 994 sub update_student_data {
&Apache::lonnet::logthis(' bigass insert error:'.$dbh->errstr());	&Apache::lonnet::logthis(' bigass insert error:'.$dbh->errstr());
&Apache::lonnet::logthis('command = '.$store_parameters_command);	&Apache::lonnet::logthis('command = '.$store_parameters_command);
$returnstatus = 'error: unable to insert parameters into database';	$returnstatus = 'error: unable to insert parameters into database';
return $returnstatus,\%student_data;	return ($returnstatus,\%student_data);
}	}
$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(' bigass insert error:'.$dbh->errstr());
&Apache::lonnet::logthis('command = '.$store_performance_command);	&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);
}	}
$elapsed += Time::HiRes::time - $start;	$elapsed += Time::HiRes::time - $start;
#	#
Line 966 sub ensure_current_data {	Line 1057 sub ensure_current_data {
!$found_student \|\| !$found_part \|\|	!$found_student \|\| !$found_part \|\|
!$found_performance \|\| !$found_parameters) {	!$found_performance \|\| !$found_parameters) {
if (&init_dbs($courseid)) {	if (&init_dbs($courseid)) {
return 'error';	return ('error',undef);
}	}
}	}
#	#
Line 1030 sub get_student_data_from_performance_ca	Line 1121 sub get_student_data_from_performance_ca
#	#
my $dbh = &Apache::lonmysql::get_dbh();	my $dbh = &Apache::lonmysql::get_dbh();
my $request = "SELECT ".	my $request = "SELECT ".
"d.symb,c.part,a.solved,a.tries,a.awarded,a.award,a.awarddetail,".	"d.symb,a.part,a.solved,a.tries,a.awarded,a.award,a.awarddetail,".
"a.timestamp ";	"a.timestamp ";
if (defined($student)) {	if (defined($student)) {
$request .= "FROM $student_table AS b ".	$request .= "FROM $student_table AS b ".
"LEFT JOIN $performance_table AS a ON b.student_id=a.student_id ".	"LEFT JOIN $performance_table AS a ON b.student_id=a.student_id ".
"LEFT JOIN $part_table AS c ON c.part_id = a.part_id ".	# "LEFT JOIN $part_table AS c ON c.part_id = a.part_id ".
"LEFT JOIN $symb_table AS d ON d.symb_id = a.symb_id ".	"LEFT JOIN $symb_table AS d ON d.symb_id = a.symb_id ".
"WHERE student='$student'";	"WHERE student='$student'";
if (defined($symb) && $symb ne '') {	if (defined($symb) && $symb ne '') {
$request .= " AND d.symb='".$dbh->quote($symb)."'";	$request .= " AND d.symb=".$dbh->quote($symb);
}	}
} elsif (defined($symb) && $symb ne '') {	} elsif (defined($symb) && $symb ne '') {
$request .= "FROM $symb_table as d ".	$request .= "FROM $symb_table as d ".
"LEFT JOIN $performance_table AS a ON d.symb_id=a.symb_id ".	"LEFT JOIN $performance_table AS a ON d.symb_id=a.symb_id ".
"LEFT JOIN $part_table AS c ON c.part_id = a.part_id ".	# "LEFT JOIN $part_table AS c ON c.part_id = a.part_id ".
"LEFT JOIN $student_table AS b ON b.student_id = a.student_id ".	"LEFT JOIN $student_table AS b ON b.student_id = a.student_id ".
"WHERE symb='".$dbh->quote($symb)."'";	"WHERE symb='".$dbh->quote($symb)."'";
}	}
Line 1070 sub get_student_data_from_performance_ca	Line 1161 sub get_student_data_from_performance_ca
$studentdata->{$symb}->{$base.'.awarddetail'} = $awarddetail;	$studentdata->{$symb}->{$base.'.awarddetail'} = $awarddetail;
$studentdata->{$symb}->{'timestamp'} = $time if (defined($time) && $time ne '');	$studentdata->{$symb}->{'timestamp'} = $time if (defined($time) && $time ne '');
}	}
	if (defined($symb) && $symb ne '') {
	$studentdata = $studentdata->{$symb};
	}
return $studentdata;	return $studentdata;
}	}

Line 1119 sub get_current_state {	Line 1213 sub get_current_state {
return () if (! defined($sname) \|\| ! defined($sdom));	return () if (! defined($sname) \|\| ! defined($sdom));
#	#
my ($status,$data) = &ensure_current_data($sname,$sdom,$courseid);	my ($status,$data) = &ensure_current_data($sname,$sdom,$courseid);
#	# &Apache::lonnet::logthis
if (defined($data)) {	# ('sname = '.$sname.
	# ' domain = '.$sdom.
	# ' status = '.$status.
	# ' data is '.(defined($data)?'defined':'undefined'));
	# while (my ($symb,$hash) = each(%$data)) {
	# &Apache::lonnet::logthis($symb."\n----------------------------------");
	# while (my ($key,$value) = each (%$hash)) {
	# &Apache::lonnet::logthis(" ".$key." = ".$value);
	# }
	# }
	#
	if (defined($data) && defined($symb) && ref($data->{$symb})) {
	return %{$data->{$symb}};
	} elsif (defined($data) && ! defined($symb) && ref($data)) {
return %$data;	return %$data;
} elsif ($status eq 'no data') {	}
	if ($status eq 'no data') {
return ();	return ();
} else {	} else {
if ($status ne 'okay' && $status ne '') {	if ($status ne 'okay' && $status ne '') {

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

Removed from v.1.66
changed lines
	Added in v.1.79