--- loncom/interface/statistics/lonproblemanalysis.pm	2003/10/15 21:30:51	1.39
+++ loncom/interface/statistics/lonproblemanalysis.pm	2004/10/29 16:10:30	1.99
@@ -1,7 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-
-# $Id: lonproblemanalysis.pm,v 1.39 2003/10/15 21:30:51 matthew Exp $
+# $Id: lonproblemanalysis.pm,v 1.99 2004/10/29 16:10:30 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,7 +24,6 @@
 #
 # http://www.lon-capa.org/
 #
-
 package Apache::lonproblemanalysis;
 
 use strict;
@@ -35,101 +33,139 @@ use Apache::lonhtmlcommon();
 use Apache::loncoursedata();
 use Apache::lonstatistics;
 use Apache::lonlocal;
+use Apache::lonstathelpers();
+use Apache::lonstudentsubmissions();
 use HTML::Entities();
+use Time::Local();
+use Spreadsheet::WriteExcel();
+
+my $plotcolors = ['#33ff00', 
+                  '#0033cc', '#990000', '#aaaa66', '#663399', '#ff9933',
+                  '#66ccff', '#ff9999', '#cccc33', '#660000', '#33cc66',
+                  ]; 
 
-my $plotcolors = [qw/
-                  #33ff00 
-                  #0033cc #990000 #aaaa66 #663399 #ff9933
-                  #66ccff #ff9999 #cccc33 #660000 #33cc66
-                  /]; 
-               #[qw/lgreen dgreen dred/];
+my @SubmitButtons = ({ name => 'PrevProblemAnalysis',
+                       text => 'Previous Problem' },
+                     { name => 'ProblemAnalysis',
+                       text => 'Analyze Problem Again' },
+                     { name => 'NextProblemAnalysis',
+                       text => 'Next Problem' },
+                     { name => 'break'},
+                     { 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',
+                               '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(&CreateInterface());
     #
     my @Students = @Apache::lonstatistics::Students;
     #
-    if (exists($ENV{'form.updatecaches'}) ||
-        (exists($ENV{'form.firstanalysis'}) &&
-         $ENV{'form.firstanalysis'} ne 'no')) {
-        &Apache::lonstatistics::Gather_Full_Student_Data($r);
-    }
-    if (! exists($ENV{'form.firstanalysis'})) {
-        $r->print('<input type="hidden" name="firstanalysis" value="yes" />');
-    } else {
-        $r->print('<input type="hidden" name="firstanalysis" value="no" />');
+    if (@Students < 1 && exists($ENV{'form.firstrun'})) {
+        $r->print('<h2>There are no students in the sections selected</h2>');
     }
+    #
+    my @CacheButtonHTML = 
+        &Apache::lonstathelpers::manage_caches($r,'Statistics','stats_status');
     $r->rflush();
+    #
+    # Support for numerical and radio response isn't complete enough to
+    # include in 1.2 release.
+    # my $problem_types = '(option|radiobutton|numerical)';
+    my $problem_types = '.';#(option)';
     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);
+        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);
+            }
+        }
+        foreach my $html (@CacheButtonHTML) {
+            $r->print($html.('&nbsp;'x5));
+        }
         #
         $r->print('<hr />');
+        $r->rflush();
         #
-        my ($symb,$part,$resid) = &get_problem_symb(
-                     &Apache::lonnet::unescape($ENV{'form.problemchoice'})
-                                           );
-        #
-        my $resource = &get_resource_from_symb($symb);
-        if (defined($resource)) {
-            my %Data = &get_problem_data($resource->{'src'});
-            my $ORdata = $Data{$part.'.'.$resid};
-            ##
-            ## 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>');
-            ##
-            ## Analyze the problem
-            my $PerformanceData = 
-                &Apache::loncoursedata::get_optionresponse_data
-                                           (\@Students,$symb,$resid);
-            if (defined($PerformanceData) && 
-                ref($PerformanceData) eq 'ARRAY') {
-                if ($ENV{'form.AnalyzeOver'} eq 'Tries') {
-                    my $analysis_html = &tries_analysis($PerformanceData,
-                                                         $ORdata);
-                    $r->print($analysis_html);
-                } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') {
-                    my $analysis_html = &time_analysis($PerformanceData,
-                                                         $ORdata);
-                $r->print($analysis_html);
-                } else {
-                    $r->print('<h2>'.
-                              &mt('The analysis you have selected is '.
-                                         'not supported at this time').
-                              '</h2>');
+        # 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,
+                                                        $problem_types,
+                                                        '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>');
+            if ($ENV{'form.show_prob'} eq 'true') {
+                $r->print(&Apache::lonstathelpers::render_resource($resource));
+            }
+            $r->rflush();
+            my %Data = &Apache::lonstathelpers::get_problem_data
+                ($resource->{'src'});
+            my $problem_data = $Data{$current_problem->{'part'}.
+                                    '.'.
+                                    $current_problem->{'respid'}};
+            if ($current_problem->{'resptype'} eq 'option') {
+                &OptionResponseAnalysis($r,$current_problem,
+                                        $problem_data,
+                                        \@Students);
+            } elsif ($current_problem->{'resptype'} eq 'radiobutton') {
+                &radio_response_analysis($r,$current_problem,
+                                         $problem_data,
+                                         \@Students);
+            } elsif ($current_problem->{'resptype'} eq 'numerical') {
+                ## 
+                ## analyze all responses of a problem at once
+                my $res = $current_problem->{'resource'};
+                foreach my $partid (@{$res->{'parts'}}) {
+                    $current_problem->{'part'} = $partid;
+                    foreach my $respid (@{$res->{'partdata'}->{$partid}->{'ResponseIds'}}) {
+                        $current_problem->{'respid'}=$respid;
+                        &NumericalResponseAnalysis($r,$current_problem,
+                                                   $problem_data,\@Students);
+                    }
                 }
             } else {
-                $r->print('<h2>'.
-                          &mt('There is no student data for this problem.').
-                          '</h2>');
+                $r->print('<h2>This analysis is not supported</h2>');
             }
-        } else {
-            $r->print('resource is undefined');
         }
         $r->print('<hr />');
     } else {
@@ -137,25 +173,1277 @@ 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
+                  ($problem_types));
+    }
+}
+
+
+#########################################################
+#########################################################
+##
+##      Numerical Response Routines
+##
+#########################################################
+#########################################################
+sub NumericalResponseAnalysis {
+    my ($r,$problem,$problem_data,$Students) = @_;
+    my $c = $r->connection();
+    my ($resource,$partid,$respid) = ($problem->{'resource'},
+                                      $problem->{'part'},
+                                      $problem->{'respid'});
+    #
+    if (scalar(@{$resource->{'parts'}})>1) {
+        if (@{$resource->{'partdata'}->{$partid}->{'ResponseIds'}}>1) {
+            $r->print('<h3>'.
+                      &mt('Part [_1], response [_2].',$partid,$respid).
+                      '</h3>');
+        } else { 
+            $r->print('<h3>'.
+                      &mt('Part [_1]',$partid,$respid).
+                      '</h3>');
+        }
+    } elsif (@{$resource->{'partdata'}->{$partid}->{'ResponseIds'}}>1) {
+        $r->print('<h3>'.&mt('Response [_1]',$respid).'</h3>');
+    }
+    #
+    my $analysis_html;
+    my $PerformanceData = &Apache::loncoursedata::get_response_data
+        (\@Apache::lonstatistics::SelectedSections,
+         $Apache::lonstatistics::enrollment_status,
+         $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;
+    }
+    #
+    # This next call causes all the waiting around that people complain about
+    &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$Students,
+                                               'Statistics',
+                                               'stats_status');
+    return if ($c->aborted());
+    #
+    # Collate the data
+    my %Data;
+    foreach my $student (@$Students) {
+        my $answer = $student->{'answer'};
+        $Data{$answer}++;
+    }
+    my @Labels = sort {$a <=> $b } keys(%Data);
+    my @PlotData = @Data{@Labels};
+    #
+    my $width  = 500; 
+    my $height = 100;
+    my $plot = &one_dimensional_plot($r,500,100,scalar(@$Students),
+                                     \@Labels,\@PlotData);
+    $r->print($plot);
+    return;
+}
+
+sub one_dimensional_plot {
+    my ($r,$width,$height,$N,$Labels,$Data)=@_;
+    #
+    # Compute data -> image scaling factors
+    my $min = $Labels->[0];
+    my $max = $Labels->[-1];
+    if ($max == $min) {
+        $max =$min+1;
+    }
+    my $h_scale = ($width-10)/($max-$min);
+    #
+    my $max_y = 0;
+    foreach (@$Data) {
+        $max_y = $_ if ($max_y < $_);
+    }
+    my $ticscale = 5;
+    if ($max_y * $ticscale > $height/2) {
+        $ticscale = int($height/2/$max_y);
+        $ticscale = 1 if ($ticscale < 1);
+    }
+    #
+    # Create the plot
+    my $plot = 
+        qq{<drawimage width="$width" height="$height" bgcolor="transparent" >};
+    for (my $idx=0;$idx<scalar(@$Labels);$idx++) {
+        my $xloc = 5+$h_scale*($Labels->[$idx] - $min);
+        my $top    = $height/2-$Data->[$idx]*$ticscale;
+        my $bottom = $height/2+$Data->[$idx]*$ticscale;
+        $plot .= 
+            &line($xloc,$top,$xloc,$bottom,'888888',1);
+    }
+    #
+    # Put the scale on last to ensure it is on top of the data.
+    if ($min < 0 && $max > 0) {
+        my $circle_x = 5+$h_scale*abs($min);  # '0' in data coordinates
+        my $r = 4;
+        $plot .= &line(5,$height/2,$circle_x-$r,$height/2,'000000',1);
+        $plot .= &circle($circle_x,$height/2,$r+1,'000000');
+        $plot .= &line($circle_x+$r,$height/2,$width-5,$height/2,'000000',1);
+    } else {
+        $plot .= &line(5,$height/2,$width-5,$height/2,'000000',1);
+    }
+    $plot .= '</drawimage>';
+    my $plotresult =  &Apache::lonxml::xmlparse($r,'web',$plot);
+    
+    my $title = 'Distribution of correct answers';
+    my $result = '<table>'.
+        '<tr><td colspan="3" align="center">'.
+        '<font size="+2">'.$title.' (N='.$N.')'.
+        '</font>'.
+        '</td></tr>'.
+        '<tr>'.
+        '<td valign="center">'.$min.'</td>'.
+        '<td>'.$plotresult.'</td>'.
+        '<td valign="center">'.$max.'</td>'.
+        '</tr>'.
+        '<tr><td colspan="3" align="center">'.
+        'Maximum Number of Coinciding Values: '.$max_y.
+        '</td></tr>'.
+        '</table>';
+    return $result;
+}
+
+##
+## Helper subroutines for <drawimage>.  
+## These should probably go somewhere more suitable soon.
+sub line {
+    my ($x1,$y1,$x2,$y2,$color,$thickness) = @_;
+    return qq{<line x1="$x1" y1="$y1" x2="$x2" y2="$y2" color="$color" thickness="$thickness" />$/};
+}
+
+sub text {
+    my ($x,$y,$color,$text,$font,$direction) = @_;
+    if (! defined($font) || $font !~ /^(tiny|small|medium|large|giant)$/) {
+        $font = 'medium';
+    }
+    if (! defined($direction) || $direction ne 'vertical') {
+        $direction = '';
+    }
+    return qq{<text x="$x" y="$y" color="$color" font="$font" direction="$direction" >$text</text>};
+}
+
+sub rectangle {
+    my ($x1,$y1,$x2,$y2,$color,$thickness,$filled) = @_;
+    return qq{<rectangle x1="$x1" y1="$y1" x2="$x2" y2="$y2" color="$color" thickness="$thickness" filled="$filled" />};
+}
+
+sub arc {
+    my ($x,$y,$width,$height,$start,$end,$color,$thickness,$filled)=@_;
+    return qq{<arc x="$x" y="$y" width="$width" height="$height" start="$start" end="$end" color="$color" thickness="$thickness" filled="$filled" />};
+}
+
+sub circle {
+    my ($x,$y,$radius,$color,$thickness,$filled)=@_;
+    return &arc($x,$y,$radius,$radius,0,360,$color,$thickness,$filled);
+}
+
+sub build_student_data_worksheet {
+    my ($workbook,$format) = @_;
+    my $rows_output = 3;
+    my $cols_output = 0;
+    my $worksheet  = $workbook->addworksheet('Student Data');
+    $worksheet->write($rows_output++,0,'Student Data',$format->{'h3'});
+    my @Headers = ('full name','username','domain','section',
+                   "student\nnumber",'identifier');
+    $worksheet->write_row($rows_output++,0,\@Headers,$format->{'header'});
+    my @Students = @Apache::lonstatistics::Students;
+    my $studentrows = &Apache::loncoursedata::get_student_data(\@Students);
+    my %ids;
+    foreach my $row (@$studentrows) {
+        my ($mysqlid,$student) = @$row;
+        $ids{$student}=$mysqlid;
+    }
+    foreach my $student (@Students) {
+        my $name_domain = $student->{'username'}.':'.$student->{'domain'};
+        $worksheet->write_row($rows_output++,0,
+                          [$student->{'fullname'},
+                           $student->{'username'},$student->{'domain'},
+                           $student->{'section'},$student->{'id'},
+                           $ids{$name_domain}]);
+    }
+    return $worksheet;
+}
+
+#########################################################
+#########################################################
+##
+##      Radio Response Routines
+##
+#########################################################
+#########################################################
+sub radio_response_analysis {
+    my ($r,$problem,$problem_analysis,$students) = @_;
+    #
+    if ($ENV{'form.AnalyzeOver'} !~ /^(tries|time)$/) {
+        $r->print('Bad request');
+    }
+    #
+    my ($resource,$partid,$respid) = ($problem->{'resource'},
+                                      $problem->{'part'},
+                                      $problem->{'respid'});
+    #
+    my $analysis_html;
+    my $foildata = $problem_analysis->{'_Foils'};
+    my ($table,$foils,$concepts) = &build_foil_index($problem_analysis);
+    #
+    my %true_foils;
+    my $num_true = 0;
+    if (! $problem_analysis->{'answercomputed'}) {
+        foreach my $foil (@$foils) {
+            if ($foildata->{$foil}->{'value'} eq 'true') {
+                $true_foils{$foil}++; 
+            }
+        }
+        $num_true = scalar(keys(%true_foils));
+    }
+    #
+    $analysis_html .= $table;
+    # Gather student data
+    my $response_data = &Apache::loncoursedata::get_response_data
+        (\@Apache::lonstatistics::SelectedSections,
+         $Apache::lonstatistics::enrollment_status,
+         $resource->{'symb'},$respid);
+    my $correct;   # either a hash reference or a scalar
+    if ($problem_analysis->{'answercomputed'} || scalar(@$concepts) > 1) {
+        # This takes a while for large classes...
+        &Apache::lonstathelpers::GetStudentAnswers($r,$problem,$students,
+                                                   'Statistics',
+                                                   'stats_status');
+        foreach my $student (@$students) {
+            my ($idx,@remainder) = split('&',$student->{'answer'});
+            my ($answer) = ($remainder[$idx]=~/^(.*)=([^=]*)$/);
+            $correct->{$student->{'username'}.':'.$student->{'domain'}}=
+                &Apache::lonnet::unescape($answer);
+        }
+    } else {
+        foreach my $foil (keys(%$foildata)) {
+            if ($foildata->{$foil}->{'value'} eq 'true') {
+                $correct = $foildata->{$foil}->{'name'};
+            }
+        }
+    }
+    #
+    if (! defined($response_data) || ref($response_data) ne 'ARRAY' ) {
+        $analysis_html = '<h2>'.
+            &mt('There is no submission data for this resource').
+            '</h2>';
+        $r->print($analysis_html);
+        return;
+    }
+    #
+    $analysis_html.='<table>';
+    for (my $plot_num = 1;$plot_num<=$ENV{'form.NumPlots'};$plot_num++) {
+        # classify data ->correct foil -> selected foil
+        my ($restriction_function,
+            $correct_foil_title,$incorrect_foil_title,
+            $pre_graph_text,$post_graph_text,
+            $no_data_text,@extra_data);
+        if ($ENV{'form.AnalyzeOver'} eq 'tries') {
+            $restriction_function = sub {($_[0]->{'tries'} == $plot_num?1:0)};
+            $correct_foil_title = 'Attempt '.$plot_num;
+            $incorrect_foil_title = 'Attempt '.$plot_num;
+            $pre_graph_text = 
+                'Attempt [_1], [_2] submissions, [_3] correct, [_4] incorrect';
+            $post_graph_text = '';
+            $no_data_text = 'No data exists for attempt [_1]';
+        } elsif ($ENV{'form.AnalyzeOver'} eq 'time') {
+            my $starttime = &Apache::lonhtmlcommon::get_date_from_form
+                ('startdate_'.$plot_num);
+            my $endtime = &Apache::lonhtmlcommon::get_date_from_form
+                ('enddate_'.$plot_num);
+            ($starttime,$endtime) = &ensure_start_end_times
+                ($starttime,$endtime,
+                 &get_time_from_row($response_data->[0]),
+                 &get_time_from_row($response_data->[-1]),
+                 $plot_num);
+            $pre_graph_text = 
+                'Data from [_5] to [_6], [_2] submissions, [_3] correct, [_4] incorrect';
+            $extra_data[0] = &Apache::lonlocal::locallocaltime($starttime);
+            $extra_data[1] = &Apache::lonlocal::locallocaltime($endtime);
+            #
+            $post_graph_text = 
+                &mt('Start time: [_1]',
+                    &Apache::lonhtmlcommon::date_setter
+                    ('Statistics','startdate_'.$plot_num,$starttime)).
+                '<br />'.
+                &mt('End time: [_1]',
+                    &Apache::lonhtmlcommon::date_setter
+                    ('Statistics','enddate_'.$plot_num,$endtime));
+            $restriction_function = 
+                sub { 
+                    my $t = $_[0]->{'timestamp'};
+                    if ($t >= $starttime && $t < $endtime) {
+                        return 1;
+                    } else { 
+                        return 0;
+                    }
+                };
+            $no_data_text = 'No data for [_5] to [_6]';
+        }
+        my $foil_choice_data =
+            &RR_classify_response_data($response_data,$correct,
+                                       $restriction_function);
+        # &Apache::lonstathelpers::log_hash_ref($foil_choice_data);
+        my $answers;
+        if (ref($correct)) {
+            my %tmp;
+            foreach my $foil (values(%$correct)) {
+                $tmp{$foil}++;
+            }
+            $answers = [keys(%tmp)];
+        } else {
+            $answers = [$correct];
+        }
+        # Concept Plot
+        my $concept_plot = '';
+        if (scalar(@$concepts) > 1) {
+            $concept_plot = &RR_concept_plot($concepts,$foil_choice_data,
+                                             'Correct Concepts');
+        }
+        # % Choosing plot
+        my $choice_plot = &RR_create_percent_selected_plot
+            ($concepts,$foils,$foil_choice_data,$correct_foil_title);
+        # for each correct foil, how did they mark it? (stacked bar graph)
+        my ($stacked_plot,$count_by_foil);
+        if ($problem_analysis->{'answercomputed'} || $num_true > 1) {
+            ($stacked_plot,$count_by_foil) =
+                &RR_create_stacked_selection_plot($foils,$foil_choice_data,
+                                                  $incorrect_foil_title,
+                                                  \%true_foils);
+        }
+        #
+        if ($concept_plot ne '' ||
+            $choice_plot  ne '' ||
+            $stacked_plot ne '') {
+            my $correct = $foil_choice_data->{'_correct'};
+            if (! defined($correct) || $correct eq '') {
+                $correct = 0;
+            }
+            my $incorrect = 
+            $analysis_html.= '<tr><td colspan="4" align="center">'.
+                '<font size="+1">'.
+                &mt($pre_graph_text,
+                    $plot_num,$foil_choice_data->{'_count'},
+                    $correct,                    
+                    $foil_choice_data->{'_count'}-$correct,
+                    @extra_data).
+                    '</td></tr>'.$/;
+            $analysis_html.=
+                '<tr>'.
+                '<td>'.$concept_plot.'</td>'.
+                '<td>'.$choice_plot.'</td>';
+            if ($stacked_plot ne '') {
+                $analysis_html .= 
+                    '<td>'.$stacked_plot.'</td>'.
+                    '<td>'.&build_foil_key($foils,$count_by_foil).'</td>';
+            } else {
+                $analysis_html .= ('<td></td>'x2);
+            }
+            $analysis_html.='</tr>'.$/;
+            if (defined($post_graph_text)) {
+                $analysis_html.= '<tr><td colspan="4" align="center">'.
+                    $post_graph_text.'</td></tr>'.$/;
+            }
+        } elsif ($no_data_text ne '') {
+            $analysis_html.='<tr><td colspan="4" align="center">'.
+                &mt($no_data_text,
+                    $plot_num,$foil_choice_data->{'_count'},
+                    $correct,                    
+                    $foil_choice_data->{'_count'}-$correct,
+                    @extra_data);
+            if (defined($post_graph_text)) {
+                $analysis_html.='<br />'.$post_graph_text;
+            }
+            $analysis_html.='</td></tr>'.$/;
+        }
+    } # end of loop for plots
+    $analysis_html.='</table>';
+    $r->print($analysis_html);
+}
+
+sub ensure_start_end_times {
+    my ($start,$end,$first,$last,$plot_num) = @_;
+    if (! defined($start) || ! defined($end)) {
+        my $sec_in_day = 86400;
+        my ($sday,$smon,$syear) = 
+            (localtime($last - $sec_in_day*($plot_num-1)))[3..5];
+        $start = &Time::Local::timelocal(0,0,0,$sday,$smon,$syear);
+        $end   = $start + $sec_in_day;
+        if ($plot_num == $ENV{'form.NumPlots'}) {
+            $start = $first;
+        }
+    }
+    return ($start,$end);
+}
+
+sub RR_concept_plot {
+    my ($concepts,$foil_data,$title) = @_;
+    #
+    my %correct_by_concept;
+    my %incorrect_by_concept;
+    my %true;
+    foreach my $concept (@$concepts) {
+        foreach my $foil (@{$concept->{'foils'}}) {
+            next if (! exists($foil_data->{$foil}));
+            foreach my $choice (keys(%{$foil_data->{$foil}})) {
+                if ($choice eq $foil) {
+                    $correct_by_concept{$concept->{'name'}} +=
+                        $foil_data->{$foil}->{$choice};
+                } else {
+                    $incorrect_by_concept{$concept->{'name'}} +=
+                        $foil_data->{$foil}->{$choice};
+                    
+                }
+            }
+        }
+    }
+    # 
+    # need arrays for incorrect and correct because we want to use different
+    # colors for them
+    my @correct;
+    #
+    my $total =0;
+    for (my $i=0;$i<scalar(@$concepts);$i++) {
+        my $concept = $concepts->[$i];
+        $correct[$i]   =   $correct_by_concept{$concept->{'name'}};
+        $total += $correct_by_concept{$concept->{'name'}}+
+            $incorrect_by_concept{$concept->{'name'}};
+    }
+    if ($total == 0) { return ''; };
+    for (my $i=0;$i<=$#correct;$i++) { 
+        $correct[$i] = sprintf('%0f',$correct[$i]/$total*100);
+    }
+    my $xlabel = 'concept';
+    my $plot=  &Apache::loncommon::DrawBarGraph($title,
+                                                $xlabel,
+                                                'Percent Choosing',
+                                                100,
+                                                ['#33ff00','#ff3300'],
+                                                undef,
+                                                \@correct);
+    return $plot;
+}
+
+sub RR_create_percent_selected_plot {
+    my ($concepts,$foils,$foil_data,$title) = @_;
+    #
+    if ($foil_data->{'_count'} == 0) { return ''; };
+    my %correct_selections;
+    my %incorrect_selections;
+    foreach my $foil (@$foils) {
+        # foil_data has format $foil_data->{true_foil}->{selected foil}
+        next if (! exists($foil_data->{$foil}));
+        while (my ($f,$count)= each(%{$foil_data->{$foil}})) {
+            if ($f eq $foil) {
+                $correct_selections{$foil} += $count;
+            } else {
+                $incorrect_selections{$foil} += $count;
+            }
+        }
+    }
+    # 
+    # need arrays for incorrect and correct because we want to use different
+    # colors for them
+    my @correct;
+    my @incorrect;
+    #
+    my $total = $foil_data->{'_count'};
+    for (my $i=0;$i<scalar(@$foils);$i++) {
+        my $foil = $foils->[$i];
+        $correct[$i]   = $correct_selections{$foil};
+        $incorrect[$i] = $incorrect_selections{$foil};
+    }
+    for (my $i=0;$i<=$#correct;$i++) { 
+        &Apache::lonnet::logthis('correct['.$i.']='.$correct[$i]);
+        $correct[$i] = sprintf('%2f',$correct[$i]/$total*100);
+    }
+    for (my $i=0;$i<=$#incorrect;$i++) {
+        $incorrect[$i] = sprintf('%2f',$incorrect[$i]/$total*100);
+    }
+    #
+    # Put a blank in the data sets between concepts, if there are concepts
+    my @labels;
+    if (defined($concepts) && scalar(@$concepts) > 1) {
+        my @new_correct;
+        my @new_incorrect;
+        my $foil_count = 0;
+        foreach my $concept (@$concepts) {
+            foreach (@{$concept->{'foils'}}) {
+                push(@new_correct,  $correct[$foil_count]);
+                push(@new_incorrect,$incorrect[$foil_count]);
+                push(@labels,++$foil_count);
+            }
+            push(@new_correct,'');
+            push(@new_incorrect,'');
+            push(@labels,'');
+        }
+        @correct = @new_correct;
+        @incorrect = @new_incorrect;
+    } else {
+        @labels = (1 .. scalar(@correct));
+    }
+    #
+    my $xlabel = 'foil chosen';
+    my $plot=  &Apache::loncommon::DrawBarGraph($title,
+                                                $xlabel,
+                                                'Percent Choosing',
+                                                100,
+                                                ['#33ff00','#ff3300'],
+                                                \@labels,
+                                                \@correct,
+                                                \@incorrect);
+    return $plot;
+}
+
+sub RR_create_stacked_selection_plot {
+    my ($foils,$foil_data,$title,$true_foils)=@_;
+    #
+    my @dataset; # array of array refs - multicolor rows $datasets[row]->[col]
+    my @labels;
+    my $count;
+    my %column; # maps foil name to column in @datasets
+    for (my $i=0;$i<scalar(@$foils);$i++) {
+        my $foil = $foils->[$i];
+        if (defined($true_foils) && scalar(keys(%$true_foils)) > 0 ) {
+            next if (! $true_foils->{$foil} );
+            push(@labels,$i+1);
+        } else {
+            next if (! exists($foil_data->{$foil}));
+            push(@labels,$i+1);
+        }
+        next if (! exists($foil_data->{$foils->[$i]}));
+        $column{$foil}= $count++;
+        for (my $j=0;$j<scalar(@$foils);$j++) {
+            my $value = 0;
+            if ($i != $j ) {
+                $value += $foil_data->{$foil}->{$foils->[$j]};
+            }
+            $dataset[$j]->[$column{$foil}]=$value;
+        }
+    }
+    #
+    return '' if (! scalar(keys(%column)));
+    #
+    my $grand_total = 0;
+    my %count_per_foil;
+    while (my ($foil,$bar) = each (%column)) {
+        my $bar_total = 0;
+        for (my $j=0;$j<scalar(@dataset);$j++) {
+            $bar_total += $dataset[$j]->[$bar];
+        }
+        next if ($bar_total == 0);
+        for (my $j=0;$j<scalar(@dataset);$j++) {
+            $dataset[$j]->[$bar] = 
+                sprintf('%2f',$dataset[$j]->[$bar]/$bar_total * 100);
+        }
+        $count_per_foil{$foil}=' ( '.$bar_total.' )';
+        $grand_total += $bar_total;
+    }
+    if ($grand_total == 0) {
+        return ('',undef);
+    }
+    my @empty_row = ();
+    foreach (@{$dataset[0]}) {
+        push(@empty_row,0);
+    }
+    #
+    my $graph = &Apache::loncommon::DrawBarGraph
+        ($title,'Correct Foil','foils chosen Incorrectly',
+         100,$plotcolors,\@labels,\@empty_row,@dataset);
+    return ($graph,\%count_per_foil);
+}
+
+# if $correct is a hash ref, it is assumed to be indexed by student names.
+#    the values are assumed to be hash refs with a key of 'answer'.
+sub RR_classify_response_data {
+    my ($full_row_data,$correct,$function) = @_;
+    my %submission_data;
+    foreach my $row (@$full_row_data) {
+        my %subm = &hashify_attempt($row);
+        if (ref($correct) eq 'HASH') {
+            $subm{'correct'} = $correct->{$subm{'student'}};
+        } else {
+            $subm{'correct'} = $correct;
+        }
+        $subm{'submission'} =~ s/=\d+\s*$//;
+        if (&$function(\%subm)) {
+            $submission_data{'_count'}++;
+            if (&submission_is_correct($subm{'award'})) { 
+                $submission_data{'_correct'}++;
+            }
+            $submission_data{$subm{'correct'}}->{$subm{'submission'}}++;
+        }
+    }
+    return \%submission_data;
+}
+
+
+#########################################################
+#########################################################
+##
+##      Option Response Routines
+##
+#########################################################
+#########################################################
+sub OptionResponseAnalysis {
+    my ($r,$problem,$problem_data,$Students) = @_;
+    my ($resource,$respid) = ($problem->{'resource'},
+                              $problem->{'respid'});
+    # Note: part data is not needed.
+    my $PerformanceData = &Apache::loncoursedata::get_response_data
+        (\@Apache::lonstatistics::SelectedSections,
+         $Apache::lonstatistics::enrollment_status,
+         $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,
+                                         $problem_data);
+            $r->print($result);
+            $r->rflush();
+        } else {
+            if ($ENV{'form.AnalyzeOver'} eq 'tries') {
+                my $analysis_html = &OR_tries_analysis($r,
+                                                    $PerformanceData,
+                                                    $problem_data);
+                $r->print($analysis_html);
+                $r->rflush();
+            } elsif ($ENV{'form.AnalyzeOver'} eq 'time') {
+                my $analysis_html = &OR_time_analysis($PerformanceData,
+                                                   $problem_data);
+                $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'};
+    my ($table,$Foils,$Concepts) = &build_foil_index($ORdata);
+    my %response_data = &OR_analyze_by_tries($r,$PerformanceData,
+                                                     $mintries,$maxtries);
+    my $analysis = '';
+    #
+    # Compute the data necessary to make the plots
+    my @foil_plot; 
+    my @concept_data;
+    for (my $j=0;$j<=scalar(@$Concepts);$j++) {
+        my $concept = $Concepts->[$j];
+        foreach my $foilid (@{$concept->{'foils'}}) {
+            for (my $try=$mintries;$try<=$maxtries;$try++) {
+                # concept analysis data
+                $concept_data[$j]->[$try]->{'_correct'} +=
+                    $response_data{$foilid}->[$try]->{'_correct'};
+                $concept_data[$j]->[$try]->{'_total'} +=
+                    $response_data{$foilid}->[$try]->{'_total'};
+                #
+                # foil analysis data
+                if ($response_data{$foilid}->[$try]->{'_total'} == 0) {
+                    push(@{$foil_plot[$try]->{'_correct'}},0);
+                } else {
+                    push(@{$foil_plot[$try]->{'_correct'}},
+                         100*$response_data{$foilid}->[$try]->{'_correct'}/
+                         $response_data{$foilid}->[$try]->{'_total'});
+                }
+                foreach my $option (@{$ORdata->{'_Options'}}) {
+                    push(@{$foil_plot[$try]->{'_total'}},
+                         $response_data{$foilid}->[$try]->{'_total'});
+                    if ($response_data{$foilid}->[$try]->{'_total'} == 0) {
+                        push (@{$foil_plot[$try]->{$option}},0);
+                    } else {
+                        if ($response_data{$foilid}->[$try]->{'_total'} ==
+                            $response_data{$foilid}->[$try]->{'_correct'}) {
+                            push(@{$foil_plot[$try]->{$option}},0);
+                        } else {
+                            push (@{$foil_plot[$try]->{$option}},
+                                  100 * 
+                                  $response_data{$foilid}->[$try]->{$option} / 
+                                  ($response_data{$foilid}->[$try]->{'_total'} 
+                                   - 
+                                   $response_data{$foilid}->[$try]->{'_correct'}
+                                   ));
+                        }
+                    }
+                } # End of foreach my $option
+            }
+        } # End of foreach my $foilid
+    } # End of concept loops
+    # 
+    # Build a table for the plots
+    my $analysis_html = "<br /><table>\n";
+    my $optionkey = &build_option_index($ORdata);
+    my $num_concepts = 1;
+    if (defined($Concepts)) { $num_concepts = scalar(@$Concepts); }
+    #
+    for (my $try=$mintries;$try<=$maxtries;$try++) {
+        if (! defined($response_data{'_total'}->[$try]) ||
+            $response_data{'_total'}->[$try] == 0) { 
+            if ($try > 1) {
+                $analysis_html.= '<tr><td align="center" colspan="4"><b>'.
+                    &mt('None of the selected students attempted the problem more than [_1] times.',$try-1).
+                    '</b></td></tr>';
+            } else {
+                $analysis_html.= '<tr><td colspan="4" align="center"><b>'.
+                    &mt('None of the selected students have attempted the problem').'</b></td></tr>';
+            }
+            last;
+        }
+        my $concept_graph='';
+        if ($num_concepts > 1) {
+            #
+            # Create concept plot
+            my @concept_plot_data;
+            for (my $j=0;$j<=$#concept_data;$j++) {
+                my $total = $concept_data[$j]->[$try]->{'_total'};
+                if ($total == 0) {
+                    $concept_plot_data[$j] = 0;
+                } else {
+                    $concept_plot_data[$j] = 100 * 
+                        sprintf('%0.3f',
+                                $concept_data[$j]->[$try]->{'_correct'} / 
+                                $total);
+                }
+            }
+            #
+            $concept_graph = &Apache::loncommon::DrawBarGraph
+                ('Correct Concepts','Concept Number','Percent Correct',
+                 100,$plotcolors,undef,\@concept_plot_data);
+        }
+        #
+        # Create Foil Plots
+        my $data_count = $response_data{'_total'}->[$try];
+        my $correct = $response_data{'_correct'}->[$try];
+        my @Datasets;
+        foreach my $option ('_correct',@{$ORdata->{'_Options'}}) {
+            next if (! exists($foil_plot[$try]->{$option}));
+            push(@Datasets,$foil_plot[$try]->{$option});
+        }
+        #
+        # Put a blank in the data set between concepts
+        for (my $set =0;$set<=$#Datasets;$set++) {
+            my @Data = @{$Datasets[$set]};
+            my $idx = 0;
+            foreach my $concept (@{$Concepts}) {
+                foreach my $foilid (@{$concept->{'foils'}}) {
+                    $Datasets[$set]->[$idx++]=shift(@Data);
+                }
+                if ($concept->{'name'} ne $Concepts->[-1]->{'name'}) {
+                    $Datasets[$set]->[$idx++] = 0;
+                }
+            }
+        }
+        #
+        # Set up the labels needed for the bar graph
+        my @Labels;
+        my $idx = 1;
+        foreach my $concept (@{$Concepts}) {
+            foreach my $foilid (@{$concept->{'foils'}}) {
+                push(@Labels,$idx++);
+            }
+            push(@Labels,'');
+        }
+        #
+        my $correct_graph = &Apache::loncommon::DrawBarGraph
+            ('Correct Statements','Statement','% Answered Correct',
+             100,$plotcolors,\@Labels,$Datasets[0]);
+        
+        #
+        #
+        next if (! defined($Datasets[0]));
+        for (my $i=0; $i< scalar(@{$Datasets[0]});$i++) {
+            $Datasets[0]->[$i]=0;
+        }
+        my $count = $response_data{'_total'}->[$try] - 
+                                           $response_data{'_correct'}->[$try];
+        my $incorrect_graph = &Apache::loncommon::DrawBarGraph
+            ('Incorrect Statements','Statement','% Chosen Incorrectly',
+             100,$plotcolors,\@Labels,@Datasets);
+        $analysis_html.= 
+            '<tr><td colspan="4" align="center">'.
+            '<font size="+1">'.
+            &mt('Attempt [_1], [_2] submissions, [_3] correct, [_4] incorrect',
+                $try,$data_count,$correct,$data_count-$correct).
+            '</font>'.'</td></tr>'.$/.                
+            '<tr>'.
+            '<td>'.$concept_graph.'</td>'.
+            '<td>'.$correct_graph.'</td>'.
+            '<td>'.$incorrect_graph.'</td>'.
+            '<td>'.$optionkey.'<td>'.
+            '</tr>'.$/;
+    }
+    $analysis_html .= "</table>\n";
+    $table .= $analysis_html;
+    return $table;
+}
+
+sub OR_analyze_by_tries {
+    my ($r,$PerformanceData,$mintries,$maxtries) = @_;
+    my %Trydata;
+    $mintries = 1         if (! defined($mintries) || $mintries < 1);
+    $maxtries = $mintries if (! defined($maxtries) || $maxtries < $mintries);
+    my @students;
+    foreach my $row (@$PerformanceData) {
+        next if (! defined($row));
+        my $tries = &get_tries_from_row($row);
+        my %Row   = &Process_OR_Row($row);
+        next if (! %Row);
+        my $student_id = $row->[&Apache::loncoursedata::RD_student_id()];
+        $students[$tries]->{$student_id}++;
+        while (my ($foilid,$href) = each(%Row)) {
+            if (! ref($href)) { 
+                $Trydata{$foilid}->[$tries] += $href;
+                next;
+            }
+            while (my ($option,$value) = each(%$href)) {
+                $Trydata{$foilid}->[$tries]->{$option}+=$value;
+            }
+        }
+    }
+    for (my $try=$mintries;$try<=$maxtries;$try++) {
+        $Trydata{'_studentcount'}->[$try] = scalar(keys(%{$students[$try]}));
+    }
+    return %Trydata;
+}
+
+#########################################################
+#
+#     Option Response: Time Analysis
+#
+#########################################################
+sub OR_time_analysis {
+    my ($performance_data,$ORdata) = @_;
+    my ($table,$Foils,$Concepts) = &build_foil_index($ORdata);
+    my $foilkey = &build_option_index($ORdata);
+    my $num_concepts = 1;
+    if (defined($Concepts)) { $num_concepts = scalar(@$Concepts); }
+    #
+    if ($num_concepts < 2) {
+        $table = '<h3>'.
+            &mt('Not enough data for concept analysis.  '.
+                'Performing Foil Analysis').
+                '</h3>'.$table;
     }
+    #
+    my $num_plots = $ENV{'form.NumPlots'};
+    my $num_data = scalar(@$performance_data)-1;
+    #
+    my $current_index;
+    $table .= "<table>\n";
+    for (my $i=0;$i<$num_plots;$i++) {
+        ##
+        my $starttime = &Apache::lonhtmlcommon::get_date_from_form
+            ('startdate_'.$i);
+        my $endtime = &Apache::lonhtmlcommon::get_date_from_form
+            ('enddate_'.$i);
+        if (! defined($starttime) || ! defined($endtime)) {
+            my $sec_in_day = 86400;
+            my $last_sub_time = &get_time_from_row($performance_data->[-1]);
+            my ($sday,$smon,$syear) = 
+                (localtime($last_sub_time - $sec_in_day*$i))[3..5];
+            $starttime = &Time::Local::timelocal(0,0,0,$sday,$smon,$syear);
+            $endtime = $starttime + $sec_in_day;
+            if ($i == ($num_plots -1 )) {
+                $starttime = &get_time_from_row($performance_data->[0]);
+            }
+        }
+        $table .= '<tr><td colspan="4" align="center"><font size="+1">'.
+            &mt('Data from [_1] to [_2]',
+                &Apache::lonlocal::locallocaltime($starttime),
+                &Apache::lonlocal::locallocaltime($endtime)).
+                '</font></td></tr>'.$/;
+        my $startdateform = &Apache::lonhtmlcommon::date_setter
+            ('Statistics','startdate_'.$i,$starttime);
+        my $enddateform = &Apache::lonhtmlcommon::date_setter
+            ('Statistics','enddate_'.$i,$endtime);
+        #
+        my $begin_index;
+        my $end_index;
+        my $j;
+        while (++$j < scalar(@$performance_data)) {
+            last if (&get_time_from_row($performance_data->[$j]) 
+                                                              > $starttime);
+        }
+        $begin_index = $j;
+        while ($j < scalar(@$performance_data)) {
+            if (&get_time_from_row($performance_data->[$j]) > $endtime) {
+                last;
+            } else {
+                $j++;
+            }
+        }
+        $end_index = $j;
+        ##
+        my ($processed_time_data,$correct,$data_count,$student_count) =
+            &OR_time_process_data($performance_data,$begin_index,$end_index);
+        ##
+        $table .= '<tr><td colspan="4" align="center"><font size="+1">'.
+            &mt('[_1] submissions from [_2] students submitting, [_3] correct, [_4] incorrect',
+                $data_count,$student_count,$correct,$data_count-$correct).
+                '</font></td></tr>'.$/;
+        my $concept_correct_plot = '';
+        if ($num_concepts > 1) {
+            $concept_correct_plot = 
+                &OR_Concept_Time_Analysis($processed_time_data,
+                                          $correct,$data_count,$student_count,
+                                          $ORdata,$Concepts);
+        }
+        my ($foil_correct_plot,$foil_incorrect_plot) = 
+            &OR_Foil_Time_Analysis($processed_time_data,
+                                   $correct,$data_count,$student_count,
+                                   $ORdata,$Foils,$Concepts);
+        $table .= '<tr>'.
+            '<td>'.$concept_correct_plot.'</td>'.
+            '<td>'.$foil_correct_plot.'</td>'.
+            '<td>'.$foil_incorrect_plot.'</td>'.
+            '<td align="left" valign="top">'.$foilkey.'</td></tr>'.$/;
+        $table .= '<tr><td colspan="4" align="center">'.
+            &mt('Start time: [_1]',$startdateform).'<br />'.
+            &mt('End time: [_1]',$enddateform).'</td></tr>'.$/;
+        $table.= '<tr><td colspan="4">&nbsp</td></tr>'.$/;
+    }
+    $table .= '</table>';
+    #
+    return $table;
+}
+
+sub OR_Foil_Time_Analysis {
+    my ($processed_time_data,$correct,$data_count,$student_count,
+        $ORdata,$Foils,$Concepts) = @_;
+    if ($data_count <= 0) {
+        return ('<h2>'.&mt('There is no data to plot').'</h2>','');
+    }
+    my $analysis_html;
+    my @plotdata;
+    my @labels;
+    foreach my $concept (@{$Concepts}) {
+        foreach my $foil (@{$concept->{'foils'}}) {
+            push(@labels,scalar(@labels)+1);
+            my $total = $processed_time_data->{$foil}->{'_total'};
+            if ($total == 0) {
+                push(@{$plotdata[0]},0);
+            } else {
+                push(@{$plotdata[0]},
+                     100 * $processed_time_data->{$foil}->{'_correct'} / $total);
+            }
+            my $total_incorrect = $total - $processed_time_data->{$foil}->{'_correct'};
+            for (my $i=0;$i<scalar(@{$ORdata->{'_Options'}});$i++) {
+                my $option = $ORdata->{'_Options'}->[$i];
+                if ($total_incorrect == 0) {
+                    push(@{$plotdata[$i+1]},0);
+                } else {
+                    push(@{$plotdata[$i+1]},
+                         100 * $processed_time_data->{$foil}->{$option} / $total_incorrect);
+                }
+            }
+        }
+        # Put in a blank one
+        push(@labels,'');
+        push(@{$plotdata[0]},0);
+        for (my $i=0;$i<scalar(@{$ORdata->{'_Options'}});$i++) {
+            push(@{$plotdata[$i+1]},0);
+        }
+    }
+    #
+    # Create the plot
+    my $correct_plot = &Apache::loncommon::DrawBarGraph('Correct Statements',
+                                                        'Statement Number',
+                                                        'Percent Correct',
+                                                        100,
+                                                        $plotcolors,
+                                                        undef,
+                                                        $plotdata[0]);
+    for (my $j=0; $j< scalar(@{$plotdata[0]});$j++) {
+        $plotdata[0]->[$j]=0;
+    }
+    my $incorrect_plot = 
+        &Apache::loncommon::DrawBarGraph('Incorrect Statements',
+                                         'Statement Number',
+                                         'Incorrect Option Choice',
+                                         100,
+                                         $plotcolors,
+                                         undef,
+                                         @plotdata);
+    return ($correct_plot,$incorrect_plot);
+}
+
+sub OR_Concept_Time_Analysis {
+    my ($processed_time_data,$correct,$data_count,$student_count,
+        $ORdata,$Concepts) = @_;
+    return '' if ($data_count == 0);
+    #
+    # Put the data in plottable form
+    my @plotdata;
+    foreach my $concept (@$Concepts) {
+        my ($total,$correct);
+        foreach my $foil (@{$concept->{'foils'}}) {
+            $total += $processed_time_data->{$foil}->{'_total'};
+            $correct += $processed_time_data->{$foil}->{'_correct'};
+        }
+        if ($total == 0) {
+            push(@plotdata,0);
+        } else {
+            push(@plotdata,100 * $correct / $total);
+        }
+    }
+    #
+    # Create the plot
+    return &Apache::loncommon::DrawBarGraph('Correct Concepts',
+                                            'Concept Number',
+                                            'Percent Correct',
+                                            100,
+                                            $plotcolors,
+                                            undef,
+                                            \@plotdata);
 }
 
+sub OR_time_process_data {
+    my ($performance_data,$begin_index,$end_index)=@_;
+    my %processed_time_data;
+    my %distinct_students;
+    my ($correct,$data_count);
+    if (($begin_index == $end_index) && 
+        ($end_index != scalar(@$performance_data)-1)) { 
+        return undef;
+    }
+    # Be sure we include the last one if we are asked for it.
+    # That we have to correct here (and not when $end_index is 
+    # given a value) should probably be considered a bug.
+    if ($end_index == scalar(@$performance_data)-1) {
+        $end_index++;
+    }
+    &Apache::lonnet::logthis('  '.$begin_index.':'.$end_index);
+    my $count;
+    for (my $i=$begin_index;$i<$end_index;$i++) {
+        my $attempt = $performance_data->[$i];
+        $count++;
+        next if (! defined($attempt));
+        my %attempt = &Process_OR_Row($attempt);
+        $data_count++;
+        $correct += $attempt{'_correct'};
+        $distinct_students{$attempt->[&Apache::loncoursedata::RD_student_id()]}++;
+        while (my ($foilid,$href) = each(%attempt)) {
+            if (! ref($href)) {
+                $processed_time_data{$foilid} += $href;
+                next;
+            }
+            while (my ($option,$value) = each(%$href)) {
+                $processed_time_data{$foilid}->{$option}+=$value;
+            }
+        }
+    }
+    &Apache::lonnet::logthis('count = '.$count);
+    return (\%processed_time_data,$correct,$data_count,
+            scalar(keys(%distinct_students)));
+}
 
 #########################################################
 #########################################################
 ##
-##      Misc interface routines use by analysis code
+##             Excel output 
 ##
 #########################################################
 #########################################################
+sub OR_excel_sheet {
+    my ($r,$resource,$performance_data,$ORdata) = @_;
+    my $response = '';
+    my (undef,$Foils,$Concepts) = &build_foil_index($ORdata);
+    #
+    # Create excel worksheet
+    my $filename = '/prtspool/'.
+        $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
+        time.'_'.rand(1000000000).'.xls';
+    my $workbook  = Spreadsheet::WriteExcel->new('/home/httpd'.$filename);
+    if (! defined($workbook)) {
+        $r->log_error("Error creating excel spreadsheet $filename: $!");
+        $r->print('<p>'.&mt("Unable to create new Excel file.  ".
+                            "This error has been logged.  ".
+                            "Please alert your LON-CAPA administrator").
+                  '</p>');
+        return undef;
+    }
+    #
+    $workbook->set_tempdir('/home/httpd/perl/tmp');
+    my $format = &Apache::loncommon::define_excel_formats($workbook);
+    #
+    # Create and populate main worksheets
+    my $problem_data_sheet  = $workbook->addworksheet('Problem Data');
+    my $student_data_sheet = &build_student_data_worksheet($workbook,$format);
+    my $response_data_sheet = $workbook->addworksheet('Response Data');
+    foreach my $sheet ($problem_data_sheet,$student_data_sheet,
+                       $response_data_sheet) {
+        $sheet->write(0,0,$resource->{'title'},$format->{'h2'});
+        $sheet->write(1,0,$resource->{'src'},$format->{'h3'});
+    }
+    #
+    my $result;
+    $result = &OR_build_problem_data_worksheet($problem_data_sheet,$format,
+                                            $Concepts,$ORdata);
+    if ($result ne 'okay') {
+        # Do something useful
+    }
+    $result = &OR_build_response_data_worksheet($response_data_sheet,$format,
+                                             $performance_data,$Foils,
+                                             $ORdata);
+    if ($result ne 'okay') {
+        # Do something useful
+    }
+    $response_data_sheet->activate();
+    #
+    # Close the excel file
+    $workbook->close();
+    #
+    # Write a link to allow them to download it
+    $result .= '<h2>'.&mt('Excel Raw Data Output').'</h2>'.
+              '<p><a href="'.$filename.'">'.
+              &mt('Your Excel spreadsheet.').
+              '</a></p>'."\n";
+    return $result;
+}
+
+sub OR_build_problem_data_worksheet {
+    my ($worksheet,$format,$Concepts,$ORdata) = @_;
+    my $rows_output = 3;
+    my $cols_output = 0;
+    $worksheet->write($rows_output++,0,'Problem Structure',$format->{'h3'});
+    ##
+    ##
+    my @Headers;
+    if (@$Concepts > 1) {
+        @Headers = ("Concept\nNumber",'Concept',"Foil\nNumber",
+                    'Foil Name','Foil Text','Correct value');
+    } else {
+        @Headers = ('Foil Number','FoilName','Foil Text','Correct value');
+    }
+    $worksheet->write_row($rows_output++,0,\@Headers,$format->{'header'});
+    my %Foildata = %{$ORdata->{'_Foils'}};
+    my $conceptindex = 1;
+    my $foilindex = 1;
+    foreach my $concept (@$Concepts) {
+        my @FoilsInConcept = @{$concept->{'foils'}};
+        my $firstfoil = shift(@FoilsInConcept);
+        if (@$Concepts > 1) {
+            $worksheet->write_row($rows_output++,0,
+                                  [$conceptindex,
+                                   $concept->{'name'},
+                                   $foilindex++,
+                                   $Foildata{$firstfoil}->{'name'},
+                                   $Foildata{$firstfoil}->{'text'},
+                                   $Foildata{$firstfoil}->{'value'},]);
+        } else {
+            $worksheet->write_row($rows_output++,0,
+                                  [ $foilindex++,
+                                    $Foildata{$firstfoil}->{'name'},
+                                    $Foildata{$firstfoil}->{'text'},
+                                    $Foildata{$firstfoil}->{'value'},]);
+        }
+        foreach my $foilid (@FoilsInConcept) {
+            if (@$Concepts > 1) {
+                $worksheet->write_row($rows_output++,0,
+                                      ['',
+                                       '',
+                                       $foilindex,
+                                       $Foildata{$foilid}->{'name'},
+                                       $Foildata{$foilid}->{'text'},
+                                       $Foildata{$foilid}->{'value'},]);
+            } else {
+                $worksheet->write_row($rows_output++,0,                
+                                      [$foilindex,
+                                       $Foildata{$foilid}->{'name'},
+                                       $Foildata{$foilid}->{'text'},
+                                       $Foildata{$foilid}->{'value'},]);
+            }                
+        } continue {
+            $foilindex++;
+        }
+    } continue {
+        $conceptindex++;
+    }
+    $rows_output++;
+    $rows_output++;
+    ##
+    ## Option data output
+    $worksheet->write($rows_output++,0,'Options',$format->{'header'});
+    foreach my $string (@{$ORdata->{'_Options'}}) {
+        $worksheet->write($rows_output++,0,$string);
+    }
+    return 'okay';
+}
+
+sub OR_build_response_data_worksheet {
+    my ($worksheet,$format,$performance_data,$Foils,$ORdata)=@_;
+    my $rows_output = 3;
+    my $cols_output = 0;
+    $worksheet->write($rows_output++,0,'Response Data',$format->{'h3'});
+    $worksheet->set_column(1,1,20);
+    $worksheet->set_column(2,2,13);
+    my @Headers = ('identifier','time','award detail','attempt');
+    foreach my $foil (@$Foils) {
+        push (@Headers,$foil.' submission');
+        push (@Headers,$foil.' grading');
+    }
+    $worksheet->write_row($rows_output++,0,\@Headers,$format->{'header'});
+    #
+    foreach my $row (@$performance_data) {
+        next if (! defined($row));
+        my ($student,$award,$grading,$submission,$time,$tries) = @$row;
+        my @Foilgrades = split('&',$grading);
+        my @Foilsubs   = split('&',$submission);
+        my %response_data;
+        for (my $j=0;$j<=$#Foilgrades;$j++) {
+            my ($foilid,$correct)  = split('=',$Foilgrades[$j]);
+            my (undef,$submission) = split('=',$Foilsubs[$j]);
+            $submission = &Apache::lonnet::unescape($submission);
+            $response_data{$foilid.' submission'}=$submission;
+            $response_data{$foilid.' award'}=$correct;
+        }
+        $worksheet->write($rows_output,$cols_output++,$student);
+        $worksheet->write($rows_output,$cols_output++,
+             &Apache::lonstathelpers::calc_serial($time),$format->{'date'});
+        $worksheet->write($rows_output,$cols_output++,$award);
+        $worksheet->write($rows_output,$cols_output++,$tries);
+        foreach my $foilid (@$Foils) {
+            $worksheet->write($rows_output,$cols_output++,
+                              $response_data{$foilid.' submission'});
+            $worksheet->write($rows_output,$cols_output++,
+                              $response_data{$foilid.' award'});
+        }
+        $rows_output++;
+        $cols_output = 0;
+    }
+    return;
+}
+
 sub build_foil_index {
     my ($ORdata) = @_;
-    my %Foildata = %{$ORdata->{'Foils'}};
+    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'}}},
+        push(@{$Concepts{$Foildata{$foilid}->{'_Concept'}}},
              $foilid);
     }
     undef(@Foils);
@@ -173,18 +1461,26 @@ sub build_foil_index {
                        eight => 8,
                        nine  => 9,
                        ten   => 10,);
-        my $a1 = $a; 
-        my $b1 = $b;
-        if (exists($Numbers{lc($a)})) {
-            $a1 = $Numbers{lc($a)};
+        my $a1 = lc($a); 
+        my $b1 = lc($b);
+        if (exists($Numbers{$a1})) {
+            $a1 = $Numbers{$a1};
         }
-        if (exists($Numbers{lc($b)})) {
-            $b1 = $Numbers{lc($b)};
+        if (exists($Numbers{$b1})) {
+            $b1 = $Numbers{$b1};
+        }
+        if (($a1 =~/^\d+$/) && ($b1 =~/^\d+$/)) {
+            return $a1 <=> $b1;
+        } else {
+            return $a1 cmp $b1;
         }
-        $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}}));
@@ -217,18 +1513,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) {
@@ -237,16 +1533,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 {
@@ -266,322 +1562,45 @@ sub build_option_index {
     my $table = "<table>\n";
     my $optionindex = 0;
     my @Rows;
-    foreach my $option ('correct',@{$ORdata->{'Options'}}) {
+    foreach my $option (&mt('correct option chosen'),@{$ORdata->{'_Options'}}) {
+        my $color = $plotcolors->[$optionindex++];
         push (@Rows,
               '<tr>'.
-              '<td bgcolor="'.$plotcolors->[$optionindex++].'">'.
-              ('&nbsp;'x4).'</td>'.
-              '<td>'.$option.'</td>'.
+              '<td bgcolor="'.$color.'">'.
+              '<font color="'.$color.'">'.('*'x3).'</font>'.'</td>'.
+              '<td>'.&HTML::Entities::encode($option,'<>&"').'</td>'.
               "</tr>\n");
     }
+    shift(@Rows); # Throw away 'correct option chosen' color
     $table .= join('',reverse(@Rows));
     $table .= "</table>\n";
 }
 
-#########################################################
-#########################################################
-##
-##         Tries Analysis
-##
-#########################################################
-#########################################################
-sub tries_analysis {
-    my ($PerformanceData,$ORdata) = @_;
-    my $mintries = 1;
-    my $maxtries = $ENV{'form.NumPlots'};
-    my ($table,$Foils,$Concepts) = &build_foil_index($ORdata);
-    if ((@$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';
-    }
-    my %ResponseData = &analyze_option_data_by_tries($PerformanceData,
-                                                     $mintries,$maxtries);
-    #
-    # Compute the data neccessary to make the plots
-    my @PlotData;   # Array which holds the data for each plot
-                    # @{$PlotData[$try]->{'datasetname'}} holds the data for
-                    # try $try with respect to 'datasetname'.  The array is
-                    # filled either with per-foil or per-concept data.
-    my ($extrakey,$xlabel,$ylabel);
-    if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
-        $extrakey = &build_option_index($ORdata);
-        $xlabel = 'Foil Number';
-        $ylabel = 'Option Chosen';
-        foreach my $foilid (@$Foils) {
-            for (my $i=$mintries;$i<=$maxtries;$i++) {
-                foreach my $option ('_correct',@{$ORdata->{'Options'}}) {
-                    push(@{$PlotData[$i]->{'_total'}},
-                         $ResponseData{$foilid}->[$i]->{'_total'});
-                    if ($ResponseData{$foilid}->[$i]->{'_total'} == 0) {
-                        push (@{$PlotData[$i]->{$option}},0);
-                    } else {
-                        push (@{$PlotData[$i]->{$option}},
-                              100 * $ResponseData{$foilid}->[$i]->{$option} / 
-                                    $ResponseData{$foilid}->[$i]->{'_total'});
-                    }
-                }
-            }
-        }
-    } else {
-        # Concept analysis
-        #
-        # Note: we do not bother with characterizing the students incorrect
-        # answers at the concept level because an incorrect answer for one foil
-        # may be a correct answer for another foil.
-        $extrakey = '';
-        $xlabel = 'Concept Number';
-        $ylabel = 'Percent Correct';
-        my %ConceptData;
-        foreach my $concept (@{$Concepts}) {
-            for (my $i=$mintries;$i<=$maxtries;$i++) {
-                #
-                # Gather the per-attempt data
-                my $cdata = $ConceptData{$concept}->[$i];
-                foreach my $foilid (@{$concept->{'foils'}}) {
-                    $cdata->{'_correct'} += 
-                        $ResponseData{$foilid}->[$i]->{'_correct'};
-                    $cdata->{'_total'}   += 
-                        $ResponseData{$foilid}->[$i]->{'_total'};
-                }
-                push (@{$PlotData[$i]->{'_total'}},$cdata->{'_total'});
-                if ($cdata->{'_total'} == 0) {
-                    push (@{$PlotData[$i]->{'_correct'}},0);
-                } else {
-                    push (@{$PlotData[$i]->{'_correct'}},
-                          100*$cdata->{'_correct'}/$cdata->{'_total'});
-                }
-            }
-        }
-    } # End of work to fill @PlotData
-    # 
-    # Build a table for the plots
-    $table .= "<table>\n";
-    my @Plots;
-    for (my $i=$mintries;$i<=$maxtries;$i++) {
-        my $minstu = $PlotData[$i]->{'_total'}->[0];
-        my $maxstu = $PlotData[$i]->{'_total'}->[0];
-        foreach my $count (@{$PlotData[$i]->{'_total'}}) {
-            if ($minstu > $count) {
-                $minstu = $count;
-            }
-            if ($maxstu < $count) {
-                $maxstu = $count;
-            }
-        }
-        $maxstu = 0 if (! defined($maxstu));
-        $minstu = 0 if (! defined($minstu));
-        my $title;
-        if ($maxstu == $minstu) {
-            $title = 'Attempt '.$i.', '.$maxstu.' students';
-        } else {
-            $title = 'Attempt '.$i.', '.$minstu.'-'.$maxstu.' students';
-        }
-        my @Datasets;
-        foreach my $option ('_correct',@{$ORdata->{'Options'}}) {
-            next if (! exists($PlotData[$i]->{$option}));
-            push(@Datasets,$PlotData[$i]->{$option});
-        }
-        my $graphlink = &Apache::loncommon::DrawGraph($title,
-                                                      $xlabel,
-                                                      $ylabel,
-                                                      100,
-                                                      $plotcolors,
-                                                      @Datasets);
-        push(@Plots,$graphlink);
-    }
-    #
-    # Should this be something the user can set?  Too many dialogs!
-    while (my $plotlink = shift(@Plots)) {
-        $table .= '<tr><td>'.$plotlink.'</td><td>'.$extrakey."</td></tr>\n";
+sub build_foil_key {
+    my ($foils,$extra_data)= @_;
+    if (! defined($extra_data)) { $extra_data = {}; }
+    my $table = "<table>\n";
+    my $foil_index = 0;
+    my @rows;
+    foreach my $foil (&mt('correct foil chosen'),@{$foils}) {
+        my $color = $plotcolors->[$foil_index++];
+        push (@rows,
+              '<tr>'.
+              '<td bgcolor="'.$color.'" class="key">'.
+              '<font color="'.$color.'">'.('*'x4).'</font></td>'.
+              '<td>'.&HTML::Entities::encode($foil,'<>&"').
+              ('&nbsp;'x2).$extra_data->{$foil}.'</td>'.
+              "</tr>\n");
     }
+    shift(@rows); # Throw away 'correct foil chosen' color
+    $table .= join('',reverse(@rows));
     $table .= "</table>\n";
-    return ($table);
-}
-
-sub analyze_option_data_by_tries {
-    my ($PerformanceData,$mintries,$maxtries) = @_;
-    my %Trydata;
-    $mintries = 1         if (! defined($mintries) || $mintries < 1);
-    $maxtries = $mintries if (! defined($maxtries) || $maxtries < $mintries);
-    foreach my $row (@$PerformanceData) {
-        next if (! defined($row));
-        my ($grading,$submission,$time,$tries) = @$row;
-        next if ($grading eq 'MISSING_ANSWER');
-        my @Foilgrades = split('&',$grading);
-        my @Foilsubs   = split('&',$submission);
-        for (my $numtries = 1; $numtries <= $maxtries; $numtries++) {
-            if ($tries == $numtries) {
-                for (my $i=0;$i<=$#Foilgrades;$i++) {
-                    my ($foilid,$correct)  = split('=',$Foilgrades[$i]);
-                    my (undef,$submission) = split('=',$Foilsubs[$i]);
-                    $submission = &HTML::Entities::decode($submission);
-                    $submission =~ s/\%20/ /g;
-                    if ($correct) {
-                        $Trydata{$foilid}->[$numtries]->{'_correct'}++;
-                    } else {
-                        $Trydata{$foilid}->[$numtries]->{$submission}++;
-                    }                        
-                    $Trydata{$foilid}->[$numtries]->{'_total'}++;
-                }
-            }
-        }
-    }
-    return %Trydata;
 }
 
 #########################################################
 #########################################################
 ##
-##                 Time Analysis
-##
-#########################################################
-#########################################################
-sub time_analysis {
-    my ($PerformanceData,$ORdata) = @_;
-    my $num_plots = $ENV{'form.NumPlots'};
-    my ($table,$Foils,$Concepts) = &build_foil_index($ORdata);
-    my $num_data = scalar(@$PerformanceData)-1;
-    my $percent = sprintf('%2f',100/$num_plots);
-    my $extratable = '';
-    if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
-        $extratable = &build_option_index($ORdata);
-    }
-    $table .= "<table>\n";
-    for (my $i=0;$i<$num_plots;$i++) {
-        my $starttime = &Apache::lonhtmlcommon::get_date_from_form
-            ('startdate_'.$i);
-        my $endtime = &Apache::lonhtmlcommon::get_date_from_form
-            ('enddate_'.$i);
-        my ($begin_index,$end_index,$plottitle,$plothtml,$data);
-        if (! defined($starttime) || ! defined($endtime)) {
-            $begin_index = $i*int($num_data/$num_plots);
-            $end_index = ($i+1)*int($num_data/$num_plots);
-            my $lownum  = sprintf('%2.1f',$i*$percent);
-            $lownum =~ s/(\.0)$//;
-            my $highnum = sprintf('%2.1f',($i+1)*$percent);
-            $highnum =~ s/(\.0)$//;
-            $plottitle = $lownum.'% to '.$highnum.'% of submissions';
-        } else {
-            my $j;
-            while (++$j < scalar(@$PerformanceData)) {
-                last if ($PerformanceData->[$j]->[2] > $starttime);
-            }
-            $begin_index = $j;
-            while (++$j < scalar(@$PerformanceData)) {
-                last if ($PerformanceData->[$j]->[2] > $endtime);
-            }
-            $end_index = $j;
-            $plottitle = $ENV{'form.plottitle_'.$i};
-        }
-        ($plothtml,$starttime,$endtime,$data) = 
-            &analyze_option_data_by_time($PerformanceData,
-                                         $begin_index,$end_index,
-                                         $plottitle,$Foils,
-                                         $Concepts,$ORdata);
-        my $startdateform = &Apache::lonhtmlcommon::date_setter
-            ('Statistics','startdate_'.$i,$starttime);
-        my $enddateform = &Apache::lonhtmlcommon::date_setter
-            ('Statistics','enddate_'.$i,$endtime);
-        $table.="<tr><td>".$plothtml.'</td><td align="left" valign="top">'.
-            "<b>Start Time</b>: &nbsp;".$startdateform."<br />".
-            "<b>End Time</b>&nbsp;&nbsp;: "."&nbsp;".$enddateform."<br />".
-            '<b>Plot Title</b>&nbsp;&nbsp;:'.("&nbsp;"x3).
-            '<input type="text" size="30" name="plottitle_'.$i.'" value="'.
-                  &HTML::Entities::encode($plottitle).'" /><br />'.$extratable.
-            "</td></tr>\n";
-    }
-    $table .="</table>\n";
-    return $table;
-}
-
-sub analyze_option_data_by_time {
-    my ($PerformanceData,$begin_index,
-        $end_index,$description,$Foils,$Concepts,$ORdata) = @_;
-    my %TimeData;
-    #
-    # Get the start and end times for this segment of the plot
-    my $starttime = $PerformanceData->[$begin_index]->[2];
-    my $endtime   = $PerformanceData->[$end_index  ]->[2];
-    #
-    # Compute the number getting the foils correct or incorrects
-    for (my $i=$begin_index;$i<=$end_index;$i++) {
-        my $row = $PerformanceData->[$i];
-        next if (! defined($row));
-        my ($grading,$submission,$time,$tries) = @$row;
-        next if ($grading eq 'MISSING_ANSWER');
-        my @Foilgrades = split('&',$grading);
-        my @Foilsubs   = split('&',$submission);
-        for (my $j=0;$j<=$#Foilgrades;$j++) {
-            my ($foilid,$correct)  = split('=',$Foilgrades[$j]);
-            my (undef,$submission) = split('=',$Foilsubs[$j]);
-            if ($correct) {
-                $TimeData{$foilid}->{'_correct'}++;
-            } else {
-                $submission = &HTML::Entities::decode($submission);
-                $submission =~ s/\%20/ /g;
-                $TimeData{$foilid}->{$submission}++;
-            }
-            $TimeData{$foilid}->{'_total'}++;
-        }
-    }
-    #
-    # Compute the total and percent correct
-    my @Plotdata;
-    my ($xlabel,$ylabel);
-    if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
-        $xlabel = 'Foil Number';
-        $ylabel = 'Option Chosen';
-        foreach my $foil (@$Foils) {
-            my $total = $TimeData{$foil}->{'_total'};
-            my $optionidx = 0;
-            foreach my $option ('_correct',@{$ORdata->{'Options'}}) {
-                if ($total > 0) {
-                    push(@{$Plotdata[$optionidx]},
-                         100 * $TimeData{$foil}->{$option} / $total);
-                } else {
-                    push(@{$Plotdata[$optionidx]},0);
-                }
-            } continue {
-                $optionidx++;
-            }
-        }
-    } else {
-        $xlabel = 'Concept Number';
-        $ylabel = 'Percent Correct';
-        foreach my $concept (@$Concepts) {
-            my $correct;
-            my $total;
-            foreach my $foil (@{$concept->{'foils'}}) {
-                $correct+=$TimeData{$foil}->{'_correct'};
-                $total  +=$TimeData{$foil}->{'_total'};
-            }
-            if ($total > 0) {
-                push(@{$Plotdata[0]},100 * $correct / $total);
-            } else {
-                push(@{$Plotdata[0]},0);
-            }
-        }
-    }
-    #
-    # Create the plot
-    my $graphlink = &Apache::loncommon::DrawGraph
-        ($description,#'Time Interval Analysis',
-         $xlabel,
-         $ylabel,
-         100,
-         $plotcolors,
-         @Plotdata);
-    #
-    return ($graphlink,$starttime,$endtime,\%TimeData);
-}
-
-#########################################################
-#########################################################
-##
-##             Interface 
+##   Generic Interface Routines
 ##
 #########################################################
 #########################################################
@@ -589,11 +1608,13 @@ sub CreateInterface {
     ##
     ## Environment variable initialization
     if (! exists$ENV{'form.AnalyzeOver'}) {
-        $ENV{'form.AnalyzeOver'} = 'Tries';
+        $ENV{'form.AnalyzeOver'} = 'tries';
     }
     ##
     ## Build the menu
     my $Str = '';
+    $Str .= &Apache::lonhtmlcommon::breadcrumbs
+        (undef,'Detailed Problem Analysis');
     $Str .= '<table cellspacing="5">'."\n";
     $Str .= '<tr>';
     $Str .= '<td align="center"><b>'.&mt('Sections').'</b></td>';
@@ -625,178 +1646,135 @@ sub CreateInterface {
     ##
     ##
     $Str .= '<td>';
-    { # These braces are here to organize the code, not scope it.
-        {
-            $Str .= '<nobr>'.&mt('Analyze Over ');
-            $Str .='<select name="AnalyzeOver" >';
-            $Str .= '<option value="Tries" ';
-            if (! exists($ENV{'form.AnalyzeOver'}) || 
-                $ENV{'form.AnalyzeOver'} eq 'Tries'){
-                # Default to Tries
-                $Str .= ' selected ';
-            }
-            $Str .= '>'.&mt('Tries').'</option>';
-            $Str .= '<option value="Time" ';
-            $Str .= ' selected ' if ($ENV{'form.AnalyzeOver'} eq 'Time');
-            $Str .= '>'.&mt('Time').'</option>';
-            $Str .= '</select></nobr><br />';
-        }
-        {
-            $Str .= '<nobr>'.&mt('Analyze as ');
-            $Str .='<select name="AnalyzeAs" >';
-            $Str .= '<option value="Concepts" ';
-            if (! exists($ENV{'form.AnalyzeAs'}) || 
-                $ENV{'form.AnalyzeAs'} eq 'Concepts'){
-                # Default to Concepts
-                $Str .= ' selected ';
-            }
-            $Str .= '>'.&mt('Concepts').'</option>';
-            $Str .= '<option value="Foils" ';
-            $Str .= ' selected ' if ($ENV{'form.AnalyzeAs'} eq 'Foils');
-            $Str .= '>'.&mt('Foils').'</option>';
-            $Str .= '</select></nobr><br />';
-        }
-        {
-            $Str .= '<br /><nobr>'.&mt('Number of Plots:');
-            $Str .= '<select name="NumPlots">';
-            if (! exists($ENV{'form.NumPlots'}) 
-                || $ENV{'form.NumPlots'} < 1 
-                || $ENV{'form.NumPlots'} > 20) {
-                $ENV{'form.NumPlots'} = 5;
-            }
-            foreach my $i (1,2,3,4,5,6,7,8,10,15,20) {
-                $Str .= '<option value="'.$i.'" ';
-                if ($ENV{'form.NumPlots'} == $i) { $Str.=' selected '; }
-                $Str .= '>'.$i.'</option>';
-            }
-            $Str .= '</select></nobr>';
-        }
+    ##
+    my $showprob_checkbox = 
+        '<input type="checkbox" name="show_prob" value="true" ';
+    if ($ENV{'form.show_prob'} eq 'true') {
+        $showprob_checkbox .= 'checked ';
+    }
+    $showprob_checkbox.= ' />';
+    $Str.= '<nobr><label>'.
+        &mt('Show problem [_1]',$showprob_checkbox).
+        '</label></nobr><br />';
+    ##
+    my $analyze_selector = '<select name="AnalyzeOver" >';
+    $analyze_selector .= '<option value="tries" ';
+    if (! exists($ENV{'form.AnalyzeOver'}) || 
+        $ENV{'form.AnalyzeOver'} eq 'tries'){
+        # Default to tries
+        $analyze_selector .= ' selected ';
+    }
+    $analyze_selector .= '>'.&mt('Tries').'</option>';
+    $analyze_selector .= '<option value="time" ';
+    $analyze_selector .= ' selected ' if ($ENV{'form.AnalyzeOver'} eq 'time');
+    $analyze_selector .= '>'.&mt('Time').'</option>';
+    $analyze_selector .= '</select>';
+    $Str .= '<nobr><label>'.
+        &mt('Analyze Over [_1] [_2]',
+            $analyze_selector,
+            &Apache::loncommon::help_open_topic('Analysis_Analyze_Over')).
+            '</label></nobr><br />'.$/;
+    ##
+    my $numplots_selector = '<select name="NumPlots">';
+    if (! exists($ENV{'form.NumPlots'}) 
+        || $ENV{'form.NumPlots'} < 1 
+        || $ENV{'form.NumPlots'} > 20) {
+        $ENV{'form.NumPlots'} = 5;
+    }
+    foreach my $i (1,2,3,4,5,6,7,8,10,15,20) {
+        $numplots_selector .= '<option value="'.$i.'" ';
+        if ($ENV{'form.NumPlots'} == $i) { $numplots_selector.=' selected '; }
+        $numplots_selector .= '>'.$i.'</option>';
     }
+    $numplots_selector .= '</select></nobr><br />';
+    $Str .= '<nobr><label>'.&mt('Number of Plots [_1]',$numplots_selector).
+        '</label></nobr>';
+    ##
+    $Str .= '<nobr><label>'.&mt('Status: [_1]',
+                                 '<input type="text" '.
+                                 'name="stats_status" size="60" value="" />'
+                                 ).
+                    '</label></nobr>';
     $Str .= '</td>';
     ##
     ##
     $Str .= '</tr>'."\n";
     $Str .= '</table>'."\n";
-    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_time_from_row {
+    my ($row) = @_;
+    if (ref($row)) {
+        return $row->[&Apache::loncoursedata::RD_timestamp()];
+    } 
+    return undef;
 }
 
-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;
-            }
-        }
+sub get_tries_from_row {
+    my ($row) = @_;
+    if (ref($row)) {
+        return $row->[&Apache::loncoursedata::RD_tries()];
     }
     return undef;
 }
 
-##
-## get problem data and put it into a useful data structure.
-## note: we must force each foil and option to not begin or end with
-##       spaces as they are stored without such data.
-##
-sub get_problem_data {
-    my ($url) = @_;
-    my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze'));
-    (my $garbage,$Answ)=split(/_HASH_REF__/,$Answ,2);
-    my %Answer;
-    %Answer=&Apache::lonnet::str2hash($Answ);
-    my %Partdata;
-    foreach my $part (@{$Answer{'parts'}}) {
-        while (my($key,$value) = each(%Answer)) {
-            next if ($key !~ /^$part/);
-            $key =~ s/^$part\.//;
-            if (ref($value) eq 'ARRAY') {
-                if ($key eq 'options') {
-                    for(my $i=0;$i<scalar(@$value);$i++) {
-                        $value->[$i]=~ s/(\s*$|^\s*)//g;
-                    }
-                    $Partdata{$part}->{'Options'}=$value;
-                } elsif ($key eq 'concepts') {
-                    $Partdata{$part}->{'Concepts'}=$value;
-                } elsif ($key =~ /^concept\.(.*)$/) {
-                    my $concept = $1;
-                    foreach my $foil (@$value) {
-                        $foil =~ s/(\s*$|^\s*)//g;
-                        $Partdata{$part}->{'Foils'}->{$foil}->{'Concept'}=
-                                                                      $concept;
-                    }
-                }
-            } else {
-                $value =~ s/(\s*$|^\s*)//g;
-                if ($key=~ /^foil\.text\.(.*)$/) {
-                    my $foil = $1;
-                    $foil =~ s/(\s*$|^\s*)//g;
-                    $Partdata{$part}->{'Foils'}->{$foil}->{'name'}=$foil;
-                    $Partdata{$part}->{'Foils'}->{$foil}->{'text'}=$value;
-                } elsif ($key =~ /^foil\.value\.(.*)$/) {
-                    my $foil = $1;
-                    $foil =~ s/(\s*$|^\s*)//g;
-                    $Partdata{$part}->{'Foils'}->{$foil}->{'value'}=$value;
-                }
-            }
+sub hashify_attempt {
+    my ($row) = @_;
+    my %attempt;
+    $attempt{'student'}    = $row->[&Apache::loncoursedata::RD_sname()];
+    $attempt{'tries'}      = $row->[&Apache::loncoursedata::RD_tries()];
+    $attempt{'submission'} = &Apache::lonnet::unescape($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 = $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 (&submission_is_correct($award)) {
+        $RowData{'_correct'} = 1;
+    }
+    $RowData{'_total'} = 1;
+    my @Foilgrades = split('&',$grading);
+    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'}++;
+        } else {
+            $submission = &Apache::lonnet::unescape($submission);
+            $RowData{$foilid}->{$submission}++;
         }
+        $RowData{$foilid}->{'_total'}++;
+    }
+    return %RowData;
+}
+
+sub submission_is_correct {
+    my ($award) = @_;
+    if ($award =~ /(APPROX_ANS|EXACT_ANS)/) {
+        return 1;
+    } else {
+        return 0;
     }
-    return %Partdata;
 }
 
 1;