--- loncom/interface/statistics/lonstathelpers.pm	2005/03/21 19:47:54	1.45
+++ loncom/interface/statistics/lonstathelpers.pm	2009/03/25 15:49:53	1.58
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstathelpers.pm,v 1.45 2005/03/21 19:47:54 matthew Exp $
+# $Id: lonstathelpers.pm,v 1.58 2009/03/25 15:49:53 bisitz 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->link,&escape($resource->shown_symb));
     my $rendered_problem = &Apache::lonnet::ssi_body($src.'?symb='.$symb);
     $rendered_problem =~ s/<\s*form\s*/<nop /g;
     $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<table>\n";
     my $rb_count =0;
@@ -154,8 +157,8 @@ sub problem_selector {
                                                      respid=>$respid,
                                                      resptype=>$resptype});
                         my $checked = '';
-                        if ($ENV{'form.problemchoice'} eq $value) {
-                            $checked = 'checked ';
+                        if ($env{'form.problemchoice'} eq $value) {
+                            $checked = 'checked="checked" ';
                         }
                         my $title = $res->compTitle;
                         if (! defined($title) || $title eq '') {
@@ -168,10 +171,9 @@ sub problem_selector {
                         if (scalar(@response_ids) > 1) {
                             $seq_str .= &mt('response').' '.$respid;
                         }
-                        my $link = $res->src.'?symb='.
-                            &Apache::lonnet::escape($res->symb);
+                        my $link = $res->link.'?symb='.&escape($res->shown_symb);
                         $seq_str .= ('&nbsp;'x2).
-                            qq{<a target="preview" href="$link">view</a>};
+                            '<a target="preview" href="'.$link.'">'.&mt('view').'</a>';
                         $seq_str .= "</td></tr>\n";
                         $rb_count++;
                     }
@@ -179,8 +181,15 @@ sub problem_selector {
             }
         }
         if ($seq_str ne '') {
-            $Str .= '<tr><td>&nbsp</td><td colspan="2"><b>'.$seq->compTitle.'</b></td>'.
+            $Str .= '<tr><td>&nbsp;</td>'.
+                '<td colspan="2"><b>'.$seq->compTitle.'</b></td>'.
                 "</tr>\n".$seq_str;
+            if (defined($sequence_addendum)) {
+                $Str .= '<tr>'.
+                    ('<td>&nbsp;</td>'x2).
+                    '<td align="right">'.$sequence_addendum.'</td>'.
+                    "</tr>\n";
+            }
         }
     }
     $Str .= "</table>\n";
@@ -214,21 +223,22 @@ 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)) {
         $navmap = Apache::lonnavmaps::navmap->new();
         if (! defined($navmap)) {
-            $Str .= 
-                '<h1>'.&mt('Error: cannot process course structure').'</h1>';
+            $Str .= '<div class="LC_error">'
+                   .&mt('Error: cannot process course structure')
+                   .'</div>';
             return $Str;
         }
     }
     my $selected = {map { ($_,1) } (&get_selected_symbs($inputname))};
     # Header
     $Str .= <<"END";
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript" language="JavaScript">
     function checkall(value,seqid) {
         for (i=0; i<document.forms.$formname.elements.length; i++) {
             ele = document.forms.$formname.elements[i];
@@ -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++,
@@ -312,15 +322,15 @@ sub new_accumulator {
                 $target.='<tr><td><label>'.
                     '<input type="checkbox" name="'.$inputname.'" ';
                 if ($checked) {
-                    $target .= 'checked ';
+                    $target .= 'checked="checked" ';
                 }
                 $target .= 'id="'.$seq_id.':'.$item_id++.'" ';
                 $target.= 
-                    'value="'.&Apache::lonnet::escape($res->symb).'" />'.
+                    'value="'.&escape($res->symb).'" />'.
                     '&nbsp;'.$res->compTitle.'</label>'.
                     ('&nbsp;'x2).'<a target="preview" '.
-                    'href="'.$res->src.'?symb='.
-                         &Apache::lonnet::escape($res->symb).'">view</a>'.
+                    'href="'.$res->link.'?symb='.
+                    &escape($res->shown_symb).'">'.&mt('view').'</a>'.
                     '</td></tr>'.$/;
             } 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,
@@ -725,11 +736,16 @@ sub get_answer {
     my ($prefix,$key,%Answer) = @_;
     my $returnvalue;
     if (exists($Answer{$key})) {
-        my $student_answer = $Answer{$key}->[0];
-        if (! defined($student_answer)) {
-            $student_answer = $Answer{$key}->[1];
-        }
-        $returnvalue = $student_answer;
+	if (ref($Answer{$key}) eq 'HASH') {
+	    my $which = 'INTERNAL';
+	    if (!exists($Answer{$key}{$which})) {
+		$which = (sort(keys(%{ $Answer{$key} })))[0];
+	    }
+	    my $student_answer = $Answer{$key}{$which}[0][0];
+	    $returnvalue = $student_answer; 
+	} else {
+	    &Apache::lonnet::logthis("error analyzing problem. got a answer of type ".ref($Answer{$key}));
+	}
     } else {
         if (exists($Answer{$prefix.'.shown'})) {
             # The response has foils
@@ -787,7 +803,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 +855,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 +884,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 +1149,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;
@@ -1239,7 +1255,7 @@ sub limit_by_time_form {
     my $enddateform = &Apache::lonhtmlcommon::date_setter
         ('Statistics','limitby_enddate',$endtime,undef,undef,$state);
     my $Str;
-    $Str .= '<script language="Javascript" >';
+    $Str .= '<script type="text/javascript" language="JavaScript">';
     $Str .= 'function toggle_limitby_activity(state) {';
     $Str .= '    if (state) {';
     $Str .= '        limitby_startdate_enable();';
@@ -1257,7 +1273,7 @@ sub limit_by_time_form {
     } 
     $timecheckbox .= 'OnChange="javascript:toggle_limitby_activity(this.checked);" ';
     $timecheckbox .= ' />';
-    $Str .= '<legend>'.&mt('[_1] Limit by time',$timecheckbox).'</legend>';
+    $Str .= '<legend><label>'.&mt('[_1] Limit by time',$timecheckbox).'</label></legend>';
     $Str .= &mt('Start Time: [_1]',$startdateform).'<br />';
     $Str .= &mt('&nbsp;End Time: [_1]',$enddateform).'<br />';
     $Str .= '</fieldset>';
@@ -1265,8 +1281,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;
@@ -1302,17 +1318,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);
@@ -1333,7 +1349,7 @@ sub manage_caches {
          '<input type="hidden" name="prevenrollstatus" value="'.$statuskey.'" />'
          );
     #
-    if (! exists($ENV{'form.firstrun'})) {
+    if (! exists($env{'form.firstrun'})) {
         $r->print('<input type="hidden" name="firstrun" value="yes" />');
     } else {
         $r->print('<input type="hidden" name="firstrun" value="no" />');
@@ -1366,7 +1382,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'));
     }
@@ -1404,7 +1420,7 @@ sub submission_report_form {
              ' enough input.');
     }
     my $html = $/.
-        '<script type="Text/JavaScript">'.
+        '<script type="text/javascript" language="JavaScript">'.
         "document.Statistics.reportSelected.value='$original_report';".
         '</script>'.
         '<input type="hidden" name="correctans" value="true" />'.
@@ -1413,7 +1429,7 @@ sub submission_report_form {
     my $output_selector = $/.'<select name="output">'.$/;
     foreach ('HTML','Excel','CSV') {
         $output_selector .= '    <option value="'.lc($_).'"';
-        if ($ENV{'form.output'} eq lc($_)) {
+        if ($env{'form.output'} eq lc($_)) {
             $output_selector .= ' selected ';
         }
         $output_selector .='>'.&mt($_).'</option>'.$/;