version 1.135, 2004/06/15 14:12:56
|
version 1.141.2.3, 2005/04/21 17:35:58
|
Line 142 sub get_sequence_assessment_data {
|
Line 142 sub get_sequence_assessment_data {
|
# |
# |
my $previous_too; |
my $previous_too; |
my $previous; |
my $previous; |
while (scalar(@Nested_Sequences)) { |
while (1) { |
$previous_too = $previous; |
$previous_too = $previous; |
$previous = $curRes; |
$previous = $curRes; |
$curRes = $iterator->next(); |
$curRes = $iterator->next(); |
|
if (!$curRes) { last; } |
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)) { |
if (! ref($previous)) { |
Line 155 sub get_sequence_assessment_data {
|
Line 156 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 180 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 218 sub get_sequence_assessment_data {
|
Line 209 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 251 sub LoadDiscussion {
|
Line 241 sub LoadDiscussion {
|
|
|
=pod |
=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 |
|
|
|
=item &ProcessFullName() |
|
|
|
Takes lastname, generation, firstname, and middlename (or some partial |
|
set of this data) and returns the full name version as a string. Format |
|
is Lastname generation, firstname middlename or a subset of this. |
|
|
|
=cut |
|
|
|
################################################ |
|
################################################ |
|
sub ProcessFullName { |
|
my ($lastname, $generation, $firstname, $middlename)=@_; |
|
my $Str = ''; |
|
|
|
# Strip whitespace preceeding & following name components. |
|
$lastname =~ s/(\s+$|^\s+)//g; |
|
$generation =~ s/(\s+$|^\s+)//g; |
|
$firstname =~ s/(\s+$|^\s+)//g; |
|
$middlename =~ s/(\s+$|^\s+)//g; |
|
|
|
if($lastname ne '') { |
|
$Str .= $lastname; |
|
$Str .= ' '.$generation if ($generation ne ''); |
|
$Str .= ','; |
|
$Str .= ' '.$firstname if ($firstname ne ''); |
|
$Str .= ' '.$middlename if ($middlename ne ''); |
|
} else { |
|
$Str .= $firstname if ($firstname ne ''); |
|
$Str .= ' '.$middlename if ($middlename ne ''); |
|
$Str .= ' '.$generation if ($generation ne ''); |
|
} |
|
|
|
return $Str; |
|
} |
|
|
|
################################################ |
|
################################################ |
|
|
|
=pod |
|
|
|
=item &make_into_hash($values); |
=item &make_into_hash($values); |
|
|
Returns a reference to a hash as described by $values. $values is |
Returns a reference to a hash as described by $values. $values is |
Line 2303 sub get_sum_of_scores {
|
Line 2223 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 2325 sub get_sum_of_scores {
|
Line 2253 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 2505 sub get_student_data {
|
Line 2435 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 2530 sub get_response_data {
|
Line 2461 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 2566 sub get_response_data {
|
Line 2505 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 2622 sub get_response_data_by_student {
|
Line 2562 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 2674 sub get_response_time_data {
|
Line 2615 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 2764 sub get_student_scores {
|
Line 2706 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 2772 sub get_student_scores {
|
Line 2715 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 2879 $ENV{'course.'.$cid.'.domain'}, and $ENV
|
Line 2823 $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 2899 sub CL_SECTION { return 5; }
|
Line 2843 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 2915 sub get_classlist {
|
Line 2860 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 2932 sub get_classlist {
|
Line 2877 sub get_classlist {
|
&Apache::lonnet::logthis('unable to retrieve environment '. |
&Apache::lonnet::logthis('unable to retrieve environment '. |
'for '.$sname.':'.$sdom); |
'for '.$sname.':'.$sdom); |
} else { |
} else { |
$fullname = &ProcessFullName(@info{qw/lastname generation |
$fullname = &Apache::lonnet::format_name(@info{qw/firstname middlename lastname generation/},'lastname'); |
firstname middlename/}); |
|
$id = $info{'id'}; |
$id = $info{'id'}; |
} |
} |
# Update the classlist with this students information |
# Update the classlist with this students information |
if ($fullname ne 'not available') { |
if ($fullname ne 'not available') { |
my $enrolldata = join(':',$end,$start,$id,$section,$fullname); |
my $enrolldata = join(':',$end,$start,$id,$section,$fullname); |
my $reply=&Apache::lonnet::cput('classlist', |
my $reply=&Apache::lonnet::cput('classlist', |
{$student => $enrolldata}, |
{$student => $enrolldata}, |
$cdom,$cnum); |
$cdom,$cnum); |
if ($reply !~ /^(ok|delayed)/) { |
if ($reply !~ /^(ok|delayed)/) { |
Line 2954 sub get_classlist {
|
Line 2898 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; |
} |
} |