version 1.131, 2004/04/06 19:02:00
|
version 1.140, 2004/10/07 22:12:47
|
Line 155 sub get_sequence_assessment_data {
|
Line 155 sub get_sequence_assessment_data {
|
next; |
next; |
} |
} |
# get the map itself, instead of BEGIN_MAP |
# get the map itself, instead of BEGIN_MAP |
$title = $previous->title(); |
$title = $previous->compTitle; |
$title =~ s/\:/\&\#058;/g; |
|
$symb = $previous->symb(); |
$symb = $previous->symb(); |
$src = $previous->src(); |
$src = $previous->src(); |
# pick up the filename if there is no title available |
|
if (! defined($title) || $title eq '') { |
|
($title) = ($src=~/\/([^\/]*)$/); |
|
} |
|
$randompick = $previous->randompick(); |
$randompick = $previous->randompick(); |
my $newmap = { title => $title, |
my $newmap = { title => $title, |
src => $src, |
src => $src, |
Line 184 sub get_sequence_assessment_data {
|
Line 179 sub get_sequence_assessment_data {
|
next if (! ref($curRes)); |
next if (! ref($curRes)); |
next if (! $curRes->is_problem() && $curRes->src() !~ /\.survey$/); |
next if (! $curRes->is_problem() && $curRes->src() !~ /\.survey$/); |
# Okay, from here on out we only deal with assessments |
# Okay, from here on out we only deal with assessments |
$title = $curRes->title(); |
$title = $curRes->compTitle(); |
$title =~ s/\:/\&\#058;/g; |
|
$symb = $curRes->symb(); |
$symb = $curRes->symb(); |
$src = $curRes->src(); |
$src = $curRes->src(); |
# Grab the filename if there is not title available |
|
if (! defined($title) || $title eq '') { |
|
($title) = ($src=~ m:/([^/]*)$:); |
|
} |
|
my $parts = $curRes->parts(); |
my $parts = $curRes->parts(); |
my %partdata; |
my %partdata; |
foreach my $part (@$parts) { |
foreach my $part (@$parts) { |
Line 199 sub get_sequence_assessment_data {
|
Line 189 sub get_sequence_assessment_data {
|
my @Ids = $curRes->responseIds($part); |
my @Ids = $curRes->responseIds($part); |
$partdata{$part}->{'ResponseTypes'}= \@Responses; |
$partdata{$part}->{'ResponseTypes'}= \@Responses; |
$partdata{$part}->{'ResponseIds'} = \@Ids; |
$partdata{$part}->{'ResponseIds'} = \@Ids; |
|
$partdata{$part}->{'Survey'} = $curRes->is_survey($part); |
# Count how many responses of each type there are in this part |
# Count how many responses of each type there are in this part |
foreach (@Responses) { |
foreach (@Responses) { |
$partdata{$part}->{$_}++; |
$partdata{$part}->{$_}++; |
Line 217 sub get_sequence_assessment_data {
|
Line 208 sub get_sequence_assessment_data {
|
$currentmap->{'num_assess'}++; |
$currentmap->{'num_assess'}++; |
$currentmap->{'num_assess_parts'}+= scalar(@$parts); |
$currentmap->{'num_assess_parts'}+= scalar(@$parts); |
} |
} |
$navmap->untieHashes(); |
|
return ($top,\@Sequences,\@Assessments); |
return ($top,\@Sequences,\@Assessments); |
} |
} |
|
|
Line 547 store student data.
|
Line 537 store student data.
|
################################################ |
################################################ |
################################################ |
################################################ |
sub init_dbs { |
sub init_dbs { |
my $courseid = shift; |
my ($courseid,$drop) = @_; |
&setup_table_names($courseid); |
&setup_table_names($courseid); |
# |
# |
# Drop any of the existing tables |
# Drop any of the existing tables |
foreach my $table (@Tables) { |
if ($drop) { |
&Apache::lonmysql::drop_table($table); |
foreach my $table (@Tables) { |
|
&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 |
Line 580 sub init_dbs {
|
Line 572 sub init_dbs {
|
restrictions => 'NOT NULL', |
restrictions => 'NOT NULL', |
auto_inc => 'yes', }, |
auto_inc => 'yes', }, |
{ name => 'part', |
{ name => 'part', |
type => 'VARCHAR(100)', |
type => 'VARCHAR(100) BINARY', |
restrictions => 'NOT NULL'}, |
restrictions => 'NOT NULL'}, |
], |
], |
'PRIMARY KEY' => ['part (100)'], |
'PRIMARY KEY' => ['part (100)'], |
Line 595 sub init_dbs {
|
Line 587 sub init_dbs {
|
restrictions => 'NOT NULL', |
restrictions => 'NOT NULL', |
auto_inc => 'yes', }, |
auto_inc => 'yes', }, |
{ name => 'student', |
{ name => 'student', |
type => 'VARCHAR(100)', |
type => 'VARCHAR(100) BINARY', |
restrictions => 'NOT NULL UNIQUE'}, |
restrictions => 'NOT NULL UNIQUE'}, |
{ name => 'section', |
{ name => 'section', |
type => 'VARCHAR(100)', |
type => 'VARCHAR(100) BINARY', |
restrictions => 'NOT NULL'}, |
restrictions => 'NOT NULL'}, |
{ name => 'status', |
{ name => 'status', |
type => 'VARCHAR(15)', |
type => 'VARCHAR(15) BINARY', |
restrictions => 'NOT NULL'}, |
restrictions => 'NOT NULL'}, |
{ name => 'classification', |
{ name => 'classification', |
type => 'varchar(100)', }, |
type => 'VARCHAR(100) BINARY', }, |
{ name => 'updatetime', |
{ name => 'updatetime', |
type => 'INT UNSIGNED'}, |
type => 'INT UNSIGNED'}, |
{ name => 'fullupdatetime', |
{ name => 'fullupdatetime', |
Line 629 sub init_dbs {
|
Line 621 sub init_dbs {
|
type => 'MEDIUMINT UNSIGNED', |
type => 'MEDIUMINT UNSIGNED', |
restrictions => 'NOT NULL' }, |
restrictions => 'NOT NULL' }, |
{ name => 'part', |
{ name => 'part', |
type => 'VARCHAR(100)', |
type => 'VARCHAR(100) BINARY', |
restrictions => 'NOT NULL'}, |
restrictions => 'NOT NULL'}, |
{ name => 'solved', |
{ name => 'solved', |
type => 'TINYTEXT' }, |
type => 'TINYTEXT' }, |
Line 709 sub init_dbs {
|
Line 701 sub init_dbs {
|
{ name => 'awarddetail', |
{ name => 'awarddetail', |
type => 'TINYTEXT' }, |
type => 'TINYTEXT' }, |
# { name => 'message', |
# { name => 'message', |
# type => 'CHAR' }, |
# type => 'CHAR BINARY'}, |
{ name => 'response_specific', |
{ name => 'response_specific', |
type => 'TINYTEXT' }, |
type => 'TINYTEXT' }, |
{ name => 'response_specific_value', |
{ name => 'response_specific_value', |
Line 1081 sub populate_student_table {
|
Line 1073 sub populate_student_table {
|
} |
} |
# |
# |
&setup_table_names($courseid); |
&setup_table_names($courseid); |
|
&init_dbs($courseid,0); |
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 "; |
Line 1594 sub ensure_tables_are_set_up {
|
Line 1587 sub ensure_tables_are_set_up {
|
!$found_performance || !$found_parameters || |
!$found_performance || !$found_parameters || |
!$found_fulldump_part || !$found_fulldump_response || |
!$found_fulldump_part || !$found_fulldump_response || |
!$found_fulldump_timestamp || !$found_weight ) { |
!$found_fulldump_timestamp || !$found_weight ) { |
if (&init_dbs($courseid)) { |
if (&init_dbs($courseid,1)) { |
return 'error'; |
return 'error'; |
} |
} |
} |
} |
Line 2030 sub get_problem_statistics {
|
Line 2023 sub get_problem_statistics {
|
} |
} |
my ($solved) = &execute_SQL_request($dbh,$request); |
my ($solved) = &execute_SQL_request($dbh,$request); |
# |
# |
|
$Solved -= $solved; |
|
# |
$num = 0 if (! defined($num)); |
$num = 0 if (! defined($num)); |
$tries = 0 if (! defined($tries)); |
$tries = 0 if (! defined($tries)); |
$max = 0 if (! defined($max)); |
$max = 0 if (! defined($max)); |
$min = 0 if (! defined($min)); |
$min = 0 if (! defined($min)); |
$STD = 0 if (! defined($STD)); |
$STD = 0 if (! defined($STD)); |
$Solved = 0 if (! defined($Solved)); |
$Solved = 0 if (! defined($Solved) || $Solved < 0); |
$solved = 0 if (! defined($solved)); |
$solved = 0 if (! defined($solved)); |
# |
# |
# Compute the more complicated statistics |
# Compute the more complicated statistics |
Line 2297 sub get_sum_of_scores {
|
Line 2292 sub get_sum_of_scores {
|
if (! defined($courseid)) { |
if (! defined($courseid)) { |
$courseid = $ENV{'request.course.id'}; |
$courseid = $ENV{'request.course.id'}; |
} |
} |
|
if (defined($students) && |
|
((@$students == 0) || |
|
(@$students == 1 && (! defined($students->[0]) || |
|
$students->[0] eq '')) |
|
) |
|
){ |
|
undef($students); |
|
} |
# |
# |
&setup_table_names($courseid); |
&setup_table_names($courseid); |
my $dbh = &Apache::lonmysql::get_dbh(); |
my $dbh = &Apache::lonmysql::get_dbh(); |
Line 2319 sub get_sum_of_scores {
|
Line 2322 sub get_sum_of_scores {
|
$sth->execute(); |
$sth->execute(); |
my $rows = $sth->fetchrow_arrayref(); |
my $rows = $sth->fetchrow_arrayref(); |
if ($dbh->err) { |
if ($dbh->err) { |
&Apache::lonnet::logthis('error = '.$dbh->errstr()); |
&Apache::lonnet::logthis('error 1 = '.$dbh->errstr()); |
|
&Apache::lonnet::logthis('prepared then executed, fetchrow_arrayrefed'. |
|
$/.$request); |
return (undef,undef); |
return (undef,undef); |
} |
} |
return ($rows->[0],$rows->[1]); |
return ($rows->[0],$rows->[1]); |
Line 2499 sub get_student_data {
|
Line 2504 sub get_student_data {
|
my $sth = $dbh->prepare($request); |
my $sth = $dbh->prepare($request); |
$sth->execute(); |
$sth->execute(); |
if ($dbh->err) { |
if ($dbh->err) { |
&Apache::lonnet::logthis('error = '.$dbh->errstr()); |
&Apache::lonnet::logthis('error 2 = '.$dbh->errstr()); |
|
&Apache::lonnet::logthis('prepared then executed '.$/.$request); |
return undef; |
return undef; |
} |
} |
my $dataset = $sth->fetchall_arrayref(); |
my $dataset = $sth->fetchall_arrayref(); |
Line 2524 sub get_response_data {
|
Line 2530 sub get_response_data {
|
# |
# |
&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 $response_id = &get_part_id($response); |
my $response_id = &get_part_id($response); |
|
if (! defined($response_id)) { |
|
&Apache::lonnet::logthis('Unable to find id for '.$response.' 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)); |
Line 2560 sub get_response_data {
|
Line 2574 sub get_response_data {
|
my $sth = $dbh->prepare($request); |
my $sth = $dbh->prepare($request); |
$sth->execute(); |
$sth->execute(); |
if ($dbh->err) { |
if ($dbh->err) { |
&Apache::lonnet::logthis('error = '.$dbh->errstr()); |
&Apache::lonnet::logthis('error 3 = '.$dbh->errstr()); |
|
&Apache::lonnet::logthis('prepared then executed '.$/.$request); |
return undef; |
return undef; |
} |
} |
my $dataset = $sth->fetchall_arrayref(); |
my $dataset = $sth->fetchall_arrayref(); |
Line 2616 sub get_response_data_by_student {
|
Line 2631 sub get_response_data_by_student {
|
my $sth = $dbh->prepare($request); |
my $sth = $dbh->prepare($request); |
$sth->execute(); |
$sth->execute(); |
if ($dbh->err) { |
if ($dbh->err) { |
&Apache::lonnet::logthis('error = '.$dbh->errstr()); |
&Apache::lonnet::logthis('error 4 = '.$dbh->errstr()); |
|
&Apache::lonnet::logthis('prepared then executed '.$/.$request); |
return undef; |
return undef; |
} |
} |
my $dataset = $sth->fetchall_arrayref(); |
my $dataset = $sth->fetchall_arrayref(); |
Line 2668 sub get_response_time_data {
|
Line 2684 sub get_response_time_data {
|
my $sth = $dbh->prepare($request); |
my $sth = $dbh->prepare($request); |
$sth->execute(); |
$sth->execute(); |
if ($dbh->err) { |
if ($dbh->err) { |
&Apache::lonnet::logthis('error = '.$dbh->errstr()); |
&Apache::lonnet::logthis('error 5 = '.$dbh->errstr()); |
|
&Apache::lonnet::logthis('prepared then executed '.$/.$request); |
return undef; |
return undef; |
} |
} |
my $dataset = $sth->fetchall_arrayref(); |
my $dataset = $sth->fetchall_arrayref(); |
Line 2758 sub get_student_scores {
|
Line 2775 sub get_student_scores {
|
my $sth = $dbh->prepare($request); |
my $sth = $dbh->prepare($request); |
$sth->execute(); |
$sth->execute(); |
if ($dbh->err) { |
if ($dbh->err) { |
&Apache::lonnet::logthis('error = '.$dbh->errstr()); |
&Apache::lonnet::logthis('error 6 = '.$dbh->errstr()); |
|
&Apache::lonnet::logthis('prepared then executed '.$/.$request); |
return undef; |
return undef; |
} |
} |
$request = 'SELECT score,COUNT(*) FROM '.$tmptable.' GROUP BY score'; |
$request = 'SELECT score,COUNT(*) FROM '.$tmptable.' GROUP BY score'; |
Line 2766 sub get_student_scores {
|
Line 2784 sub get_student_scores {
|
$sth = $dbh->prepare($request); |
$sth = $dbh->prepare($request); |
$sth->execute(); |
$sth->execute(); |
if ($dbh->err) { |
if ($dbh->err) { |
&Apache::lonnet::logthis('error = '.$dbh->errstr()); |
&Apache::lonnet::logthis('error 7 = '.$dbh->errstr()); |
|
&Apache::lonnet::logthis('prepared then executed '.$/.$request); |
return undef; |
return undef; |
} |
} |
my $dataset = $sth->fetchall_arrayref(); |
my $dataset = $sth->fetchall_arrayref(); |
Line 2873 $ENV{'course.'.$cid.'.domain'}, and $ENV
|
Line 2892 $ENV{'course.'.$cid.'.domain'}, and $ENV
|
|
|
Returns a reference to a hash which contains: |
Returns a reference to a hash which contains: |
keys '$sname:$sdom' |
keys '$sname:$sdom' |
values [$sdom,$sname,$end,$start,$id,$section,$fullname,$status,$type] |
values [$sdom,$sname,$end,$start,$id,$section,$fullname,$status,$type,$lockedtype] |
|
|
The constant values CL_SDOM, CL_SNAME, CL_END, etc. can be used |
The constant values CL_SDOM, CL_SNAME, CL_END, etc. can be used |
as indices into the returned list to future-proof clients against |
as indices into the returned list to future-proof clients against |
Line 2893 sub CL_SECTION { return 5; }
|
Line 2912 sub CL_SECTION { return 5; }
|
sub CL_FULLNAME { return 6; } |
sub CL_FULLNAME { return 6; } |
sub CL_STATUS { return 7; } |
sub CL_STATUS { return 7; } |
sub CL_TYPE { return 8; } |
sub CL_TYPE { return 8; } |
|
sub CL_LOCKEDTYPE { return 9; } |
|
|
sub get_classlist { |
sub get_classlist { |
my ($cid,$cdom,$cnum) = @_; |
my ($cid,$cdom,$cnum) = @_; |
Line 2909 sub get_classlist {
|
Line 2929 sub get_classlist {
|
} |
} |
my ($sname,$sdom) = split(/:/,$student); |
my ($sname,$sdom) = split(/:/,$student); |
my @Values = split(/:/,$info); |
my @Values = split(/:/,$info); |
my ($end,$start,$id,$section,$fullname,$type); |
my ($end,$start,$id,$section,$fullname,$type,$lockedtype); |
if (@Values > 2) { |
if (@Values > 2) { |
($end,$start,$id,$section,$fullname,$type) = @Values; |
($end,$start,$id,$section,$fullname,$type,$lockedtype) = @Values; |
} else { # We have to get the data ourselves |
} else { # We have to get the data ourselves |
($end,$start) = @Values; |
($end,$start) = @Values; |
$section = &Apache::lonnet::getsection($sdom,$sname,$cid); |
$section = &Apache::lonnet::getsection($sdom,$sname,$cid); |
Line 2948 sub get_classlist {
|
Line 2968 sub get_classlist {
|
$status='Active'; |
$status='Active'; |
} |
} |
$classlist{$student} = |
$classlist{$student} = |
[$sdom,$sname,$end,$start,$id,$section,$fullname,$status,$type]; |
[$sdom,$sname,$end,$start,$id,$section,$fullname,$status,$type,$lockedtype]; |
} |
} |
if (wantarray()) { |
if (wantarray()) { |
return (\%classlist,['domain','username','end','start','id', |
return (\%classlist,['domain','username','end','start','id', |
'section','fullname','status','type']); |
'section','fullname','status','type','lockedtype']); |
} else { |
} else { |
return \%classlist; |
return \%classlist; |
} |
} |