--- loncom/interface/statistics/lonproblemanalysis.pm	2004/01/16 15:33:40	1.54
+++ loncom/interface/statistics/lonproblemanalysis.pm	2004/01/16 20:19:33	1.56
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemanalysis.pm,v 1.54 2004/01/16 15:33:40 matthew Exp $
+# $Id: lonproblemanalysis.pm,v 1.56 2004/01/16 20:19:33 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -159,14 +159,11 @@ sub BuildProblemAnalysisPage {
                                     '.'.
                                     $current_problem->{'respid'}};
             if ($current_problem->{'resptype'} eq 'option') {
-                &OptionResponseAnalysis($r,$resource,
-                                        $current_problem->{'respid'},
+                &OptionResponseAnalysis($r,$current_problem,
                                         $ProblemData,
                                         \@Students);
             } elsif ($current_problem->{'resptype'} eq 'radiobutton') {
-                &RadioResponseAnalysis($r,$resource,
-                                       $current_problem->{'part'},
-                                       $current_problem->{'respid'},
+                &RadioResponseAnalysis($r,$current_problem,
                                        $ProblemData,
                                        \@Students);
             } else {
@@ -183,9 +180,6 @@ sub BuildProblemAnalysisPage {
     }
 }
 
-=pod
-
-Removed code:
 
 #########################################################
 #########################################################
@@ -195,7 +189,9 @@ Removed code:
 #########################################################
 #########################################################
 sub RadioResponseAnalysis {
-    my ($r,$resource,$part,$respid,$ProblemData,$Students) = @_;
+    my ($r,$problem,$ProblemData,$Students) = @_;
+    my ($resource,$respid) = ($problem->{'resource'},
+                                    $problem->{'respid'});
     my $analysis_html;
     my $PerformanceData = 
         &Apache::loncoursedata::get_response_data
@@ -209,14 +205,14 @@ sub RadioResponseAnalysis {
         return;
     }
     if (exists($ENV{'form.ExcelOutput'})) {
-        $analysis_html .= &RR_Excel_output($r,$resource,$PerformanceData,
-                                          $ProblemData);
+        $analysis_html .= &RR_Excel_output($r,$problem->{'resource'},
+                                           $PerformanceData,$ProblemData);
     } elsif ($ENV{'form.AnalyzeOver'} eq 'Tries') {
-        $analysis_html .= &RR_Tries_Analysis($r,$resource,$PerformanceData,
-                                           $ProblemData);
+        $analysis_html .= &RR_Tries_Analysis($r,$problem->{'resource'},
+                                             $PerformanceData,$ProblemData);
     } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') {
-        $analysis_html .= &RR_Time_Analysis($r,$resource,$PerformanceData,
-                                           $ProblemData);
+        $analysis_html .= &RR_Time_Analysis($r,$problem->{'resource'},
+                                            $PerformanceData,$ProblemData);
     } else {
         $analysis_html .= '<h2>'.
            &mt('The analysis you have selected is not supported at this time').
@@ -225,7 +221,6 @@ sub RadioResponseAnalysis {
     $r->print($analysis_html);
 }
 
-
 sub RR_Excel_output   { 
     my ($r,$PerformanceData,$ProblemData) = @_;
     return '<h1>No!</h1>';
@@ -246,15 +241,15 @@ sub RR_Tries_Analysis {
     }
     $analysis_html .= $table;
     my @TryData = &RR_tries_data_analysis($r,$PerformanceData);
-    if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
-        $analysis_html = &RR_Tries_Foil_Analysis($mintries,$maxtries,$Foils,
+#    if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
+        $analysis_html .= &RR_Tries_Foil_Analysis($mintries,$maxtries,$Foils,
                                                  \@TryData,$ProblemData);
-    } else {
-        $analysis_html = &RR_Tries_Concept_Analysis($mintries,$maxtries,
-                                                    $Concepts,
-                                                    \@TryData,
-                                                    $ProblemData);
-    }
+#    } else {
+#        $analysis_html = &RR_Tries_Concept_Analysis($mintries,$maxtries,
+#                                                    $Concepts,
+#                                                    \@TryData,
+#                                                    $ProblemData);
+#    }
     return $analysis_html;
 }
 
@@ -284,8 +279,8 @@ sub RR_Tries_Foil_Analysis {
         my @PlotData_Correct; 
         my @PlotData_Incorrect;
         next if ($try > scalar(@{$TryData}));
-        next if (! defined($TryData->[$try-1]));
-        my %DataSet = %{$TryData->[$try-1]};
+        next if (! defined($TryData->[$try]));
+        my %DataSet = %{$TryData->[$try]};
         my $total = 0;
         foreach my $foilid (@$Foils) {
             $total += $DataSet{$foilid};
@@ -316,7 +311,6 @@ sub RR_Tries_Foil_Analysis {
                                                   \@PlotData_Correct,
                                                   \@PlotData_Incorrect);
     }
-    &Apache::lonnet::logthis('plot = '.$html);
     return $html;
 }
 
@@ -339,14 +333,12 @@ sub RR_Time_Concept_Analysis {
 }
 
 
-
 sub get_Radio_problem_data {
     my ($url) = @_;
     my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze'));
     (my $garbage,$Answ)=split('_HASH_REF__',$Answ,2);
     my %Answer = &Apache::lonnet::str2hash($Answ);
     my %Partdata;
-    &Apache::lonnet::logthis('url = '.$url);
     foreach my $part (@{$Answer{'parts'}}) {
         while (my($key,$value) = each(%Answer)) {
 #            if (ref($value) eq 'ARRAY') {
@@ -372,9 +364,6 @@ sub get_Radio_problem_data {
     return %Partdata;
 }
 
-=cut
-
-
 #########################################################
 #########################################################
 ##
@@ -383,7 +372,10 @@ sub get_Radio_problem_data {
 #########################################################
 #########################################################
 sub OptionResponseAnalysis {
-    my ($r,$resource,$respid,$ProblemData,$Students) = @_;
+    my ($r,$problem,$ProblemData,$Students) = @_;
+    my ($resource,$respid) = ($problem->{'resource'},
+                              $problem->{'respid'});
+    # Note: part data is not needed.
     my $PerformanceData = 
         &Apache::loncoursedata::get_response_data
         ($Students,$resource->{'symb'},$respid);
@@ -1517,8 +1509,8 @@ sub ProblemSelector {
                 for (my $i=0;$i<scalar(@{$partdata->{'ResponseTypes'}});$i++){
                     my $respid = $partdata->{'ResponseIds'}->[$i];
                     my $resptype = $partdata->{'ResponseTypes'}->[$i];
-                    if ($resptype eq 'option' ){
-#                    if ($resptype eq 'option' || $resptype eq 'radiobutton') {
+#                    if ($resptype eq 'option' ){
+                    if ($resptype eq 'option' || $resptype eq 'radiobutton') {
                         my $value = &make_target_id({symb=>$res->{'symb'},
                                                      part=>$part,
                                                      respid=>$respid,
@@ -1533,7 +1525,8 @@ sub ProblemSelector {
                         }
                         $seq_str .= '<tr><td>'.
   '<input type="radio" name="problemchoice" value="'.$value.'" '.$checked.'/>'.
-  '</td><td>'.
+  '</td><td>'.          
+#.$resptype.'</td><td>'.
   '<a href="'.$res->{'src'}.'">'.$title.'</a> ';
 #  '<a href="'.$res->{'src'}.'">'.$resptype.' '.$res->{'title'}.'</a> ';
                         if ($partdata->{'option'} > 1) {
@@ -1562,10 +1555,7 @@ sub ProblemSelector {
 #########################################################
 sub get_problem_symb {
     my $problemstring = shift();
-    &Apache::lonnet::logthis('problemstring = '.$problemstring);
     my ($symb,$partid,$respid,$resptype) = split(':',$problemstring);
-    &Apache::lonnet::logthis("\n".
-                             join("   ---   \n",split(':',$problemstring)));
     return ({ symb   => $symb,
               part   => $partid,
               respid => $respid,
@@ -1586,9 +1576,6 @@ sub get_resource_from_symb {
 
 sub get_prev_curr_next {
     my ($target) = @_;
-    while(my($k,$v) = each(%$target)) {
-        &Apache::lonnet::logthis($k.' = '.$v);
-    }
     #
     # Build an array with the data we need to search through
     my @Resource;
@@ -1600,7 +1587,8 @@ sub get_prev_curr_next {
                 for (my $i=0;$i<scalar(@{$partdata->{'ResponseTypes'}});$i++){
                     my $respid = $partdata->{'ResponseIds'}->[$i];
                     my $resptype = $partdata->{'ResponseTypes'}->[$i];
-                    next if ($resptype ne 'option');
+                    next if ($resptype ne 'option' && 
+                             $resptype ne 'radiobutton');
                     push (@Resource,
                             { symb     => $res->{symb},
                               part     => $part,
@@ -1613,16 +1601,11 @@ sub get_prev_curr_next {
         }
     }
     #
-    &Apache::lonnet::logthis('size of @Resource = '.scalar(@Resource));
     #
     # Get the index of the current situation
     my $curr_idx;
     for ($curr_idx=0;$curr_idx<$#Resource;$curr_idx++) {
         my $curr_item = $Resource[$curr_idx];
-        &Apache::lonnet::logthis('-----------------------------------');
-        while(my($k,$v) = each(%$curr_item)) {
-            &Apache::lonnet::logthis($k.' = '.$v);
-        }
         last if ($curr_item->{'symb'} eq $target->{'symb'} &&
                  $curr_item->{'part'} eq $target->{'part'} &&
                  $curr_item->{'respid'} eq $target->{'respid'} &&
@@ -1634,7 +1617,6 @@ sub get_prev_curr_next {
         $curr_item->{'respid'}   ne $target->{'respid'} ||
         $curr_item->{'resptype'} ne $target->{'resptype'}){
         # bogus symb - return nothing
-        &Apache::lonnet::logthis('bailing out');
         return (undef,undef,undef);
     }
     #
@@ -1667,12 +1649,7 @@ sub make_target_id {
 
 sub get_target_from_id {
     my ($id) = @_;
-    &Apache::lonnet::logthis('id = '.$id);
     my ($symb,$part,$respid,$resptype) = split(':',$id);
-    &Apache::lonnet::logthis('get_target_from_id:symb='.$symb);
-    &Apache::lonnet::logthis('get_target_from_id:symb='.$part);
-    &Apache::lonnet::logthis('get_target_from_id:symb='.$respid);
-    &Apache::lonnet::logthis('get_target_from_id:symb='.$resptype);
     return ({ symb    =>&Apache::lonnet::unescape($symb),
              part     =>&Apache::lonnet::unescape($part),
              respid   =>&Apache::lonnet::unescape($respid),