--- loncom/interface/statistics/lonproblemanalysis.pm	2004/01/08 19:20:12	1.53
+++ loncom/interface/statistics/lonproblemanalysis.pm	2004/02/10 19:49:54	1.65
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemanalysis.pm,v 1.53 2004/01/08 19:20:12 matthew Exp $
+# $Id: lonproblemanalysis.pm,v 1.65 2004/02/10 19:49:54 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();
@@ -42,8 +43,13 @@ my $plotcolors = ['#33ff00',
                   '#66ccff', '#ff9999', '#cccc33', '#660000', '#33cc66',
                   ]; 
 
-my @SubmitButtons = ({ name => 'ProblemAnalyis',
+my @SubmitButtons = ({ name => 'PrevProblemAnalysis',
+                       text => 'Previous Problem' },
+                     { name => 'ProblemAnalysis',
                        text => 'Analyze Problem Again' },
+                     { name => 'NextProblemAnalysis',
+                       text => 'Next Problem' },
+                     { name => 'break'},
                      { name => 'ClearCache',
                        text => 'Clear Caches' },
                      { name => 'updatecaches',
@@ -53,22 +59,6 @@ my @SubmitButtons = ({ name => 'ProblemA
                      { 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)=@_;
@@ -86,7 +76,7 @@ sub BuildProblemAnalysisPage {
     #
     &Apache::lonstatistics::PrepareClasslist();
     #
-    $r->print('<h2>'.&mt('Option Response Problem Analysis').'</h2>');
+    $r->print('<h2>'.&mt('Detailed Problem Analysis').'</h2>');
     $r->print(&CreateInterface());
     #
     my @Students = @Apache::lonstatistics::Students;
@@ -112,34 +102,60 @@ sub BuildProblemAnalysisPage {
     if (exists($ENV{'form.problemchoice'}) && 
         ! exists($ENV{'form.SelectAnother'})) {
         foreach my $button (@SubmitButtons) {
-            $r->print('<input type="submit" name="'.$button->{'name'}.'" '.
-                      'value="'.&mt($button->{'text'}).'" />');
-            $r->print('&nbsp;'x5);
+            if ($button->{'name'} eq 'break') {
+                $r->print("<br />\n");
+            } else {
+                $r->print('<input type="submit" name="'.$button->{'name'}.'" '.
+                          'value="'.&mt($button->{'text'}).'" />');
+                $r->print('&nbsp;'x5);
+            }
         }
-        $r->print('<input type="hidden" name="problemchoice" value="'.
-                  $ENV{'form.problemchoice'}.'" />');
         #
         $r->print('<hr />');
-        #
-        my ($symb,$part,$resid,$resptype) = &get_problem_symb(
-                  &Apache::lonnet::unescape($ENV{'form.problemchoice'}));
         $r->rflush();
         #
-        my $resource = &get_resource_from_symb($symb);
-        if (! defined($resource) || ! defined($resptype)) {
+        # Determine which problem we are to analyze
+        my $current_problem = &Apache::lonstathelpers::get_target_from_id
+            ($ENV{'form.problemchoice'});
+        #
+        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)) {
+            $current_problem = $next;
+        } else {
+            $current_problem = $curr;
+        }
+        #
+        # Store the current problem choice and send it out in the form
+        $ENV{'form.problemchoice'} = 
+            &Apache::lonstathelpers::make_target_id($current_problem);
+        $r->print('<input type="hidden" name="problemchoice" value="'.
+                  $ENV{'form.problemchoice'}.'" />');
+        #
+        if (! defined($current_problem->{'resource'})) {
             $r->print('resource is undefined');
         } else {
+            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{$part.'.'.$resid};
-            if ($resptype eq 'option') {
-                &OptionResponseAnalysis($r,$resource,$resid,$ProblemData,
+            my $ProblemData = $Data{$current_problem->{'part'}.
+                                    '.'.
+                                    $current_problem->{'respid'}};
+            if ($current_problem->{'resptype'} eq 'option') {
+                &OptionResponseAnalysis($r,$current_problem,
+                                        $ProblemData,
                                         \@Students);
-            } elsif ($resptype eq 'radiobutton') {
-                &RadioResponseAnalysis($r,$resource,$part,$resid,$ProblemData,
+            } elsif ($current_problem->{'resptype'} eq 'radiobutton') {
+                &RadioResponseAnalysis($r,$current_problem,
+                                       $ProblemData,
                                        \@Students);
             } else {
                 $r->print('<h2>This analysis is not supported</h2>');
@@ -151,13 +167,11 @@ 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)'));
     }
 }
 
-=pod
-
-Removed code:
 
 #########################################################
 #########################################################
@@ -167,7 +181,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
@@ -181,14 +197,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').
@@ -197,7 +213,6 @@ sub RadioResponseAnalysis {
     $r->print($analysis_html);
 }
 
-
 sub RR_Excel_output   { 
     my ($r,$PerformanceData,$ProblemData) = @_;
     return '<h1>No!</h1>';
@@ -209,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').
@@ -218,15 +234,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;
 }
 
@@ -256,8 +272,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};
@@ -285,10 +301,10 @@ sub RR_Tries_Foil_Analysis {
                                                   'Percent Choosing',
                                                   100,
                                                   ['#33ff00','#ff3300'],
+                                                  undef,
                                                   \@PlotData_Correct,
                                                   \@PlotData_Incorrect);
     }
-    &Apache::lonnet::logthis('plot = '.$html);
     return $html;
 }
 
@@ -311,14 +327,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') {
@@ -344,9 +358,6 @@ sub get_Radio_problem_data {
     return %Partdata;
 }
 
-=cut
-
-
 #########################################################
 #########################################################
 ##
@@ -355,10 +366,13 @@ sub get_Radio_problem_data {
 #########################################################
 #########################################################
 sub OptionResponseAnalysis {
-    my ($r,$resource,$resid,$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'},$resid);
+        ($Students,$resource->{'symb'},$respid);
     if (! defined($PerformanceData) || 
         ref($PerformanceData) ne 'ARRAY' ) {
         $r->print('<h2>'.
@@ -367,20 +381,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();
@@ -399,7 +413,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'};
@@ -411,21 +425,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;
     #
@@ -480,10 +494,11 @@ sub Tries_Foil_Analysis {
         }
         my $correctgraph = &Apache::loncommon::DrawBarGraph
             ($title,'Foil Number','Percent Correct',
-             100,$plotcolors,$Datasets[0]);
+             100,$plotcolors,undef,$Datasets[0]);
         $analysis_html.= '<tr><td>'.$correctgraph.'</td>';
         ##
         ##
+        next if (! defined($Datasets[0]));
         for (my $i=0; $i< scalar(@{$Datasets[0]});$i++) {
             $Datasets[0]->[$i]=0;
         }
@@ -498,7 +513,7 @@ sub Tries_Foil_Analysis {
         $title = 'Attempt '.$i.', '.$count;
         my $incorrectgraph = &Apache::loncommon::DrawBarGraph
             ($title,'Foil Number','% Option Chosen Incorrectly',
-             100,$plotcolors,@Datasets);
+             100,$plotcolors,undef,@Datasets);
         $analysis_html.= '<td>'.$incorrectgraph.'</td>';
         $analysis_html.= '<td>'.$foilkey."<td></tr>\n";
     }
@@ -506,7 +521,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";
@@ -565,14 +580,14 @@ sub Tries_Concept_Analysis {
         $title = 'Attempt '.$i.', '.$count;
         my $graphlink = &Apache::loncommon::DrawBarGraph
             ($title,'Concept Number','Percent Correct',
-             100,$plotcolors,$PlotData[$i]->{'_correct'});
+             100,$plotcolors,undef,$PlotData[$i]->{'_correct'});
         $analysis_html.= '<tr><td>'.$graphlink."</td></tr>\n";
     }
     $analysis_html .= "</table>\n";
     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);
@@ -600,7 +615,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')) {
@@ -658,10 +673,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);
         }
     }
@@ -669,7 +684,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);
@@ -730,6 +745,7 @@ sub Foil_Time_Analysis {
                                                        'Percent Correct',
                                                        100,
                                                        $plotcolors,
+                                                       undef,
                                                        $Plotdata[0]);
     for (my $j=0; $j< scalar(@{$Plotdata[0]});$j++) {
         $Plotdata[0]->[$j]=0;
@@ -747,6 +763,7 @@ sub Foil_Time_Analysis {
                                                  'Incorrect Option Choice',
                                                  100,
                                                  $plotcolors,
+                                                 undef,
                                                  @Plotdata);        
     $analysis_html.='<tr>'.
         '<td>'.$correctplot.'</td>'.
@@ -764,7 +781,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;
     ##
@@ -811,6 +828,7 @@ sub Concept_Time_Analysis {
                                                     'Percent Correct',
                                                     100,
                                                     $plotcolors,
+                                                    undef,
                                                     \@Plotdata);
     $analysis_html.='<tr>'.
         '<td>'.$correctplot.'</td>'.
@@ -832,7 +850,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);
@@ -876,16 +894,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') {
@@ -904,7 +922,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;
@@ -973,7 +991,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;
@@ -999,7 +1017,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;
@@ -1249,16 +1267,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}}));
@@ -1291,18 +1317,18 @@ sub build_foil_index {
         if (@Concepts > 1) {
             $table .= '<tr>'.
                 '<td>'.$conceptindex.'</td>'.
-                '<td>'.$concept->{'name'}.'</td>'.
+                '<td>'.&HTML::Entities::encode($concept->{'name'}).'</td>'.
                 '<td>'.$foilindex++.'</td>'.
-                '<td>'.$Foildata{$firstfoil}->{'name'}.'</td>'.
+                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'}).'</td>'.
                 '<td>'.$Foildata{$firstfoil}->{'text'}.'</td>'.
-                '<td>'.$Foildata{$firstfoil}->{'value'}.'</td>'.
+                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'}).'</td>'.
                 "</tr>\n";
         } else {
             $table .= '<tr>'.
                 '<td>'.$foilindex++.'</td>'.
-                '<td>'.$Foildata{$firstfoil}->{'name'}.'</td>'.
+                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'}).'</td>'.
                 '<td>'.$Foildata{$firstfoil}->{'text'}.'</td>'.
-                '<td>'.$Foildata{$firstfoil}->{'value'}.'</td>'.
+                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'}).'</td>'.
                 "</tr>\n";
         }
         foreach my $foilid (@FoilsInConcept) {
@@ -1311,16 +1337,16 @@ sub build_foil_index {
                     '<td></td>'.
                     '<td></td>'.
                     '<td>'.$foilindex.'</td>'.
-                    '<td>'.$Foildata{$foilid}->{'name'}.'</td>'.
+                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'name'}).'</td>'.
                     '<td>'.$Foildata{$foilid}->{'text'}.'</td>'.
-                    '<td>'.$Foildata{$foilid}->{'value'}.'</td>'.
+                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'value'}).'</td>'.
                     "</tr>\n";
             } else {
                 $table .= '<tr>'.
                     '<td>'.$foilindex.'</td>'.
-                    '<td>'.$Foildata{$foilid}->{'name'}.'</td>'.
+                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'name'}).'</td>'.
                     '<td>'.$Foildata{$foilid}->{'text'}.'</td>'.
-                    '<td>'.$Foildata{$foilid}->{'value'}.'</td>'.
+                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'value'}).'</td>'.
                     "</tr>\n";
             }                
         } continue {
@@ -1345,7 +1371,7 @@ sub build_option_index {
               '<tr>'.
               '<td bgcolor="'.$plotcolors->[$optionindex++].'">'.
               ('&nbsp;'x4).'</td>'.
-              '<td>'.$option.'</td>'.
+              '<td>'.&HTML::Entities::encode($option).'</td>'.
               "</tr>\n");
     }
     shift(@Rows); # Throw away 'correct option chosen' color
@@ -1462,95 +1488,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 = 
-                            &Apache::lonnet::escape($res->{'symb'}.':'.$part.
-                                                    ':'.$respid.':'.$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>'.
-  '<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,$resid,$resptype) = 
-        ($problemstring=~ /^(.*):([^:]*):([^:]*):([^:]*)$/);
-    return ($symb,$partid,$resid,$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;
-}
-
-
 #########################################################
 #########################################################
 ##
@@ -1602,6 +1539,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'}++;