--- loncom/interface/statistics/lonproblemanalysis.pm	2004/01/16 20:19:33	1.56
+++ loncom/interface/statistics/lonproblemanalysis.pm	2004/01/20 15:51:06	1.61
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemanalysis.pm,v 1.56 2004/01/16 20:19:33 matthew Exp $
+# $Id: lonproblemanalysis.pm,v 1.61 2004/01/20 15:51:06 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,6 +33,7 @@ use Apache::lonhtmlcommon();
 use Apache::loncoursedata();
 use Apache::lonstatistics;
 use Apache::lonlocal;
+use Apache::lonstathelpers;
 use HTML::Entities();
 use Time::Local();
 use Spreadsheet::WriteExcel();
@@ -58,22 +59,6 @@ my @SubmitButtons = ({ name => 'PrevProb
                      { name => 'ExcelOutput',
                        text => 'Produce Excel Output' });
 
-sub render_resource {
-    my ($resource) = @_;
-    ##
-    ## Render the problem
-    my $base;
-    ($base,undef) = ($resource->{'src'} =~ m|(.*/)[^/]*$|);
-    $base = "http://".$ENV{'SERVER_NAME'}.$base;
-    my $rendered_problem = 
-        &Apache::lonnet::ssi_body($resource->{'src'});
-    $rendered_problem =~ s/<\s*form\s*/<nop /g;
-    $rendered_problem =~ s|(<\s*/form\s*>)|<\/nop>|g;
-    return '<table bgcolor="ffffff"><tr><td>'.
-        '<base href="'.$base.'" />'.
-        $rendered_problem.
-        '</td></tr></table>';
-}
 
 sub BuildProblemAnalysisPage {
     my ($r,$c)=@_;
@@ -130,9 +115,14 @@ sub BuildProblemAnalysisPage {
         $r->rflush();
         #
         # Determine which problem we are to analyze
-        my $current_problem = &get_target_from_id($ENV{'form.problemchoice'});
+        my $current_problem = &Apache::lonstathelpers::get_target_from_id
+            ($ENV{'form.problemchoice'});
         #
-        my ($prev,$curr,$next) = &get_prev_curr_next($current_problem);
+        my ($prev,$curr,$next) = 
+            &Apache::lonstathelpers::get_prev_curr_next($current_problem,
+                                                     '(option|radiobutton)',
+                                                     'response',
+                                                        );
         if (exists($ENV{'form.PrevProblemAnalysis'}) && defined($prev)) {
             $current_problem = $prev;
         } elsif (exists($ENV{'form.NextProblemAnalysis'}) && defined($next)) {
@@ -142,7 +132,8 @@ sub BuildProblemAnalysisPage {
         }
         #
         # Store the current problem choice and send it out in the form
-        $ENV{'form.problemchoice'} = &make_target_id($current_problem);
+        $ENV{'form.problemchoice'} = 
+            &Apache::lonstathelpers::make_target_id($current_problem);
         $r->print('<input type="hidden" name="problemchoice" value="'.
                   $ENV{'form.problemchoice'}.'" />');
         #
@@ -152,7 +143,7 @@ sub BuildProblemAnalysisPage {
             my $resource = $current_problem->{'resource'};
             $r->print('<h1>'.$resource->{'title'}.'</h1>');
             $r->print('<h3>'.$resource->{'src'}.'</h3>');
-            $r->print(&render_resource($resource));
+            $r->print(&Apache::lonstathelpers::render_resource($resource));
             $r->rflush();
             my %Data = &get_problem_data($resource->{'src'});
             my $ProblemData = $Data{$current_problem->{'part'}.
@@ -176,7 +167,8 @@ sub BuildProblemAnalysisPage {
                   &mt('Analyze Problem').'" />');
         $r->print('&nbsp;'x5);
         $r->print('<h3>'.&mt('Please select a problem to analyze').'</h3>');
-        $r->print(&ProblemSelector());
+        $r->print(&Apache::lonstathelpers::ProblemSelector
+                  ('(option|radiobutton)'));
     }
 }
 
@@ -232,7 +224,8 @@ sub RR_Tries_Analysis {
     my $mintries = 1;
     my $maxtries = $ENV{'form.NumPlots'};
     my ($table,$Foils,$Concepts) = &build_foil_index($ProblemData);
-    if ((@$Concepts < 2) && ($ENV{'form.AnalyzeAs'} ne 'Foils')) {
+    if ((! defined($Concepts)) || ((@$Concepts < 2) && 
+                                   ($ENV{'form.AnalyzeAs'} ne 'Foils'))) {
         $table = '<h3>'.
             &mt('Not enough data for concept analysis.  '.
                 'Performing Foil Analysis').
@@ -387,20 +380,20 @@ sub OptionResponseAnalysis {
     }  else {
         $r->rflush();
         if (exists($ENV{'form.ExcelOutput'})) {
-            my $result = &prepare_optionresponse_excel_sheet($r,$resource,
-                                                             $PerformanceData,
-                                                             $ProblemData);
+            my $result = &OR_excel_sheet($r,$resource,
+                                         $PerformanceData,
+                                         $ProblemData);
             $r->print($result);
             $r->rflush();
         } else {
             if ($ENV{'form.AnalyzeOver'} eq 'Tries') {
-                my $analysis_html = &tries_analysis($r,
+                my $analysis_html = &OR_tries_analysis($r,
                                                     $PerformanceData,
                                                     $ProblemData);
                 $r->print($analysis_html);
                 $r->rflush();
             } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') {
-                my $analysis_html = &time_analysis($PerformanceData,
+                my $analysis_html = &OR_time_analysis($PerformanceData,
                                                    $ProblemData);
                 $r->print($analysis_html);
                 $r->rflush();
@@ -419,7 +412,7 @@ sub OptionResponseAnalysis {
 #       Option Response:  Tries Analysis
 #
 #########################################################
-sub tries_analysis {
+sub OR_tries_analysis {
     my ($r,$PerformanceData,$ORdata) = @_;
     my $mintries = 1;
     my $maxtries = $ENV{'form.NumPlots'};
@@ -431,21 +424,21 @@ sub tries_analysis {
             '</h3>'.$table;
         $ENV{'form.AnalyzeAs'} = 'Foils';
     }
-    my %ResponseData = &analyze_option_data_by_tries($r,$PerformanceData,
+    my %ResponseData = &OR_analyze_by_tries($r,$PerformanceData,
                                                      $mintries,$maxtries);
     my $analysis = '';
     if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
-        $analysis = &Tries_Foil_Analysis($mintries,$maxtries,$Foils,
+        $analysis = &OR_Tries_Foil_Analysis($mintries,$maxtries,$Foils,
                                          \%ResponseData,$ORdata);
     } else {
-        $analysis = &Tries_Concept_Analysis($mintries,$maxtries,
+        $analysis = &OR_Tries_Concept_Analysis($mintries,$maxtries,
                                             $Concepts,\%ResponseData,$ORdata);
     }
     $table .= $analysis;
     return $table;
 }
 
-sub Tries_Foil_Analysis {
+sub OR_Tries_Foil_Analysis {
     my ($mintries,$maxtries,$Foils,$respdat,$ORdata) = @_;
     my %ResponseData = %$respdat;
     #
@@ -504,6 +497,7 @@ sub Tries_Foil_Analysis {
         $analysis_html.= '<tr><td>'.$correctgraph.'</td>';
         ##
         ##
+        next if (! defined($Datasets[0]));
         for (my $i=0; $i< scalar(@{$Datasets[0]});$i++) {
             $Datasets[0]->[$i]=0;
         }
@@ -526,7 +520,7 @@ sub Tries_Foil_Analysis {
     return $analysis_html;
 }
 
-sub Tries_Concept_Analysis {
+sub OR_Tries_Concept_Analysis {
     my ($mintries,$maxtries,$Concepts,$respdat,$ORdata) = @_;
     my %ResponseData = %$respdat;
     my $analysis_html = "<table>\n";
@@ -592,7 +586,7 @@ sub Tries_Concept_Analysis {
     return $analysis_html;
 }
 
-sub analyze_option_data_by_tries {
+sub OR_analyze_by_tries {
     my ($r,$PerformanceData,$mintries,$maxtries) = @_;
     my %Trydata;
     $mintries = 1         if (! defined($mintries) || $mintries < 1);
@@ -620,7 +614,7 @@ sub analyze_option_data_by_tries {
 #     Option Response: Time Analysis
 #
 #########################################################
-sub time_analysis {
+sub OR_time_analysis {
     my ($PerformanceData,$ORdata) = @_;
     my ($table,$Foils,$Concepts) = &build_foil_index($ORdata);
     if ((@$Concepts < 2) && ($ENV{'form.AnalyzeAs'} ne 'Foils')) {
@@ -678,10 +672,10 @@ sub time_analysis {
             enddateform   => $enddateform,
         };
         if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
-            $table .= &Foil_Time_Analysis($PerformanceData,$ORdata,$Foils,
+            $table .= &OR_Foil_Time_Analysis($PerformanceData,$ORdata,$Foils,
                                           $interval);
         } else {
-            $table .= &Concept_Time_Analysis($PerformanceData,$ORdata,
+            $table .= &OR_Concept_Time_Analysis($PerformanceData,$ORdata,
                                              $Concepts,$interval);
         }
     }
@@ -689,7 +683,7 @@ sub time_analysis {
     return $table;
 }
 
-sub Foil_Time_Analysis {
+sub OR_Foil_Time_Analysis {
     my ($PerformanceData,$ORdata,$Foils,$interval) = @_;
     my $analysis_html;
     my $foilkey = &build_option_index($ORdata);
@@ -784,7 +778,7 @@ sub Foil_Time_Analysis {
     return $analysis_html;
 }
 
-sub Concept_Time_Analysis {
+sub OR_Concept_Time_Analysis {
     my ($PerformanceData,$ORdata,$Concepts,$interval) = @_;
     my $analysis_html;
     ##
@@ -852,7 +846,7 @@ sub Concept_Time_Analysis {
 ##
 #########################################################
 #########################################################
-sub prepare_optionresponse_excel_sheet {
+sub OR_excel_sheet {
     my ($r,$resource,$PerformanceData,$ORdata) = @_;
     my $response = '';
     my (undef,$Foils,$Concepts) = &build_foil_index($ORdata);
@@ -896,16 +890,16 @@ sub prepare_optionresponse_excel_sheet {
     }
     #
     my $result;
-    $result = &build_problem_data_worksheet($problem_data_sheet,$format,
+    $result = &OR_build_problem_data_worksheet($problem_data_sheet,$format,
                                             $Concepts,$ORdata);
     if ($result ne 'okay') {
         # Do something useful
     }
-    $result = &build_student_data_worksheet($student_data_sheet,$format);
+    $result = &OR_build_student_data_worksheet($student_data_sheet,$format);
     if ($result ne 'okay') {
         # Do something useful
     }
-    $result = &build_response_data_worksheet($response_data_sheet,$format,
+    $result = &OR_build_response_data_worksheet($response_data_sheet,$format,
                                              $PerformanceData,$Foils,
                                              $ORdata);
     if ($result ne 'okay') {
@@ -924,7 +918,7 @@ sub prepare_optionresponse_excel_sheet {
     return $result;
 }
 
-sub build_problem_data_worksheet {
+sub OR_build_problem_data_worksheet {
     my ($worksheet,$format,$Concepts,$ORdata) = @_;
     my $rows_output = 3;
     my $cols_output = 0;
@@ -993,7 +987,7 @@ sub build_problem_data_worksheet {
     return 'okay';
 }
 
-sub build_student_data_worksheet {
+sub OR_build_student_data_worksheet {
     my ($worksheet,$format) = @_;
     my $rows_output = 3;
     my $cols_output = 0;
@@ -1019,7 +1013,7 @@ sub build_student_data_worksheet {
     return;
 }
 
-sub build_response_data_worksheet {
+sub OR_build_response_data_worksheet {
     my ($worksheet,$format,$PerformanceData,$Foils,$ORdata)=@_;
     my $rows_output = 3;
     my $cols_output = 0;
@@ -1269,16 +1263,24 @@ sub build_foil_index {
                        ten   => 10,);
         my $a1 = lc($a); 
         my $b1 = lc($b);
-        if (exists($Numbers{$a})) {
-            $a1 = $Numbers{$a};
+        if (exists($Numbers{$a1})) {
+            $a = $Numbers{$a1};
         }
-        if (exists($Numbers{$b})) {
-            $b1 = $Numbers{$b};
+        if (exists($Numbers{$b1})) {
+            $b = $Numbers{$b1};
+        }
+        if (($a =~/^\d+$/) && ($b =~/^\d+$/)) {
+            return $a <=> $b;
+        } else {
+            return $a cmp $b;
         }
-        $a1 cmp $b1;
     };
     my @Concepts;
     foreach my $concept (sort $sortfunction (keys(%Concepts))) {
+        if (! defined($Concepts{$concept})) {
+            $Concepts{$concept}=[];
+#            next;
+        }
         push(@Concepts,{ name => $concept,
                         foils => [@{$Concepts{$concept}}]});
         push(@Foils,(@{$Concepts{$concept}}));
@@ -1482,180 +1484,6 @@ sub CreateInterface {
     return $Str;
 }
 
-sub ProblemSelector {
-    my $Str;
-    $Str = "\n<table>\n";
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
-        next if ($seq->{'num_assess'}<1);
-        my $seq_str = '';
-        foreach my $res (@{$seq->{'contents'}}) {
-            next if ($res->{'type'} ne 'assessment');
-            foreach my $part (@{$res->{'parts'}}) {
-                my $partdata = $res->{'partdata'}->{$part};
-#                &Apache::lonnet::logthis('----------------');
-#                while (my ($k,$v)=each(%$partdata)) {
-#                    if (ref($v) eq 'ARRAY') {
-#                        &Apache::lonnet::logthis($k.' = '.join(',',@$v));
-#                    } else {
-#                        &Apache::lonnet::logthis($k.' = '.$v);
-#                    }
-#                }
-                if ((! exists($partdata->{'option'}) || 
-                     $partdata->{'option'} == 0      ) &&
-                    (! exists($partdata->{'radiobutton'}) ||
-                     $partdata->{'radiobutton'} == 0)) {
-                    next;
-                }
-                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') {
-                        my $value = &make_target_id({symb=>$res->{'symb'},
-                                                     part=>$part,
-                                                     respid=>$respid,
-                                                     resptype=>$resptype});
-                        my $checked = '';
-                        if ($ENV{'form.problemchoice'} eq $value) {
-                            $checked = 'checked ';
-                        }
-                        my $title = $res->{'title'};
-                        if (! defined($title) || $title eq '') {
-                            ($title) = ($res->{'src'} =~ m:/([^/]*)$:);
-                        }
-                        $seq_str .= '<tr><td>'.
-  '<input type="radio" name="problemchoice" value="'.$value.'" '.$checked.'/>'.
-  '</td><td>'.          
-#.$resptype.'</td><td>'.
-  '<a href="'.$res->{'src'}.'">'.$title.'</a> ';
-#  '<a href="'.$res->{'src'}.'">'.$resptype.' '.$res->{'title'}.'</a> ';
-                        if ($partdata->{'option'} > 1) {
-                            $seq_str .= &mt('response').' '.$respid;
-                        }
-                        $seq_str .= "</td></tr>\n";
-                    }
-                }
-            }
-        }
-        if ($seq_str ne '') {
-            $Str .= '<tr><td>&nbsp</td><td><b>'.$seq->{'title'}.'</b></td>'.
-                "</tr>\n".$seq_str;
-        }
-    }
-    $Str .= "</table>\n";
-    return $Str;
-}
-
-#########################################################
-#########################################################
-##
-##              Misc functions
-##
-#########################################################
-#########################################################
-sub get_problem_symb {
-    my $problemstring = shift();
-    my ($symb,$partid,$respid,$resptype) = split(':',$problemstring);
-    return ({ symb   => $symb,
-              part   => $partid,
-              respid => $respid,
-              type   => $resptype } );
-}
-
-sub get_resource_from_symb {
-    my ($symb) = @_;
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
-        foreach my $res (@{$seq->{'contents'}}) {
-            if ($res->{'symb'} eq $symb) {
-                return $res;
-            }
-        }
-    }
-    return undef;
-}
-
-sub get_prev_curr_next {
-    my ($target) = @_;
-    #
-    # Build an array with the data we need to search through
-    my @Resource;
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
-        foreach my $res (@{$seq->{'contents'}}) {
-            next if ($res->{'type'} ne 'assessment');
-            foreach my $part (@{$res->{'parts'}}) {
-                my $partdata = $res->{'partdata'}->{$part};
-                for (my $i=0;$i<scalar(@{$partdata->{'ResponseTypes'}});$i++){
-                    my $respid = $partdata->{'ResponseIds'}->[$i];
-                    my $resptype = $partdata->{'ResponseTypes'}->[$i];
-                    next if ($resptype ne 'option' && 
-                             $resptype ne 'radiobutton');
-                    push (@Resource,
-                            { symb     => $res->{symb},
-                              part     => $part,
-                              respid   => $partdata->{'ResponseIds'}->[$i],
-                              resource => $res,
-                              resptype => $resptype
-                            } );
-                }
-            }
-        }
-    }
-    #
-    #
-    # 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];
-        last if ($curr_item->{'symb'} eq $target->{'symb'} &&
-                 $curr_item->{'part'} eq $target->{'part'} &&
-                 $curr_item->{'respid'} eq $target->{'respid'} &&
-                 $curr_item->{'resptype'} eq $target->{'resptype'});
-    }
-    my $curr_item = $Resource[$curr_idx];
-    if ($curr_item->{'symb'}     ne $target->{'symb'} ||
-        $curr_item->{'part'}     ne $target->{'part'} ||
-        $curr_item->{'respid'}   ne $target->{'respid'} ||
-        $curr_item->{'resptype'} ne $target->{'resptype'}){
-        # bogus symb - return nothing
-        return (undef,undef,undef);
-    }
-    #
-    # Now just pick up the data we need
-    my ($prev,$curr,$next);
-    if ($curr_idx == 0) {
-        $prev = undef;
-        $curr = $Resource[$curr_idx  ];
-        $next = $Resource[$curr_idx+1];
-    } elsif ($curr_idx == $#Resource) {
-        $prev = $Resource[$curr_idx-1];
-        $curr = $Resource[$curr_idx  ];
-        $next = undef;
-    } else {
-        $prev = $Resource[$curr_idx-1];
-        $curr = $Resource[$curr_idx  ];
-        $next = $Resource[$curr_idx+1];
-    }
-    return ($prev,$curr,$next);
-}
-
-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'});
-    return $id;
-}
-
-sub get_target_from_id {
-    my ($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)});
-}
-
 #########################################################
 #########################################################
 ##
@@ -1707,6 +1535,7 @@ sub Process_OR_Row {
     my @Foilsubs   = split('&',$submission);
     for (my $j=0;$j<=$#Foilgrades;$j++) {
         my ($foilid,$correct)  = split('=',$Foilgrades[$j]);
+        $foilid = &Apache::lonnet::unescape($foilid);
         my (undef,$submission) = split('=',$Foilsubs[$j]);
         if ($correct) {
             $RowData{$foilid}->{'_correct'}++;