--- loncom/interface/statistics/lonstathelpers.pm 2005/03/14 20:28:22 1.44 +++ loncom/interface/statistics/lonstathelpers.pm 2006/05/30 12:46:50 1.53 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstathelpers.pm,v 1.44 2005/03/14 20:28:22 matthew Exp $ +# $Id: lonstathelpers.pm,v 1.53 2006/05/30 12:46:50 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -49,7 +49,7 @@ routines that are needed across multiple package Apache::lonstathelpers; use strict; -use Apache::lonnet(); +use Apache::lonnet; use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::loncoursedata(); @@ -60,6 +60,9 @@ use Time::Local(); use Spreadsheet::WriteExcel(); use GDBM_File; use Storable qw(freeze thaw); +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + #################################################### #################################################### @@ -83,7 +86,7 @@ sub render_resource { ## Render the problem my ($base) = ($resource->src =~ m|^(.*/)[^/]*$|); $base="http://".$ENV{'SERVER_NAME'}.$base; - my ($src,$symb)=($resource->src,&Apache::lonnet::escape($resource->symb)); + my ($src,$symb)=($resource->src,&escape($resource->symb)); my $rendered_problem = &Apache::lonnet::ssi_body($src.'?symb='.$symb); $rendered_problem =~ s/<\s*form\s*/)|<\/nop>|g; @@ -132,7 +135,7 @@ Skips 'survey' problems. #################################################### #################################################### sub problem_selector { - my ($AcceptedResponseTypes) = @_; + my ($AcceptedResponseTypes,$sequence_addendum) = @_; my $Str; $Str = "\n\n"; my $rb_count =0; @@ -154,7 +157,7 @@ sub problem_selector { respid=>$respid, resptype=>$resptype}); my $checked = ''; - if ($ENV{'form.problemchoice'} eq $value) { + if ($env{'form.problemchoice'} eq $value) { $checked = 'checked '; } my $title = $res->compTitle; @@ -169,7 +172,7 @@ sub problem_selector { $seq_str .= &mt('response').' '.$respid; } my $link = $res->src.'?symb='. - &Apache::lonnet::escape($res->symb); + &escape($res->symb); $seq_str .= (' 'x2). qq{view}; $seq_str .= "\n"; @@ -179,8 +182,15 @@ sub problem_selector { } } if ($seq_str ne '') { - $Str .= ''. + $Str .= ''. + ''. "\n".$seq_str; + if (defined($sequence_addendum)) { + $Str .= ''. + (''x2). + ''. + "\n"; + } } } $Str .= "
 '.$seq->compTitle.'
 '.$seq->compTitle.'
 '.$sequence_addendum.'
\n"; @@ -214,7 +224,7 @@ and their contents. A checkbox is provi #################################################### sub MultipleProblemSelector { my ($navmap,$inputname,$formname)=@_; - my $cid = $ENV{'request.course.id'}; + my $cid = $env{'request.course.id'}; my $Str; # Massage the input as needed. if (! defined($navmap)) { @@ -255,7 +265,7 @@ END my $iterator = $navmap->getIterator(undef, undef, undef, 1); my $sequence_string; my $seq_id = 0; - my @Accumulator = (&new_accumulator($ENV{'course.'.$cid.'.description'}, + my @Accumulator = (&new_accumulator($env{'course.'.$cid.'.description'}, '', '', $seq_id++, @@ -316,11 +326,11 @@ sub new_accumulator { } $target .= 'id="'.$seq_id.':'.$item_id++.'" '; $target.= - 'value="'.&Apache::lonnet::escape($res->symb).'" />'. + 'value="'.&escape($res->symb).'" />'. ' '.$res->compTitle.''. (' 'x2).'view'. + &escape($res->symb).'">view'. ''.$/; } else { if (defined($target)) { @@ -338,15 +348,10 @@ sub new_accumulator { sub get_selected_symbs { my ($inputfield) = @_; my $field = 'form.'.$inputfield; - my @Symbs; - if (exists($ENV{$field})) { - if (! ref($ENV{$field})) { - @Symbs = (&Apache::lonnet::unescape($ENV{$field})); - } else { - @Symbs = (map {&Apache::lonnet::unescape($_);} @{$ENV{$field}}); - } - } - return @Symbs; + my @symbs = (map { + &unescape($_); + } &Apache::loncommon::get_env_multiple($field)); + return @symbs; } #################################################### @@ -371,10 +376,10 @@ Used by Apache::lonstathelpers::ProblemS #################################################### sub make_target_id { my ($target) = @_; - my $id = &Apache::lonnet::escape($target->{'symb'}).':'. - &Apache::lonnet::escape($target->{'part'}).':'. - &Apache::lonnet::escape($target->{'respid'}).':'. - &Apache::lonnet::escape($target->{'resptype'}); + my $id = &escape($target->{'symb'}).':'. + &escape($target->{'part'}).':'. + &escape($target->{'respid'}).':'. + &escape($target->{'resptype'}); return $id; } @@ -399,18 +404,18 @@ sub get_target_from_id { my ($id) = @_; if (! ref($id)) { my ($symb,$part,$respid,$resptype) = split(':',$id); - return ({ symb => &Apache::lonnet::unescape($symb), - part => &Apache::lonnet::unescape($part), - respid => &Apache::lonnet::unescape($respid), - resptype => &Apache::lonnet::unescape($resptype)}); + return ({ symb => &unescape($symb), + part => &unescape($part), + respid => &unescape($respid), + resptype => &unescape($resptype)}); } elsif (ref($id) eq 'ARRAY') { my @Return; foreach my $selected (@$id) { my ($symb,$part,$respid,$resptype) = split(':',$selected); - push(@Return,{ symb => &Apache::lonnet::unescape($symb), - part => &Apache::lonnet::unescape($part), - respid => &Apache::lonnet::unescape($respid), - resptype => &Apache::lonnet::unescape($resptype)}); + push(@Return,{ symb => &unescape($symb), + part => &unescape($part), + respid => &unescape($respid), + resptype => &unescape($resptype)}); } return \@Return; } @@ -429,7 +434,7 @@ current resource. Inputs: $target (see &Apache::lonstathelpers::get_target_from_id()) $AcceptableResponseTypes, regular expression matching acceptable response types, - $granularity, either 'part', 'response', or 'part_survey' + $granularity, either 'part', 'response', 'part_survey', or 'part_task' Returns: three hash references, $prev, $curr, $next, which refer to the preceeding, current, or following problem parts or responses, depending @@ -465,6 +470,12 @@ sub get_prev_curr_next { part => $part, resource => $res, } ); + } elsif ($res->is_task($part) && ($granularity eq 'part_task')){ + push (@Resource, + { symb => $res->symb, + part => $part, + resource => $res, + } ); } elsif ($granularity eq 'part') { push (@Resource, { symb => $res->symb, @@ -497,7 +508,7 @@ sub get_prev_curr_next { my $curr_idx; for ($curr_idx=0;$curr_idx<$#Resource;$curr_idx++) { my $curr_item = $Resource[$curr_idx]; - if ($granularity eq 'part' || $granularity eq 'part_survey') { + if ($granularity =~ /^(part|part_survey|part_task)$/) { if ($curr_item->{'symb'} eq $target->{'symb'} && $curr_item->{'part'} eq $target->{'part'}) { last; @@ -512,7 +523,7 @@ sub get_prev_curr_next { } } my $curr_item = $Resource[$curr_idx]; - if ($granularity eq 'part' || $granularity eq 'part_survey') { + if ($granularity =~ /^(part|part_survey|part_task)$/) { if ($curr_item->{'symb'} ne $target->{'symb'} || $curr_item->{'part'} ne $target->{'part'}) { # bogus symb - return nothing @@ -644,7 +655,7 @@ sub analyze_problem_as_student { my $symb = $resource->{'symb'}; my $analysis = &get_from_analysis_cache($sname,$sdom,$symb); if (! defined($analysis)) { - my $courseid = $ENV{'request.course.id'}; + my $courseid = $env{'request.course.id'}; my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze', 'grade_domain' => $sdom, 'grade_username' => $sname, @@ -787,7 +798,7 @@ sub load_analysis_cache { my $storedstring; my %cache_db; if (tie(%cache_db,'GDBM_File',$cache_filename,&GDBM_READER(),0640)) { - $storedstring = $cache_db{&Apache::lonnet::escape($symb)}; + $storedstring = $cache_db{&escape($symb)}; untie(%cache_db); } if (defined($storedstring)) { @@ -839,7 +850,7 @@ Writes the in memory cache to disk so th sub write_analysis_cache { return if (! defined($current_symb) || ! defined($cache_filename)); my %cache_db; - my $key = &Apache::lonnet::escape($current_symb); + my $key = &escape($current_symb); if (tie(%cache_db,'GDBM_File',$cache_filename,&GDBM_WRCREAT(),0640)) { my $storestring = freeze(\%cache); $cache_db{$key}=$storestring; @@ -868,7 +879,7 @@ prior to every analysis lookup. ##################################################### sub ensure_proper_cache { my ($symb) = @_; - my $cid = $ENV{'request.course.id'}; + my $cid = $env{'request.course.id'}; my $new_filename = '/home/httpd/perl/tmp/'. 'problemanalysis_'.$cid.'_analysis_cache.db'; if (! defined($cache_filename) || @@ -1133,8 +1144,8 @@ sub get_problem_data { } } # End of logging code - next if ($key !~ /^$part/); - $key =~ s/^$part\.//; + next if ($key !~ /^\Q$part\E/); + $key =~ s/^\Q$part\E\.//; if (ref($value) eq 'ARRAY') { if ($key eq 'options') { $Partdata{$part}->{'_Options'}=$value; @@ -1257,7 +1268,7 @@ sub limit_by_time_form { } $timecheckbox .= 'OnChange="javascript:toggle_limitby_activity(this.checked);" '; $timecheckbox .= ' />'; - $Str .= ''.&mt('[_1] Limit by time',$timecheckbox).''; + $Str .= ''; $Str .= &mt('Start Time: [_1]',$startdateform).'
'; $Str .= &mt(' End Time: [_1]',$enddateform).'
'; $Str .= ''; @@ -1265,8 +1276,8 @@ sub limit_by_time_form { } sub limit_by_time { - if (exists($ENV{'form.limit_by_time'}) && - $ENV{'form.limit_by_time'} ne '' ) { + if (exists($env{'form.limit_by_time'}) && + $env{'form.limit_by_time'} ne '' ) { return 1; } else { return 0; @@ -1281,43 +1292,6 @@ sub get_time_limits { return ($starttime,$endtime); } - - -#################################################### -#################################################### - -=pod - -=item sections_description - -Inputs: @Sections, an array of sections - -Returns: A plaintext description of the sections selected. - -=cut - -#################################################### -#################################################### -sub sections_description { - my @Sections = @_; - my $sectionstring = ''; - if (scalar(@Sections) > 1) { - if (scalar(@Sections) > 2) { - my $last = pop(@Sections); - $sectionstring = "Sections ".join(', ',@Sections).', and '.$last; - } else { - $sectionstring = "Sections ".join(' and ',@Sections); - } - } else { - if ($Sections[0] eq 'all') { - $sectionstring = "All sections"; - } else { - $sectionstring = "Section ".$Sections[0]; - } - } - return $sectionstring; -} - #################################################### #################################################### @@ -1339,17 +1313,17 @@ sub manage_caches { my $sectionkey = join(',', map { - &Apache::lonnet::escape($_); + &escape($_); } sort(&Apache::lonstatistics::get_selected_sections()) ); my $statuskey = $Apache::lonstatistics::enrollment_status; - if (exists($ENV{'form.ClearCache'}) || - exists($ENV{'form.updatecaches'}) || - (exists($ENV{'form.firstrun'}) && $ENV{'form.firstrun'} ne 'no') || - (exists($ENV{'form.prevsection'}) && - $ENV{'form.prevsection'} ne $sectionkey) || - (exists($ENV{'form.prevenrollstatus'}) && - $ENV{'form.prevenrollstatus'} ne $statuskey) + if (exists($env{'form.ClearCache'}) || + exists($env{'form.updatecaches'}) || + (exists($env{'form.firstrun'}) && $env{'form.firstrun'} ne 'no') || + (exists($env{'form.prevsection'}) && + $env{'form.prevsection'} ne $sectionkey) || + (exists($env{'form.prevenrollstatus'}) && + $env{'form.prevenrollstatus'} ne $statuskey) ) { if (defined($update_message)) { $r->print($update_message); @@ -1370,7 +1344,7 @@ sub manage_caches { '' ); # - if (! exists($ENV{'form.firstrun'})) { + if (! exists($env{'form.firstrun'})) { $r->print(''); } else { $r->print(''); @@ -1403,7 +1377,7 @@ sub gather_full_student_data { return if ($c->aborted()); my $status = &Apache::loncoursedata::ensure_current_full_data ($student->{'username'},$student->{'domain'}, - $ENV{'request.course.id'}); + $env{'request.course.id'}); &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, &mt('last student')); } @@ -1450,7 +1424,7 @@ sub submission_report_form { my $output_selector = $/.'