--- loncom/interface/statistics/lonstathelpers.pm	2004/09/15 21:07:34	1.21
+++ loncom/interface/statistics/lonstathelpers.pm	2004/09/23 14:35:25	1.24
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstathelpers.pm,v 1.21 2004/09/15 21:07:34 matthew Exp $
+# $Id: lonstathelpers.pm,v 1.24 2004/09/23 14:35:25 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -169,7 +169,7 @@ sub ProblemSelector {
 
 =pod
 
-=item &MultpleProblemSelector($navmap,$ResponseTypes,$selected,$inputname)
+=item &MultipleProblemSelector($navmap,$selected,$inputname)
 
 Generate HTML with checkboxes for problem selection.
 
@@ -178,10 +178,6 @@ Input:
 $navmap: a navmap object.  If undef, navmaps will be called to create a
 new object.
 
-$ResponseTypes: scalar containing regular expression which matches response 
-types.  Only those problems which contain the given response type will be 
-shown.
-
 $selected: Scalar, Array, or hash reference of currently selected items.
 
 $inputname: The name of the form elements to use for the checkboxs.
@@ -194,7 +190,7 @@ and their contents.  A checkbox is provi
 ####################################################
 ####################################################
 sub MultipleProblemSelector {
-    my ($navmap,$ReponseTypes,$inputname,$formname)=@_;
+    my ($navmap,$inputname,$formname)=@_;
     my $cid = $ENV{'request.course.id'};
     my $Str;
     # Massage the input as needed.
@@ -210,7 +206,7 @@ sub MultipleProblemSelector {
     # Header
     $Str .= <<"END";
 <script>
-    function checkall(value, checkName) {
+    function checkall(value) {
         for (i=0; i<document.forms.$formname.elements.length; i++) {
             ele = document.forms.$formname.elements[i];
             if (ele.name == '$inputname') {
@@ -235,15 +231,15 @@ END
     while (my $curRes = $iterator->next()) {
         if ($curRes == $iterator->END_MAP) {
             if (ref($Accumulator[-1]) eq 'CODE') {
-                push(@Sequence_Data,&{$Accumulator[-1]}());
-                pop(@Accumulator);
+                my $old_accumulator = pop(@Accumulator);
+                push(@Sequence_Data,&{$old_accumulator}());
             }
         } elsif ($curRes == $iterator->BEGIN_MAP) {
             # Not much to do here.
         }
         next if (! ref($curRes));
         if ($curRes->is_map) {
-            push(@Accumulator,&new_accumulator($curRes->title,
+            push(@Accumulator,&new_accumulator($curRes->compTitle,
                                                $curRes->src,
                                                $curRes->symb,
                                                $inputname));
@@ -259,7 +255,7 @@ END
         #my $seq = pop(@Sequence_Data);
         next if (! defined($seq) || ref($seq) ne 'HASH');
         $Str.= '<tr><td colspan="2">'.
-            '<b>'.&get_title($seq->{'title'},$seq->{'src'}).'</b>'.
+            '<b>'.$seq->{'title'}.'</b>'.
             '</td></tr>'.$/;
         $Str.= $seq->{'html'};
     }
@@ -284,14 +280,14 @@ sub new_accumulator {
         sub {
             if (@_) { 
                 my ($res,$checked) = @_;
-                $target.='<tr><td>'.
+                $target.='<tr><td><label>'.
                     '<input type="checkbox" name="'.$inputname.'" ';
                 if ($checked) {
                     $target .= 'checked ';
                 }
                 $target.= 
                     'value="'.&Apache::lonnet::escape($res->symb).'" />'.
-                    '</td><td>'.&get_title($res->title,$res->symb).'</td>'.
+                    '&nbsp;'.$res->compTitle.'</label></td>'.
                     '</tr>'.$/;
             } else { 
                 if (defined($target)) {
@@ -602,6 +598,16 @@ keys $partid.'.'.$respid.'.answer'.
 #####################################################
 sub analyze_problem_as_student {
     my ($resource,$sname,$sdom,$partid,$respid) = @_;
+    if (ref($resource) ne 'HASH') {
+        my $res = $resource;
+        $resource = { 'src' => $res->src,
+                      'symb' => $res->symb,
+                      'parts' => $res->parts };
+        foreach my $part (@{$resource->{'parts'}}) {
+            $resource->{'partdata'}->{$part}->{'ResponseIds'}=
+                [$res->responseIds($part)];
+        }
+    }
     my $returnvalue;
     my $url = $resource->{'src'};
     my $symb = $resource->{'symb'};
@@ -1234,7 +1240,7 @@ Returns: An array of scalars containing
 ####################################################
 ####################################################
 sub manage_caches {
-    my ($r,$formname,$inputname) = @_;
+    my ($r,$formname,$inputname,$update_message) = @_;
     &Apache::loncoursedata::clear_internal_caches();
     my $sectionkey = 
         join(',',
@@ -1251,8 +1257,12 @@ sub manage_caches {
         (exists($ENV{'form.prevenrollstatus'}) &&
             $ENV{'form.prevenrollstatus'} ne $statuskey)
         ) {
+        if (defined($update_message)) {
+            $r->print($update_message);
+        }
         &Apache::lonstatistics::Gather_Full_Student_Data($r,$formname,
                                                          $inputname);
+            
     }
     #
     my @Buttons =