--- loncom/interface/statistics/lonproblemanalysis.pm	2003/10/21 16:00:30	1.44
+++ loncom/interface/statistics/lonproblemanalysis.pm	2004/02/02 19:32:11	1.64
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemanalysis.pm,v 1.44 2003/10/21 16:00:30 matthew Exp $
+# $Id: lonproblemanalysis.pm,v 1.64 2004/02/02 19:32:11 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -24,7 +24,6 @@
 #
 # http://www.lon-capa.org/
 #
-
 package Apache::lonproblemanalysis;
 
 use strict;
@@ -34,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();
@@ -43,13 +43,49 @@ my $plotcolors = ['#33ff00',
                   '#66ccff', '#ff9999', '#cccc33', '#660000', '#33cc66',
                   ]; 
 
+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',
+                       text => 'Update Student Data' },
+                     { name => 'SelectAnother',
+                       text => 'Choose a different Problem' },
+                     { name => 'ExcelOutput',
+                       text => 'Produce Excel Output' });
+
+
 sub BuildProblemAnalysisPage {
     my ($r,$c)=@_;
-    $r->print('<h2>'.&mt('Option Response Problem Analysis').'</h2>');
+    #
+    my %Saveable_Parameters = ('Status' => 'scalar',
+                               'Section' => 'array',
+                               'NumPlots' => 'scalar',
+                               'AnalyzeAs' => 'scalar',
+                               'AnalyzeOver' => 'scalar',
+                               );
+    &Apache::loncommon::store_course_settings('problem_analysis',
+                                              \%Saveable_Parameters);
+    &Apache::loncommon::restore_course_settings('problem_analysis',
+                                                \%Saveable_Parameters);
+    #
+    &Apache::lonstatistics::PrepareClasslist();
+    #
+    $r->print('<h2>'.&mt('Detailed Problem Analysis').'</h2>');
     $r->print(&CreateInterface());
     #
     my @Students = @Apache::lonstatistics::Students;
     #
+    if (@Students < 1) {
+        $r->print('<h2>There are no students in the sections selected</h2>');
+    }
+    #
+    &Apache::loncoursedata::clear_internal_caches();
     if (exists($ENV{'form.ClearCache'}) || 
         exists($ENV{'form.updatecaches'}) ||
         (exists($ENV{'form.firstanalysis'}) &&
@@ -62,94 +98,68 @@ sub BuildProblemAnalysisPage {
         $r->print('<input type="hidden" name="firstanalysis" value="no" />');
     }
     $r->rflush();
+    #
     if (exists($ENV{'form.problemchoice'}) && 
         ! exists($ENV{'form.SelectAnother'})) {
-        $r->print('<input type="submit" name="ProblemAnalysis" value="'.
-                  &mt('Analyze Problem Again').'" />');
-        $r->print('&nbsp;'x5);
-        $r->print('<input type="submit" name="ClearCache" value="'.
-                  &mt('Clear Caches').'" />');
-        $r->print('&nbsp;'x5);
-        $r->print('<input type="submit" name="updatecaches" value="'.
-                  &mt('Update Student Data').'" />');
-        $r->print('&nbsp;'x5);
-        $r->print('<input type="hidden" name="problemchoice" value="'.
-                  $ENV{'form.problemchoice'}.'" />');
-        $r->print('<input type="submit" name="SelectAnother" value="'.
-                  &mt('Choose a different resource').'" />');
-        $r->print('&nbsp;'x5);
-        $r->print('<input type="submit" name="ExcelOutput" value="'.
-                  &mt('Produce Excel Data Sheet').'" />');
-        $r->print('&nbsp;'x5);
+        foreach my $button (@SubmitButtons) {
+            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('<hr />');
-        #
-        my ($symb,$part,$resid) = &get_problem_symb(
-                     &Apache::lonnet::unescape($ENV{'form.problemchoice'})
-                                           );
         $r->rflush();
         #
-        my $resource = &get_resource_from_symb($symb);
-        if (defined($resource)) {
+        # 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(&Apache::lonstathelpers::render_resource($resource));
             $r->rflush();
             my %Data = &get_problem_data($resource->{'src'});
-            my $PerformanceData = 
-                &Apache::loncoursedata::get_optionresponse_data
-                                           (\@Students,$symb,$resid);
-            my $ORdata = $Data{$part.'.'.$resid};
-            if (exists($ENV{'form.ExcelOutput'}) && 
-                defined($PerformanceData)) {
-                my $result = &prepare_excel_sheet($r,$resource,
-                                                  $PerformanceData,$ORdata);
-                $r->print($result);
-                $r->rflush();
-            }
-            ##
-            ## 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;
-            $r->print('<table bgcolor="ffffff"><tr><td>'.
-                      '<base href="'.$base.'" />'.
-                      $rendered_problem.
-                      '</td></tr></table>');
-            $r->rflush();
-            if (! exists($ENV{'form.ExcelOutput'})) {
-                ##
-                ## Analyze the problem
-                if (defined($PerformanceData) && 
-                    ref($PerformanceData) eq 'ARRAY') {
-                    if ($ENV{'form.AnalyzeOver'} eq 'Tries') {
-                        my $analysis_html = &tries_analysis($r,
-                                                            $PerformanceData,
-                                                            $ORdata);
-                        $r->print($analysis_html);
-                        $r->rflush();
-                    } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') {
-                        my $analysis_html = &time_analysis($PerformanceData,
-                                                           $ORdata);
-                        $r->print($analysis_html);
-                        $r->rflush();
-                    } else {
-                        $r->print('<h2>'.
-                                  &mt('The analysis you have selected is '.
-                                      'not supported at this time').
-                                  '</h2>');
-                    }
-                } else {
-                    $r->print('<h2>'.
-                         &mt('There is no student data for this problem.').
-                              '</h2>');
-                }
+            my $ProblemData = $Data{$current_problem->{'part'}.
+                                    '.'.
+                                    $current_problem->{'respid'}};
+            if ($current_problem->{'resptype'} eq 'option') {
+                &OptionResponseAnalysis($r,$current_problem,
+                                        $ProblemData,
+                                        \@Students);
+            } elsif ($current_problem->{'resptype'} eq 'radiobutton') {
+                &RadioResponseAnalysis($r,$current_problem,
+                                       $ProblemData,
+                                       \@Students);
+            } else {
+                $r->print('<h2>This analysis is not supported</h2>');
             }
-        } else {
-            $r->print('resource is undefined');
         }
         $r->print('<hr />');
     } else {
@@ -157,156 +167,253 @@ sub BuildProblemAnalysisPage {
                   &mt('Analyze Problem').'" />');
         $r->print('&nbsp;'x5);
         $r->print('<h3>'.&mt('Please select a problem to analyze').'</h3>');
-        $r->print(&OptionResponseProblemSelector());
+        $r->print(&Apache::lonstathelpers::ProblemSelector
+                  ('(option|radiobutton)'));
     }
 }
 
+
 #########################################################
 #########################################################
 ##
-##      Misc interface routines use by analysis code
+##      Radio Response Routines
 ##
 #########################################################
 #########################################################
-sub build_foil_index {
-    my ($ORdata) = @_;
-    return if (! exists($ORdata->{'Foils'}));
-    my %Foildata = %{$ORdata->{'Foils'}};
-    my @Foils = sort(keys(%Foildata));
-    my %Concepts;
-    foreach my $foilid (@Foils) {
-        push(@{$Concepts{$Foildata{$foilid}->{'Concept'}}},
-             $foilid);
+sub RadioResponseAnalysis {
+    my ($r,$problem,$ProblemData,$Students) = @_;
+    my ($resource,$respid) = ($problem->{'resource'},
+                                    $problem->{'respid'});
+    my $analysis_html;
+    my $PerformanceData = 
+        &Apache::loncoursedata::get_response_data
+        ($Students,$resource->{'symb'},$respid);
+    if (! defined($PerformanceData) || 
+        ref($PerformanceData) ne 'ARRAY' ) {
+        $analysis_html = '<h2>'.
+            &mt('There is no submission data for this resource').
+            '</h2>';
+        $r->print($analysis_html);
+        return;
+    }
+    if (exists($ENV{'form.ExcelOutput'})) {
+        $analysis_html .= &RR_Excel_output($r,$problem->{'resource'},
+                                           $PerformanceData,$ProblemData);
+    } elsif ($ENV{'form.AnalyzeOver'} eq 'Tries') {
+        $analysis_html .= &RR_Tries_Analysis($r,$problem->{'resource'},
+                                             $PerformanceData,$ProblemData);
+    } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') {
+        $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').
+           '</h2>';
     }
-    undef(@Foils);
-    # Having gathered the concept information in a hash, we now translate it
-    # into an array because we need to be consistent about order.
-    # Also put the foils in order, too.
-    my $sortfunction = sub {
-        my %Numbers = (one   => 1,
-                       two   => 2,
-                       three => 3,
-                       four  => 4,
-                       five  => 5,
-                       six   => 6,
-                       seven => 7,
-                       eight => 8,
-                       nine  => 9,
-                       ten   => 10,);
-        my $a1 = lc($a); 
-        my $b1 = lc($b);
-        if (exists($Numbers{$a})) {
-            $a1 = $Numbers{$a};
-        }
-        if (exists($Numbers{$b})) {
-            $b1 = $Numbers{$b};
-        }
-        $a1 cmp $b1;
-    };
-    my @Concepts;
-    foreach my $concept (sort $sortfunction (keys(%Concepts))) {
-        push(@Concepts,{ name => $concept,
-                        foils => [@{$Concepts{$concept}}]});
-        push(@Foils,(@{$Concepts{$concept}}));
+    $r->print($analysis_html);
+}
+
+sub RR_Excel_output   { 
+    my ($r,$PerformanceData,$ProblemData) = @_;
+    return '<h1>No!</h1>';
+}
+
+sub RR_Tries_Analysis { 
+    my ($r,$resource,$PerformanceData,$ProblemData) = @_;
+    my $analysis_html;
+    my $mintries = 1;
+    my $maxtries = $ENV{'form.NumPlots'};
+    my ($table,$Foils,$Concepts) = &build_foil_index($ProblemData);
+    if ((! defined($Concepts)) || ((@$Concepts < 2) && 
+                                   ($ENV{'form.AnalyzeAs'} ne 'Foils'))) {
+        $table = '<h3>'.
+            &mt('Not enough data for concept analysis.  '.
+                'Performing Foil Analysis').
+            '</h3>'.$table;
+        $ENV{'form.AnalyzeAs'} = 'Foils';
     }
+    $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,
+                                                 \@TryData,$ProblemData);
+#    } else {
+#        $analysis_html = &RR_Tries_Concept_Analysis($mintries,$maxtries,
+#                                                    $Concepts,
+#                                                    \@TryData,
+#                                                    $ProblemData);
+#    }
+    return $analysis_html;
+}
+
+sub RR_tries_data_analysis {
+    my ($r,$Attempt_data) = @_;
+    my @TryData;
+    foreach my $attempt (@$Attempt_data) {
+        my %Attempt = &hashify_attempt($attempt);
+        my ($answer,undef) = split('=',$Attempt{'submission'});
+        $TryData[$Attempt{'tries'}]->{$answer}++;
+    }
+    return @TryData;
+}
+
+sub RR_Time_Analysis  { 
+    my ($r,$PerformanceData,$ProblemData) = @_;
+    my $html;
+    return $html;
+}
+
+sub RR_Tries_Foil_Analysis {
+    my ($min,$max,$Foils,$TryData,$ProblemData) = @_;
+    my $html;
     #
-    # Build up the table of row labels.
-    my $table = '<table border="1" >'."\n";
-    if (@Concepts > 1) {
-        $table .= '<tr>'.
-            '<th>'.&mt('Concept Number').'</th>'.
-            '<th>'.&mt('Concept').'</th>'.
-            '<th>'.&mt('Foil Number').'</th>'.
-            '<th>'.&mt('Foil Name').'</th>'.
-            '<th>'.&mt('Foil Text').'</th>'.
-            '<th>'.&mt('Correct Value').'</th>'.
-            "</tr>\n";
-    } else {
-        $table .= '<tr>'.
-            '<th>'.&mt('Foil Number').'</th>'.
-            '<th>'.&mt('Foil Name').'</th>'.
-            '<th>'.&mt('Foil Text').'</th>'.
-            '<th>'.&mt('Correct Value').'</th>'.
-            "</tr>\n";
-    }        
-    my $conceptindex = 1;
-    my $foilindex = 1;
-    foreach my $concept (@Concepts) {
-        my @FoilsInConcept = @{$concept->{'foils'}};
-        my $firstfoil = shift(@FoilsInConcept);
-        if (@Concepts > 1) {
-            $table .= '<tr>'.
-                '<td>'.$conceptindex.'</td>'.
-                '<td>'.$concept->{'name'}.'</td>'.
-                '<td>'.$foilindex++.'</td>'.
-                '<td>'.$Foildata{$firstfoil}->{'name'}.'</td>'.
-                '<td>'.$Foildata{$firstfoil}->{'text'}.'</td>'.
-                '<td>'.$Foildata{$firstfoil}->{'value'}.'</td>'.
-                "</tr>\n";
-        } else {
-            $table .= '<tr>'.
-                '<td>'.$foilindex++.'</td>'.
-                '<td>'.$Foildata{$firstfoil}->{'name'}.'</td>'.
-                '<td>'.$Foildata{$firstfoil}->{'text'}.'</td>'.
-                '<td>'.$Foildata{$firstfoil}->{'value'}.'</td>'.
-                "</tr>\n";
+    # Compute the data neccessary to make the plots
+    for (my $try=$min;$try<=$max;$try++) {
+        my @PlotData_Correct; 
+        my @PlotData_Incorrect;
+        next if ($try > scalar(@{$TryData}));
+        next if (! defined($TryData->[$try]));
+        my %DataSet = %{$TryData->[$try]};
+        my $total = 0;
+        foreach my $foilid (@$Foils) {
+            $total += $DataSet{$foilid};
         }
-        foreach my $foilid (@FoilsInConcept) {
-            if (@Concepts > 1) {
-                $table .= '<tr>'.
-                    '<td></td>'.
-                    '<td></td>'.
-                    '<td>'.$foilindex.'</td>'.
-                    '<td>'.$Foildata{$foilid}->{'name'}.'</td>'.
-                    '<td>'.$Foildata{$foilid}->{'text'}.'</td>'.
-                    '<td>'.$Foildata{$foilid}->{'value'}.'</td>'.
-                    "</tr>\n";
+        foreach my $foilid (@$Foils) {
+            if ($total == 0) {
+                push (@PlotData_Correct,0);
+                push (@PlotData_Incorrect,0);
             } else {
-                $table .= '<tr>'.
-                    '<td>'.$foilindex.'</td>'.
-                    '<td>'.$Foildata{$foilid}->{'name'}.'</td>'.
-                    '<td>'.$Foildata{$foilid}->{'text'}.'</td>'.
-                    '<td>'.$Foildata{$foilid}->{'value'}.'</td>'.
-                    "</tr>\n";
-            }                
-        } continue {
-            $foilindex++;
+                if ($ProblemData->{'_Foils'}->{$foilid}->{'value'} eq 'true') {
+                    push (@PlotData_Correct,
+                          int(100*$DataSet{$foilid}/$total));
+                    push (@PlotData_Incorrect,0);
+                } else {
+                    push (@PlotData_Correct,0);
+                    push (@PlotData_Incorrect,
+                          int(100*$DataSet{$foilid}/$total));
+                }
+            }
         }
-    } continue {
-        $conceptindex++;
+        my $title='Attempt '.$try;
+        my $xlabel = $total.' Submissions';
+        $html.=  &Apache::loncommon::DrawBarGraph($title,
+                                                  $xlabel,
+                                                  'Percent Choosing',
+                                                  100,
+                                                  ['#33ff00','#ff3300'],
+                                                  undef,
+                                                  \@PlotData_Correct,
+                                                  \@PlotData_Incorrect);
     }
-    $table .= "</table>\n";
-    #
-    # Build option index with color stuff
-    return ($table,\@Foils,\@Concepts);
+    return $html;
 }
 
-sub build_option_index {
-    my ($ORdata)= @_;
-    my $table = "<table>\n";
-    my $optionindex = 0;
-    my @Rows;
-    foreach my $option (&mt('correct option chosen'),@{$ORdata->{'Options'}}) {
-        push (@Rows,
-              '<tr>'.
-              '<td bgcolor="'.$plotcolors->[$optionindex++].'">'.
-              ('&nbsp;'x4).'</td>'.
-              '<td>'.$option.'</td>'.
-              "</tr>\n");
+sub RR_Tries_Concept_Analysis {
+    my ($min,$max,$Concepts,$ResponseData,$ProblemData) = @_;
+    my $html;
+    return $html;
+}
+
+sub RR_Time_Foil_Analysis {
+    my ($min,$max,$Foils,$ResponseData,$ProblemData) = @_;
+    my $html;
+    return $html;
+}
+
+sub RR_Time_Concept_Analysis {
+    my ($min,$max,$Concepts,$ResponseData,$ProblemData) = @_;
+    my $html;
+    return $html;
+}
+
+
+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;
+    foreach my $part (@{$Answer{'parts'}}) {
+        while (my($key,$value) = each(%Answer)) {
+#            if (ref($value) eq 'ARRAY') {
+#                &Apache::lonnet::logthis('is ref part:'.$part.' '.$key.'='.join(',',@$value));
+#            } else {
+#                &Apache::lonnet::logthis('notref part:'.$part.' '.$key.'='.$value);
+#            }                
+            next if ($key !~ /^$part/);
+            $key =~ s/^$part\.//;
+            if ($key eq 'foils') {
+                $Partdata{$part}->{'_Foils'}=$value;
+            } elsif ($key eq 'options') {
+                $Partdata{$part}->{'_Options'}=$value;
+            } elsif ($key eq 'shown') {
+                $Partdata{$part}->{'_Shown'}=$value;
+            } elsif ($key =~ /^foil.value.(.*)$/) {
+                $Partdata{$part}->{$1}->{'value'}=$value;
+            } elsif ($key =~ /^foil.text.(.*)$/) {
+                $Partdata{$part}->{$1}->{'text'}=$value;
+            }
+        }
     }
-    shift(@Rows); # Throw away 'correct option chosen' color
-    $table .= join('',reverse(@Rows));
-    $table .= "</table>\n";
+    return %Partdata;
 }
 
 #########################################################
 #########################################################
 ##
-##         Tries Analysis
+##      Option Response Routines
 ##
 #########################################################
 #########################################################
-sub tries_analysis {
+sub OptionResponseAnalysis {
+    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);
+    if (! defined($PerformanceData) || 
+        ref($PerformanceData) ne 'ARRAY' ) {
+        $r->print('<h2>'.
+                  &mt('There is no student data for this problem.').
+                  '</h2>');
+    }  else {
+        $r->rflush();
+        if (exists($ENV{'form.ExcelOutput'})) {
+            my $result = &OR_excel_sheet($r,$resource,
+                                         $PerformanceData,
+                                         $ProblemData);
+            $r->print($result);
+            $r->rflush();
+        } else {
+            if ($ENV{'form.AnalyzeOver'} eq 'Tries') {
+                my $analysis_html = &OR_tries_analysis($r,
+                                                    $PerformanceData,
+                                                    $ProblemData);
+                $r->print($analysis_html);
+                $r->rflush();
+            } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') {
+                my $analysis_html = &OR_time_analysis($PerformanceData,
+                                                   $ProblemData);
+                $r->print($analysis_html);
+                $r->rflush();
+            } else {
+                $r->print('<h2>'.
+                          &mt('The analysis you have selected is '.
+                              'not supported at this time').
+                          '</h2>');
+            }
+        }
+    }
+}
+
+#########################################################
+#
+#       Option Response:  Tries Analysis
+#
+#########################################################
+sub OR_tries_analysis {
     my ($r,$PerformanceData,$ORdata) = @_;
     my $mintries = 1;
     my $maxtries = $ENV{'form.NumPlots'};
@@ -318,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;
     #
@@ -347,7 +454,7 @@ sub Tries_Foil_Analysis {
                      100*$ResponseData{$foilid}->[$i]->{'_correct'}/
                      $ResponseData{$foilid}->[$i]->{'_total'});
             }
-            foreach my $option (@{$ORdata->{'Options'}}) {
+            foreach my $option (@{$ORdata->{'_Options'}}) {
                 push(@{$PlotData[$i]->{'_total'}},
                      $ResponseData{$foilid}->[$i]->{'_total'});
                 if ($ResponseData{$foilid}->[$i]->{'_total'} == 0) {
@@ -381,16 +488,17 @@ sub Tries_Foil_Analysis {
         }
         my $title = 'Attempt '.$i.', '.$count;
         my @Datasets;
-        foreach my $option ('_correct',@{$ORdata->{'Options'}}) {
+        foreach my $option ('_correct',@{$ORdata->{'_Options'}}) {
             next if (! exists($PlotData[$i]->{$option}));
             push(@Datasets,$PlotData[$i]->{$option});
         }
-        my $correctgraph = &Apache::loncommon::DrawGraph
+        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;
         }
@@ -403,9 +511,9 @@ sub Tries_Foil_Analysis {
             $count = $count.' submissions';
         }
         $title = 'Attempt '.$i.', '.$count;
-        my $incorrectgraph = &Apache::loncommon::DrawGraph
+        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";
     }
@@ -413,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";
@@ -470,16 +578,16 @@ sub Tries_Concept_Analysis {
             $count = $count.' submissions';
         }
         $title = 'Attempt '.$i.', '.$count;
-        my $graphlink = &Apache::loncommon::DrawGraph
+        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);
@@ -487,7 +595,7 @@ sub analyze_option_data_by_tries {
     foreach my $row (@$PerformanceData) {
         next if (! defined($row));
         my $tries = &get_tries_from_row($row);
-        my %Row   = &Process_Row($row);
+        my %Row   = &Process_OR_Row($row);
         next if (! %Row);
         while (my ($foilid,$href) = each(%Row)) {
             if (! ref($href)) { 
@@ -503,13 +611,11 @@ sub analyze_option_data_by_tries {
 }
 
 #########################################################
+#
+#     Option Response: Time Analysis
+#
 #########################################################
-##
-##                 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')) {
@@ -551,7 +657,8 @@ sub time_analysis {
         my $end_index;
         my $j;
         while (++$j < scalar(@$PerformanceData)) {
-            last if (&get_time_from_row($PerformanceData->[$j]) > $starttime);
+            last if (&get_time_from_row($PerformanceData->[$j]) 
+                                                              > $starttime);
         }
         $begin_index = $j;
         while (++$j < scalar(@$PerformanceData)) {
@@ -566,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);
         }
     }
@@ -577,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);
@@ -589,7 +696,7 @@ sub Foil_Time_Analysis {
     for (my $j=$begin_index;$j<=$end_index;$j++) {
         my $row = $PerformanceData->[$j];
         next if (! defined($row));
-        my %Row = &Process_Row($row);
+        my %Row = &Process_OR_Row($row);
         while (my ($foilid,$href) = each(%Row)) {
             if (! ref($href)) {
                 $TimeData{$foilid} += $href;
@@ -611,7 +718,7 @@ sub Foil_Time_Analysis {
         }
         my $total_incorrect = $total - $TimeData{$foil}->{'_correct'};
         my $optionidx = 1;
-        foreach my $option (@{$ORdata->{'Options'}}) {
+        foreach my $option (@{$ORdata->{'_Options'}}) {
             if ($total_incorrect == 0) {
                 push(@{$Plotdata[$optionidx]},0);
             } else {
@@ -633,12 +740,13 @@ sub Foil_Time_Analysis {
     } else {
         $title = $count.' submissions';
     }
-    my $correctplot = &Apache::loncommon::DrawGraph($title,
-                                                    'Foil Number',
-                                                    'Percent Correct',
-                                                    100,
-                                                    $plotcolors,
-                                                    $Plotdata[0]);
+    my $correctplot = &Apache::loncommon::DrawBarGraph($title,
+                                                       'Foil Number',
+                                                       'Percent Correct',
+                                                       100,
+                                                       $plotcolors,
+                                                       undef,
+                                                       $Plotdata[0]);
     for (my $j=0; $j< scalar(@{$Plotdata[0]});$j++) {
         $Plotdata[0]->[$j]=0;
     }
@@ -650,11 +758,12 @@ sub Foil_Time_Analysis {
     } else {
         $title = $count.' submissions';
     }
-    my $incorrectplot = &Apache::loncommon::DrawGraph($title,
+    my $incorrectplot = &Apache::loncommon::DrawBarGraph($title,
                                                  'Foil Number',
                                                  'Incorrect Option Choice',
                                                  100,
                                                  $plotcolors,
+                                                 undef,
                                                  @Plotdata);        
     $analysis_html.='<tr>'.
         '<td>'.$correctplot.'</td>'.
@@ -672,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;
     ##
@@ -685,7 +794,7 @@ sub Concept_Time_Analysis {
     for (my $j=$begin_index;$j<=$end_index;$j++) {
         my $row = $PerformanceData->[$j];
         next if (! defined($row));
-        my %Row = &Process_Row($row);
+        my %Row = &Process_OR_Row($row);
         while (my ($foilid,$href) = each(%Row)) {
             if (! ref($href)) {
                 $TimeData{$foilid} += $href;
@@ -714,11 +823,12 @@ sub Concept_Time_Analysis {
     #
     # Create the plot
     my $title = ($end_index - $begin_index).' submissions';
-    my $correctplot = &Apache::loncommon::DrawGraph($title,
+    my $correctplot = &Apache::loncommon::DrawBarGraph($title,
                                                     'Concept Number',
                                                     'Percent Correct',
                                                     100,
                                                     $plotcolors,
+                                                    undef,
                                                     \@Plotdata);
     $analysis_html.='<tr>'.
         '<td>'.$correctplot.'</td>'.
@@ -740,7 +850,7 @@ sub Concept_Time_Analysis {
 ##
 #########################################################
 #########################################################
-sub prepare_excel_sheet {
+sub OR_excel_sheet {
     my ($r,$resource,$PerformanceData,$ORdata) = @_;
     my $response = '';
     my (undef,$Foils,$Concepts) = &build_foil_index($ORdata);
@@ -784,16 +894,16 @@ sub prepare_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') {
@@ -812,7 +922,7 @@ sub prepare_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;
@@ -827,7 +937,7 @@ sub build_problem_data_worksheet {
         @Headers = ('Foil Number','FoilName','Foil Text','Correct value');
     }
     $worksheet->write_row($rows_output++,0,\@Headers,$format->{'header'});
-    my %Foildata = %{$ORdata->{'Foils'}};
+    my %Foildata = %{$ORdata->{'_Foils'}};
     my $conceptindex = 1;
     my $foilindex = 1;
     foreach my $concept (@$Concepts) {
@@ -875,13 +985,13 @@ sub build_problem_data_worksheet {
     ##
     ## Option data output
     $worksheet->write($rows_output++,0,'Options',$format->{'header'});
-    foreach my $string (@{$ORdata->{'Options'}}) {
+    foreach my $string (@{$ORdata->{'_Options'}}) {
         $worksheet->write($rows_output++,0,$string);
     }
     return 'okay';
 }
 
-sub build_student_data_worksheet {
+sub OR_build_student_data_worksheet {
     my ($worksheet,$format) = @_;
     my $rows_output = 3;
     my $cols_output = 0;
@@ -907,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;
@@ -1130,10 +1240,149 @@ sub _adjustment {
         return $adjust;
 }
 
+sub build_foil_index {
+    my ($ORdata) = @_;
+    return if (! exists($ORdata->{'_Foils'}));
+    my %Foildata = %{$ORdata->{'_Foils'}};
+    my @Foils = sort(keys(%Foildata));
+    my %Concepts;
+    foreach my $foilid (@Foils) {
+        push(@{$Concepts{$Foildata{$foilid}->{'_Concept'}}},
+             $foilid);
+    }
+    undef(@Foils);
+    # Having gathered the concept information in a hash, we now translate it
+    # into an array because we need to be consistent about order.
+    # Also put the foils in order, too.
+    my $sortfunction = sub {
+        my %Numbers = (one   => 1,
+                       two   => 2,
+                       three => 3,
+                       four  => 4,
+                       five  => 5,
+                       six   => 6,
+                       seven => 7,
+                       eight => 8,
+                       nine  => 9,
+                       ten   => 10,);
+        my $a1 = lc($a); 
+        my $b1 = lc($b);
+        if (exists($Numbers{$a1})) {
+            $a = $Numbers{$a1};
+        }
+        if (exists($Numbers{$b1})) {
+            $b = $Numbers{$b1};
+        }
+        if (($a =~/^\d+$/) && ($b =~/^\d+$/)) {
+            return $a <=> $b;
+        } else {
+            return $a cmp $b;
+        }
+    };
+    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}}));
+    }
+    #
+    # Build up the table of row labels.
+    my $table = '<table border="1" >'."\n";
+    if (@Concepts > 1) {
+        $table .= '<tr>'.
+            '<th>'.&mt('Concept Number').'</th>'.
+            '<th>'.&mt('Concept').'</th>'.
+            '<th>'.&mt('Foil Number').'</th>'.
+            '<th>'.&mt('Foil Name').'</th>'.
+            '<th>'.&mt('Foil Text').'</th>'.
+            '<th>'.&mt('Correct Value').'</th>'.
+            "</tr>\n";
+    } else {
+        $table .= '<tr>'.
+            '<th>'.&mt('Foil Number').'</th>'.
+            '<th>'.&mt('Foil Name').'</th>'.
+            '<th>'.&mt('Foil Text').'</th>'.
+            '<th>'.&mt('Correct Value').'</th>'.
+            "</tr>\n";
+    }        
+    my $conceptindex = 1;
+    my $foilindex = 1;
+    foreach my $concept (@Concepts) {
+        my @FoilsInConcept = @{$concept->{'foils'}};
+        my $firstfoil = shift(@FoilsInConcept);
+        if (@Concepts > 1) {
+            $table .= '<tr>'.
+                '<td>'.$conceptindex.'</td>'.
+                '<td>'.&HTML::Entities::encode($concept->{'name'}).'</td>'.
+                '<td>'.$foilindex++.'</td>'.
+                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'}).'</td>'.
+                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'text'}).'</td>'.
+                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'}).'</td>'.
+                "</tr>\n";
+        } else {
+            $table .= '<tr>'.
+                '<td>'.$foilindex++.'</td>'.
+                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'}).'</td>'.
+                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'text'}).'</td>'.
+                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'}).'</td>'.
+                "</tr>\n";
+        }
+        foreach my $foilid (@FoilsInConcept) {
+            if (@Concepts > 1) {
+                $table .= '<tr>'.
+                    '<td></td>'.
+                    '<td></td>'.
+                    '<td>'.$foilindex.'</td>'.
+                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'name'}).'</td>'.
+                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'text'}).'</td>'.
+                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'value'}).'</td>'.
+                    "</tr>\n";
+            } else {
+                $table .= '<tr>'.
+                    '<td>'.$foilindex.'</td>'.
+                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'name'}).'</td>'.
+                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'text'}).'</td>'.
+                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'value'}).'</td>'.
+                    "</tr>\n";
+            }                
+        } continue {
+            $foilindex++;
+        }
+    } continue {
+        $conceptindex++;
+    }
+    $table .= "</table>\n";
+    #
+    # Build option index with color stuff
+    return ($table,\@Foils,\@Concepts);
+}
+
+sub build_option_index {
+    my ($ORdata)= @_;
+    my $table = "<table>\n";
+    my $optionindex = 0;
+    my @Rows;
+    foreach my $option (&mt('correct option chosen'),@{$ORdata->{'_Options'}}) {
+        push (@Rows,
+              '<tr>'.
+              '<td bgcolor="'.$plotcolors->[$optionindex++].'">'.
+              ('&nbsp;'x4).'</td>'.
+              '<td>'.&HTML::Entities::encode($option).'</td>'.
+              "</tr>\n");
+    }
+    shift(@Rows); # Throw away 'correct option chosen' color
+    $table .= join('',reverse(@Rows));
+    $table .= "</table>\n";
+}
+
 #########################################################
 #########################################################
 ##
-##             Interface 
+##   Generic Interface Routines
 ##
 #########################################################
 #########################################################
@@ -1180,6 +1429,8 @@ sub CreateInterface {
     { # These braces are here to organize the code, not scope it.
         {
             $Str .= '<nobr>'.&mt('Analyze Over ');
+            $Str .= &Apache::loncommon::help_open_topic
+                                                  ('Analysis_Analyze_Over');
             $Str .='<select name="AnalyzeOver" >';
             $Str .= '<option value="Tries" ';
             if (! exists($ENV{'form.AnalyzeOver'}) || 
@@ -1191,10 +1442,13 @@ sub CreateInterface {
             $Str .= '<option value="Time" ';
             $Str .= ' selected ' if ($ENV{'form.AnalyzeOver'} eq 'Time');
             $Str .= '>'.&mt('Time').'</option>';
-            $Str .= '</select></nobr><br />';
+            $Str .= '</select>';
+            $Str .= '</nobr><br />';
         }
         {
             $Str .= '<nobr>'.&mt('Analyze as ');
+            $Str .= &Apache::loncommon::help_open_topic
+                                                  ('Analysis_Analyze_as');
             $Str .='<select name="AnalyzeAs" >';
             $Str .= '<option value="Concepts" ';
             if (! exists($ENV{'form.AnalyzeAs'}) || 
@@ -1210,6 +1464,8 @@ sub CreateInterface {
         }
         {
             $Str .= '<br /><nobr>'.&mt('Number of Plots:');
+            $Str .= &Apache::loncommon::help_open_topic
+                                                  ('Analysis_num_plots');
             $Str .= '<select name="NumPlots">';
             if (! exists($ENV{'form.NumPlots'}) 
                 || $ENV{'form.NumPlots'} < 1 
@@ -1232,79 +1488,17 @@ sub CreateInterface {
     return $Str;
 }
 
-sub OptionResponseProblemSelector {
-    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};
-                if (! exists($partdata->{'option'}) || 
-                    $partdata->{'option'} == 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') {
-                        my $value = &Apache::lonnet::escape($res->{'symb'}.':'.$part.':'.$respid);
-                        my $checked = '';
-                        if ($ENV{'form.problemchoice'} eq $value) {
-                            $checked = 'checked ';
-                        }
-                        $seq_str .= '<tr><td>'.
-  '<input type="radio" name="problemchoice" value="'.$value.'" '.$checked.'/>'.
-  '</td><td>'.
-  '<a href="'.$res->{'src'}.'">'.$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
+##              Misc Option Response functions
 ##
 #########################################################
 #########################################################
-sub get_problem_symb {
-    my $problemstring = shift();
-    my ($symb,$partid,$resid) = ($problemstring=~ /^(.*):([^:]*):([^:]*)$/);
-    return ($symb,$partid,$resid);
-}
-
-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_time_from_row {
     my ($row) = @_;
     if (ref($row)) {
-        return $row->[3];
+        return $row->[&Apache::loncoursedata::RD_timestamp()];
     } 
     return undef;
 }
@@ -1312,15 +1506,30 @@ sub get_time_from_row {
 sub get_tries_from_row {
     my ($row) = @_;
     if (ref($row)) {
-        return $row->[5];
+        return $row->[&Apache::loncoursedata::RD_tries()];
     }
     return undef;
 }
 
-sub Process_Row {
+sub hashify_attempt {
+    my ($row) = @_;
+    my %attempt;
+    $attempt{'tries'}      = $row->[&Apache::loncoursedata::RD_tries()];
+    $attempt{'submission'} = $row->[&Apache::loncoursedata::RD_submission()];
+    $attempt{'award'}      = $row->[&Apache::loncoursedata::RD_awarddetail()];
+    $attempt{'timestamp'}  = $row->[&Apache::loncoursedata::RD_timestamp()];
+    return %attempt;
+}
+
+sub Process_OR_Row {
     my ($row) = @_;
     my %RowData;
-    my ($student_id,$award,$grading,$submission,$time,$tries) = @$row;
+    my $student_id = $row->[&Apache::loncoursedata::RD_student_id()];
+    my $award      = $row->[&Apache::loncoursedata::RD_awarddetail()];
+    my $grading    = $row->[&Apache::loncoursedata::RD_response_eval()];
+    my $submission = $row->[&Apache::loncoursedata::RD_submission()];
+    my $time       = $row->[&Apache::loncoursedata::RD_timestamp()];
+    my $tries      = $row->[&Apache::loncoursedata::RD_tries()];
     return undef if ($award eq 'MISSING_ANSWER');
     if ($award =~ /(APPROX_ANS|EXACT_ANS)/) {
         $RowData{'_correct'} = 1;
@@ -1330,6 +1539,7 @@ sub Process_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'}++;
@@ -1360,25 +1570,25 @@ sub get_problem_data {
             $key =~ s/^$part\.//;
             if (ref($value) eq 'ARRAY') {
                 if ($key eq 'options') {
-                    $Partdata{$part}->{'Options'}=$value;
+                    $Partdata{$part}->{'_Options'}=$value;
                 } elsif ($key eq 'concepts') {
-                    $Partdata{$part}->{'Concepts'}=$value;
+                    $Partdata{$part}->{'_Concepts'}=$value;
                 } elsif ($key =~ /^concept\.(.*)$/) {
                     my $concept = $1;
                     foreach my $foil (@$value) {
-                        $Partdata{$part}->{'Foils'}->{$foil}->{'Concept'}=
+                        $Partdata{$part}->{'_Foils'}->{$foil}->{'_Concept'}=
                                                                       $concept;
                     }
                 }
             } else {
                 if ($key=~ /^foil\.text\.(.*)$/) {
                     my $foil = $1;
-                    $Partdata{$part}->{'Foils'}->{$foil}->{'name'}=$foil;
+                    $Partdata{$part}->{'_Foils'}->{$foil}->{'name'}=$foil;
                     $value =~ s/(\s*$|^\s*)//g;
-                    $Partdata{$part}->{'Foils'}->{$foil}->{'text'}=$value;
+                    $Partdata{$part}->{'_Foils'}->{$foil}->{'text'}=$value;
                 } elsif ($key =~ /^foil\.value\.(.*)$/) {
                     my $foil = $1;
-                    $Partdata{$part}->{'Foils'}->{$foil}->{'value'}=$value;
+                    $Partdata{$part}->{'_Foils'}->{$foil}->{'value'}=$value;
                 }
             }
         }
@@ -1389,3 +1599,11 @@ sub get_problem_data {
 1;
 
 __END__
+
+#####
+# partdata{part}->{_Foils}->{foilid}->{'name'}     = $
+#                                   ->{'text'}     = $
+#                                   ->{'value'}    = $
+#                                   ->{'_Concept'} = $
+# partdata{part}->{_Options}  = @
+# partdata{part}->{_Concepts} = @