--- loncom/interface/statistics/lonproblemanalysis.pm	2003/11/11 22:07:46	1.48
+++ loncom/interface/statistics/lonproblemanalysis.pm	2004/02/20 16:24:20	1.72
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemanalysis.pm,v 1.48 2003/11/11 22:07:46 matthew Exp $
+# $Id: lonproblemanalysis.pm,v 1.72 2004/02/20 16:24:20 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,6 +33,8 @@ 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();
@@ -42,38 +44,39 @@ my $plotcolors = ['#33ff00',
                   '#66ccff', '#ff9999', '#cccc33', '#660000', '#33cc66',
                   ]; 
 
-my @SubmitButtons = ({ name => 'ProblemAnalyis',
+my @SubmitButtons = ({ name => 'PrevProblemAnalysis',
+                       text => 'Previous Problem' },
+                     { name => 'ProblemAnalysis',
                        text => 'Analyze Problem Again' },
+                     { name => 'NextProblemAnalysis',
+                       text => 'Next Problem' },
+                     { name => 'break'},
                      { name => 'ClearCache',
                        text => 'Clear Caches' },
                      { name => 'updatecaches',
                        text => 'Update Student Data' },
                      { name => 'SelectAnother',
-                       text => 'Choose a different resource' },
+                       text => 'Choose a different Problem' },
                      { name => 'ExcelOutput',
                        text => 'Produce Excel Output' });
 
-sub render_resource {
-    my ($resource) = @_;
-    ##
-    ## Render the problem
-    my $base;
-    ($base,undef) = ($resource->{'src'} =~ m|(.*/)[^/]*$|);
-    $base = "http://".$ENV{'SERVER_NAME'}.$base;
-    my $rendered_problem = 
-        &Apache::lonnet::ssi_body($resource->{'src'});
-    $rendered_problem =~ s/<\s*form\s*/<nop /g;
-    $rendered_problem =~ s|(<\s*/form\s*>)|<\/nop>|g;
-    return '<table bgcolor="ffffff"><tr><td>'.
-        '<base href="'.$base.'" />'.
-        $rendered_problem.
-        '</td></tr></table>';
-}
 
 sub BuildProblemAnalysisPage {
     my ($r,$c)=@_;
     #
-    $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(&CreateInterface());
     #
     my @Students = @Apache::lonstatistics::Students;
@@ -96,38 +99,74 @@ sub BuildProblemAnalysisPage {
     }
     $r->rflush();
     #
+    my $problem_types = '(option|radiobutton|numerical)';
     if (exists($ENV{'form.problemchoice'}) && 
         ! exists($ENV{'form.SelectAnother'})) {
         foreach my $button (@SubmitButtons) {
-            $r->print('<input type="submit" name="'.$button->{'name'}.'" '.
-                      'value="'.&mt($button->{'text'}).'" />');
-            $r->print('&nbsp;'x5);
+            if ($button->{'name'} eq 'break') {
+                $r->print("<br />\n");
+            } else {
+                $r->print('<input type="submit" name="'.$button->{'name'}.'" '.
+                          'value="'.&mt($button->{'text'}).'" />');
+                $r->print('&nbsp;'x5);
+            }
         }
-        $r->print('<input type="hidden" name="problemchoice" value="'.
-                  $ENV{'form.problemchoice'}.'" />');
         #
         $r->print('<hr />');
-        #
-        my ($symb,$part,$resid,$resptype) = &get_problem_symb(
-                  &Apache::lonnet::unescape($ENV{'form.problemchoice'}));
         $r->rflush();
         #
-        my $resource = &get_resource_from_symb($symb);
-        if (! defined($resource) || ! defined($resptype)) {
+        # Determine which problem we are to analyze
+        my $current_problem = &Apache::lonstathelpers::get_target_from_id
+            ($ENV{'form.problemchoice'});
+        #
+        my ($prev,$curr,$next) = 
+            &Apache::lonstathelpers::get_prev_curr_next($current_problem,
+                                                        $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>');
-            $r->print(&render_resource($resource));
+            $r->print(&Apache::lonstathelpers::render_resource($resource));
             $r->rflush();
-            my %Data = &get_problem_data($resource->{'src'});
-            my $ProblemData = $Data{$part.'.'.$resid};
-            if ($resptype eq 'option') {
-                &OptionResponseAnalysis($r,$resource,$resid,$ProblemData,
+            my %Data = &Apache::lonstathelpers::get_problem_data
+                ($resource->{'src'});
+            my $ProblemData = $Data{$current_problem->{'part'}.
+                                    '.'.
+                                    $current_problem->{'respid'}};
+            if ($current_problem->{'resptype'} eq 'option') {
+                &OptionResponseAnalysis($r,$current_problem,
+                                        $ProblemData,
                                         \@Students);
-            } elsif ($resptype eq 'radiobutton') {
-                &RadioResponseAnalysis($r,$resource,$part,$resid,$ProblemData,
+            } elsif ($current_problem->{'resptype'} eq 'radiobutton') {
+                &RadioResponseAnalysis($r,$current_problem,
+                                       $ProblemData,
                                        \@Students);
+            } elsif ($current_problem->{'resptype'} eq 'numerical') {
+#                if (exists($ENV{'form.ExcelOutput'})) {
+                    &Apache::lonstudentsubmissions::prepare_excel_output
+                        ($r,$current_problem,$ProblemData,\@Students);
+#                } else {
+#                    &NumericalResponseAnalysis($r,$current_problem,
+#                                               $ProblemData,\@Students);
+#                }
             } else {
                 $r->print('<h2>This analysis is not supported</h2>');
             }
@@ -138,13 +177,124 @@ sub BuildProblemAnalysisPage {
                   &mt('Analyze Problem').'" />');
         $r->print('&nbsp;'x5);
         $r->print('<h3>'.&mt('Please select a problem to analyze').'</h3>');
-        $r->print(&ProblemSelector());
+        $r->print(&Apache::lonstathelpers::ProblemSelector
+                  ($problem_types));
     }
 }
 
-=pod
 
-Removed code:
+#########################################################
+#########################################################
+##
+##      Numerical Response Routines
+##
+#########################################################
+#########################################################
+sub NumericalResponseAnalysis {
+    my ($r,$problem,$ProblemData,$Students) = @_;
+    $r->print('<h2>This analysis is not yet supported</h2>');
+    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;
+    }
+    my ($max,$min) = &GetStudentAnswers($r,$problem,$Students);
+    $r->print('Maximum = '.$max.' Minimum = '.$min);
+    my $max_students = 0;
+    my %Data;
+    foreach my $student (@$Students) {
+        my $answer = $student->{'answer'};
+        $Data{$answer}++;
+        if ($max_students < $Data{$answer}) {
+            $max_students = $Data{$answer};
+        }
+    }
+    foreach (5,10,20,25,50,75,100,150,200,250,500,1000,1500,2000,2500,5000) {
+        if ($max_students < $_) {
+            $max_students = $_;
+            last;
+        }
+    }
+    my @Labels = sort {$a <=> $b } keys(%Data);
+    $r->print('number of labels = '.scalar(@Labels));
+    my @PlotData = @Data{@Labels};
+    $r->print('number of PlotData = '.scalar(@PlotData));
+    my $graph = 
+        &Apache::loncommon::DrawXYGraph('Correct Answer Distribution',
+                                        'Correct Answer',
+                                        'Number of students',
+                                        $max_students,
+                                        undef,
+                                        \@Labels,
+                                        [\@PlotData],
+                                        (xskip=>10));
+    $r->print($graph);
+    return;
+}
+
+sub GetStudentAnswers {
+    my ($r,$problem,$Students) = @_;
+    my %Answers;
+    my ($resource,$partid,$respid) = ($problem->{'resource'},
+                                      $problem->{'part'},
+                                      $problem->{'respid'});
+    # Open progress window
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
+        ($r,'Student Answer Compilation Status',
+         'Student Answer Compilation Progress', scalar(@$Students));
+    $r->print("<table>\n");
+    $r->rflush();
+    foreach my $student (@$Students) {
+        my $sname = $student->{'username'};
+        my $sdom = $student->{'domain'};
+        my $answer = &Apache::lonstathelpers::analyze_problem_as_student
+            ($resource,$sname,$sdom,$partid,$respid);
+        &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
+                                                 &mt('last student'));
+        $student->{'answer'} = $answer;
+    }
+    $r->print("</table>\n");
+    $r->rflush();
+    # close progress window
+    &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+    return;
+}
+
+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;
+}
 
 #########################################################
 #########################################################
@@ -154,7 +304,9 @@ Removed code:
 #########################################################
 #########################################################
 sub RadioResponseAnalysis {
-    my ($r,$resource,$part,$respid,$ProblemData,$Students) = @_;
+    my ($r,$problem,$ProblemData,$Students) = @_;
+    my ($resource,$respid) = ($problem->{'resource'},
+                              $problem->{'respid'});
     my $analysis_html;
     my $PerformanceData = 
         &Apache::loncoursedata::get_response_data
@@ -168,14 +320,14 @@ sub RadioResponseAnalysis {
         return;
     }
     if (exists($ENV{'form.ExcelOutput'})) {
-        $analysis_html .= &RR_Excel_output($r,$resource,$PerformanceData,
-                                          $ProblemData);
+        $analysis_html .= &RR_Excel_output($r,$problem->{'resource'},
+                                           $PerformanceData,$ProblemData);
     } elsif ($ENV{'form.AnalyzeOver'} eq 'Tries') {
-        $analysis_html .= &RR_Tries_Analysis($r,$resource,$PerformanceData,
-                                           $ProblemData);
+        $analysis_html .= &RR_Tries_Analysis($r,$problem->{'resource'},
+                                             $PerformanceData,$ProblemData);
     } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') {
-        $analysis_html .= &RR_Time_Analysis($r,$resource,$PerformanceData,
-                                           $ProblemData);
+        $analysis_html .= &RR_Time_Analysis($r,$problem->{'resource'},
+                                            $PerformanceData,$ProblemData);
     } else {
         $analysis_html .= '<h2>'.
            &mt('The analysis you have selected is not supported at this time').
@@ -184,7 +336,6 @@ sub RadioResponseAnalysis {
     $r->print($analysis_html);
 }
 
-
 sub RR_Excel_output   { 
     my ($r,$PerformanceData,$ProblemData) = @_;
     return '<h1>No!</h1>';
@@ -196,7 +347,8 @@ sub RR_Tries_Analysis {
     my $mintries = 1;
     my $maxtries = $ENV{'form.NumPlots'};
     my ($table,$Foils,$Concepts) = &build_foil_index($ProblemData);
-    if ((@$Concepts < 2) && ($ENV{'form.AnalyzeAs'} ne 'Foils')) {
+    if ((! defined($Concepts)) || ((@$Concepts < 2) && 
+                                   ($ENV{'form.AnalyzeAs'} ne 'Foils'))) {
         $table = '<h3>'.
             &mt('Not enough data for concept analysis.  '.
                 'Performing Foil Analysis').
@@ -205,15 +357,15 @@ sub RR_Tries_Analysis {
     }
     $analysis_html .= $table;
     my @TryData = &RR_tries_data_analysis($r,$PerformanceData);
-    if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
-        $analysis_html = &RR_Tries_Foil_Analysis($mintries,$maxtries,$Foils,
+#    if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
+        $analysis_html .= &RR_Tries_Foil_Analysis($mintries,$maxtries,$Foils,
                                                  \@TryData,$ProblemData);
-    } else {
-        $analysis_html = &RR_Tries_Concept_Analysis($mintries,$maxtries,
-                                                    $Concepts,
-                                                    \@TryData,
-                                                    $ProblemData);
-    }
+#    } else {
+#        $analysis_html = &RR_Tries_Concept_Analysis($mintries,$maxtries,
+#                                                    $Concepts,
+#                                                    \@TryData,
+#                                                    $ProblemData);
+#    }
     return $analysis_html;
 }
 
@@ -243,8 +395,8 @@ sub RR_Tries_Foil_Analysis {
         my @PlotData_Correct; 
         my @PlotData_Incorrect;
         next if ($try > scalar(@{$TryData}));
-        next if (! defined($TryData->[$try-1]));
-        my %DataSet = %{$TryData->[$try-1]};
+        next if (! defined($TryData->[$try]));
+        my %DataSet = %{$TryData->[$try]};
         my $total = 0;
         foreach my $foilid (@$Foils) {
             $total += $DataSet{$foilid};
@@ -272,10 +424,10 @@ sub RR_Tries_Foil_Analysis {
                                                   'Percent Choosing',
                                                   100,
                                                   ['#33ff00','#ff3300'],
+                                                  undef,
                                                   \@PlotData_Correct,
                                                   \@PlotData_Incorrect);
     }
-    &Apache::lonnet::logthis('plot = '.$html);
     return $html;
 }
 
@@ -298,14 +450,12 @@ sub RR_Time_Concept_Analysis {
 }
 
 
-
 sub get_Radio_problem_data {
     my ($url) = @_;
     my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze'));
     (my $garbage,$Answ)=split('_HASH_REF__',$Answ,2);
     my %Answer = &Apache::lonnet::str2hash($Answ);
     my %Partdata;
-    &Apache::lonnet::logthis('url = '.$url);
     foreach my $part (@{$Answer{'parts'}}) {
         while (my($key,$value) = each(%Answer)) {
 #            if (ref($value) eq 'ARRAY') {
@@ -331,9 +481,6 @@ sub get_Radio_problem_data {
     return %Partdata;
 }
 
-=cut
-
-
 #########################################################
 #########################################################
 ##
@@ -342,10 +489,13 @@ sub get_Radio_problem_data {
 #########################################################
 #########################################################
 sub OptionResponseAnalysis {
-    my ($r,$resource,$resid,$ProblemData,$Students) = @_;
+    my ($r,$problem,$ProblemData,$Students) = @_;
+    my ($resource,$respid) = ($problem->{'resource'},
+                              $problem->{'respid'});
+    # Note: part data is not needed.
     my $PerformanceData = 
         &Apache::loncoursedata::get_response_data
-        ($Students,$resource->{'symb'},$resid);
+        ($Students,$resource->{'symb'},$respid);
     if (! defined($PerformanceData) || 
         ref($PerformanceData) ne 'ARRAY' ) {
         $r->print('<h2>'.
@@ -354,20 +504,20 @@ sub OptionResponseAnalysis {
     }  else {
         $r->rflush();
         if (exists($ENV{'form.ExcelOutput'})) {
-            my $result = &prepare_optionresponse_excel_sheet($r,$resource,
-                                                             $PerformanceData,
-                                                             $ProblemData);
+            my $result = &OR_excel_sheet($r,$resource,
+                                         $PerformanceData,
+                                         $ProblemData);
             $r->print($result);
             $r->rflush();
         } else {
             if ($ENV{'form.AnalyzeOver'} eq 'Tries') {
-                my $analysis_html = &tries_analysis($r,
+                my $analysis_html = &OR_tries_analysis($r,
                                                     $PerformanceData,
                                                     $ProblemData);
                 $r->print($analysis_html);
                 $r->rflush();
             } elsif ($ENV{'form.AnalyzeOver'} eq 'Time') {
-                my $analysis_html = &time_analysis($PerformanceData,
+                my $analysis_html = &OR_time_analysis($PerformanceData,
                                                    $ProblemData);
                 $r->print($analysis_html);
                 $r->rflush();
@@ -386,7 +536,7 @@ sub OptionResponseAnalysis {
 #       Option Response:  Tries Analysis
 #
 #########################################################
-sub tries_analysis {
+sub OR_tries_analysis {
     my ($r,$PerformanceData,$ORdata) = @_;
     my $mintries = 1;
     my $maxtries = $ENV{'form.NumPlots'};
@@ -398,21 +548,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;
     #
@@ -467,10 +617,11 @@ sub Tries_Foil_Analysis {
         }
         my $correctgraph = &Apache::loncommon::DrawBarGraph
             ($title,'Foil Number','Percent Correct',
-             100,$plotcolors,$Datasets[0]);
+             100,$plotcolors,undef,$Datasets[0]);
         $analysis_html.= '<tr><td>'.$correctgraph.'</td>';
         ##
         ##
+        next if (! defined($Datasets[0]));
         for (my $i=0; $i< scalar(@{$Datasets[0]});$i++) {
             $Datasets[0]->[$i]=0;
         }
@@ -485,7 +636,7 @@ sub Tries_Foil_Analysis {
         $title = 'Attempt '.$i.', '.$count;
         my $incorrectgraph = &Apache::loncommon::DrawBarGraph
             ($title,'Foil Number','% Option Chosen Incorrectly',
-             100,$plotcolors,@Datasets);
+             100,$plotcolors,undef,@Datasets);
         $analysis_html.= '<td>'.$incorrectgraph.'</td>';
         $analysis_html.= '<td>'.$foilkey."<td></tr>\n";
     }
@@ -493,7 +644,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";
@@ -552,14 +703,14 @@ sub Tries_Concept_Analysis {
         $title = 'Attempt '.$i.', '.$count;
         my $graphlink = &Apache::loncommon::DrawBarGraph
             ($title,'Concept Number','Percent Correct',
-             100,$plotcolors,$PlotData[$i]->{'_correct'});
+             100,$plotcolors,undef,$PlotData[$i]->{'_correct'});
         $analysis_html.= '<tr><td>'.$graphlink."</td></tr>\n";
     }
     $analysis_html .= "</table>\n";
     return $analysis_html;
 }
 
-sub analyze_option_data_by_tries {
+sub OR_analyze_by_tries {
     my ($r,$PerformanceData,$mintries,$maxtries) = @_;
     my %Trydata;
     $mintries = 1         if (! defined($mintries) || $mintries < 1);
@@ -587,7 +738,7 @@ sub analyze_option_data_by_tries {
 #     Option Response: Time Analysis
 #
 #########################################################
-sub time_analysis {
+sub OR_time_analysis {
     my ($PerformanceData,$ORdata) = @_;
     my ($table,$Foils,$Concepts) = &build_foil_index($ORdata);
     if ((@$Concepts < 2) && ($ENV{'form.AnalyzeAs'} ne 'Foils')) {
@@ -645,10 +796,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);
         }
     }
@@ -656,7 +807,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);
@@ -717,6 +868,7 @@ sub Foil_Time_Analysis {
                                                        'Percent Correct',
                                                        100,
                                                        $plotcolors,
+                                                       undef,
                                                        $Plotdata[0]);
     for (my $j=0; $j< scalar(@{$Plotdata[0]});$j++) {
         $Plotdata[0]->[$j]=0;
@@ -734,6 +886,7 @@ sub Foil_Time_Analysis {
                                                  'Incorrect Option Choice',
                                                  100,
                                                  $plotcolors,
+                                                 undef,
                                                  @Plotdata);        
     $analysis_html.='<tr>'.
         '<td>'.$correctplot.'</td>'.
@@ -751,7 +904,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;
     ##
@@ -798,6 +951,7 @@ sub Concept_Time_Analysis {
                                                     'Percent Correct',
                                                     100,
                                                     $plotcolors,
+                                                    undef,
                                                     \@Plotdata);
     $analysis_html.='<tr>'.
         '<td>'.$correctplot.'</td>'.
@@ -819,7 +973,7 @@ sub Concept_Time_Analysis {
 ##
 #########################################################
 #########################################################
-sub prepare_optionresponse_excel_sheet {
+sub OR_excel_sheet {
     my ($r,$resource,$PerformanceData,$ORdata) = @_;
     my $response = '';
     my (undef,$Foils,$Concepts) = &build_foil_index($ORdata);
@@ -839,22 +993,11 @@ sub prepare_optionresponse_excel_sheet {
     }
     #
     $workbook->set_tempdir('/home/httpd/perl/tmp');
-    #
-    # Define some potentially useful formats
-    my $format;
-    $format->{'header'} = $workbook->add_format(bold      => 1, 
-                                                bottom    => 1,
-                                                align     => 'center');
-    $format->{'bold'} = $workbook->add_format(bold=>1);
-    $format->{'h1'}   = $workbook->add_format(bold=>1, size=>18);
-    $format->{'h2'}   = $workbook->add_format(bold=>1, size=>16);
-    $format->{'h3'}   = $workbook->add_format(bold=>1, size=>14);
-    $format->{'date'} = $workbook->add_format(num_format=>
-                                              'mmm d yyyy hh:mm AM/PM');
+    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  = $workbook->addworksheet('Student 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) {
@@ -863,16 +1006,12 @@ sub prepare_optionresponse_excel_sheet {
     }
     #
     my $result;
-    $result = &build_problem_data_worksheet($problem_data_sheet,$format,
+    $result = &OR_build_problem_data_worksheet($problem_data_sheet,$format,
                                             $Concepts,$ORdata);
     if ($result ne 'okay') {
         # Do something useful
     }
-    $result = &build_student_data_worksheet($student_data_sheet,$format);
-    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') {
@@ -891,7 +1030,7 @@ sub prepare_optionresponse_excel_sheet {
     return $result;
 }
 
-sub build_problem_data_worksheet {
+sub OR_build_problem_data_worksheet {
     my ($worksheet,$format,$Concepts,$ORdata) = @_;
     my $rows_output = 3;
     my $cols_output = 0;
@@ -960,33 +1099,7 @@ sub build_problem_data_worksheet {
     return 'okay';
 }
 
-sub build_student_data_worksheet {
-    my ($worksheet,$format) = @_;
-    my $rows_output = 3;
-    my $cols_output = 0;
-    $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;
-}
-
-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;
@@ -1015,7 +1128,7 @@ sub build_response_data_worksheet {
         }
         $worksheet->write($rows_output,$cols_output++,$student);
         $worksheet->write($rows_output,$cols_output++,
-                          &calc_serial($time),$format->{'date'});
+             &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) {
@@ -1030,185 +1143,6 @@ sub build_response_data_worksheet {
     return;
 }
 
-
-##
-## The following is copied from datecalc1.pl, part of the 
-## Spreadsheet::WriteExcel CPAN module.
-##
-##
-######################################################################
-#
-# Demonstration of writing date/time cells to Excel spreadsheets,
-# using UNIX/Perl time as source of date/time.
-#
-# Copyright 2000, Andrew Benham, adsb@bigfoot.com
-#
-######################################################################
-#
-# UNIX/Perl time is the time since the Epoch (00:00:00 GMT, 1 Jan 1970)
-# measured in seconds.
-#
-# An Excel file can use exactly one of two different date/time systems.
-# In these systems, a floating point number represents the number of days
-# (and fractional parts of the day) since a start point. The floating point
-# number is referred to as a 'serial'.
-# The two systems ('1900' and '1904') use different starting points:
-#  '1900'; '1.00' is 1 Jan 1900 BUT 1900 is erroneously regarded as
-#          a leap year - see:
-#            http://support.microsoft.com/support/kb/articles/Q181/3/70.asp
-#          for the excuse^H^H^H^H^H^Hreason.
-#  '1904'; '1.00' is 2 Jan 1904.
-#
-# The '1904' system is the default for Apple Macs. Windows versions of
-# Excel have the option to use the '1904' system.
-#
-# Note that Visual Basic's "DateSerial" function does NOT erroneously
-# regard 1900 as a leap year, and thus its serials do not agree with
-# the 1900 serials of Excel for dates before 1 Mar 1900.
-#
-# Note that StarOffice (at least at version 5.2) does NOT erroneously
-# regard 1900 as a leap year, and thus its serials do not agree with
-# the 1900 serials of Excel for dates before 1 Mar 1900.
-#
-######################################################################
-#
-# Calculation description
-# =======================
-#
-# 1900 system
-# -----------
-# Unix time is '0' at 00:00:00 GMT 1 Jan 1970, i.e. 70 years after 1 Jan 1900.
-# Of those 70 years, 17 (1904,08,12,16,20,24,28,32,36,40,44,48,52,56,60,64,68)
-# were leap years with an extra day.
-# Thus there were 17 + 70*365 days = 25567 days between 1 Jan 1900 and
-# 1 Jan 1970.
-# In the 1900 system, '1' is 1 Jan 1900, but as 1900 was not a leap year
-# 1 Jan 1900 should really be '2', so 1 Jan 1970 is '25569'.
-#
-# 1904 system
-# -----------
-# Unix time is '0' at 00:00:00 GMT 1 Jan 1970, i.e. 66 years after 1 Jan 1904.
-# Of those 66 years, 17 (1904,08,12,16,20,24,28,32,36,40,44,48,52,56,60,64,68)
-# were leap years with an extra day.
-# Thus there were 17 + 66*365 days = 24107 days between 1 Jan 1904 and
-# 1 Jan 1970.
-# In the 1904 system, 2 Jan 1904 being '1', 1 Jan 1970 is '24107'.
-#
-######################################################################
-#
-# Copyright (c) 2000, Andrew Benham.
-# This program is free software. It may be used, redistributed and/or
-# modified under the same terms as Perl itself.
-#
-# Andrew Benham, adsb@bigfoot.com
-# London, United Kingdom
-# 11 Nov 2000
-#
-######################################################################
-
-# Use 1900 date system on all platforms other than Apple Mac (for which
-# use 1904 date system).
-my $DATE_SYSTEM = ($^O eq 'MacOS') ? 1 : 0;
-
-#-----------------------------------------------------------
-# calc_serial()
-#
-# Called with (up to) 2 parameters.
-#   1.  Unix timestamp.  If omitted, uses current time.
-#   2.  GMT flag. Set to '1' to return serial in GMT.
-#       If omitted, returns serial in appropriate timezone.
-#
-# Returns date/time serial according to $DATE_SYSTEM selected
-#-----------------------------------------------------------
-sub calc_serial {
-        my $time = (defined $_[0]) ? $_[0] : time();
-        my $gmtflag = (defined $_[1]) ? $_[1] : 0;
-
-        # Divide timestamp by number of seconds in a day.
-        # This gives a date serial with '0' on 1 Jan 1970.
-        my $serial = $time / 86400;
-
-        # Adjust the date serial by the offset appropriate to the
-        # currently selected system (1900/1904).
-        if ($DATE_SYSTEM == 0) {        # use 1900 system
-                $serial += 25569;
-        } else {                        # use 1904 system
-                $serial += 24107;
-        }
-
-        unless ($gmtflag) {
-                # Now have a 'raw' serial with the right offset. But this
-                # gives a serial in GMT, which is false unless the timezone
-                # is GMT. We need to adjust the serial by the appropriate
-                # timezone offset.
-                # Calculate the appropriate timezone offset by seeing what
-                # the differences between localtime and gmtime for the given
-                # time are.
-
-                my @gmtime = gmtime($time);
-                my @ltime  = localtime($time);
-
-                # For the first 7 elements of the two arrays, adjust the
-                # date serial where the elements differ.
-                for (0 .. 6) {
-                        my $diff = $ltime[$_] - $gmtime[$_];
-                        if ($diff) {
-                                $serial += _adjustment($diff,$_);
-                        }
-                }
-        }
-
-        # Perpetuate the error that 1900 was a leap year by decrementing
-        # the serial if we're using the 1900 system and the date is prior to
-        # 1 Mar 1900. This has the effect of making serial value '60'
-        # 29 Feb 1900.
-
-        # This fix only has any effect if UNIX/Perl time on the platform
-        # can represent 1900. Many can't.
-
-        unless ($DATE_SYSTEM) {
-                $serial-- if ($serial < 61);    # '61' is 1 Mar 1900
-        }
-        return $serial;
-}
-
-sub _adjustment {
-        # Based on the difference in the localtime/gmtime array elements
-        # number, return the adjustment required to the serial.
-
-        # We only look at some elements of the localtime/gmtime arrays:
-        #    seconds    unlikely to be different as all known timezones
-        #               have an offset of integral multiples of 15 minutes,
-        #               but it's easy to do.
-        #    minutes    will be different for timezone offsets which are
-        #               not an exact number of hours.
-        #    hours      very likely to be different.
-        #    weekday    will differ when localtime/gmtime difference
-        #               straddles midnight.
-        #
-        # Assume that difference between localtime and gmtime is less than
-        # 5 days, then don't have to do maths for day of month, month number,
-        # year number, etc...
-
-        my ($delta,$element) = @_;
-        my $adjust = 0;
-
-        if ($element == 0) {            # Seconds
-                $adjust = $delta/86400;         # 60 * 60 * 24
-        } elsif ($element == 1) {       # Minutes
-                $adjust = $delta/1440;          # 60 * 24
-        } elsif ($element == 2) {       # Hours
-                $adjust = $delta/24;            # 24
-        } elsif ($element == 6) {       # Day of week number
-                # Catch difference straddling Sat/Sun in either direction
-                $delta += 7 if ($delta < -4);
-                $delta -= 7 if ($delta > 4);
-
-                $adjust = $delta;
-        }
-        return $adjust;
-}
-
 sub build_foil_index {
     my ($ORdata) = @_;
     return if (! exists($ORdata->{'_Foils'}));
@@ -1236,16 +1170,24 @@ sub build_foil_index {
                        ten   => 10,);
         my $a1 = lc($a); 
         my $b1 = lc($b);
-        if (exists($Numbers{$a})) {
-            $a1 = $Numbers{$a};
+        if (exists($Numbers{$a1})) {
+            $a1 = $Numbers{$a1};
         }
-        if (exists($Numbers{$b})) {
-            $b1 = $Numbers{$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}}));
@@ -1278,18 +1220,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) {
@@ -1298,16 +1240,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 {
@@ -1332,7 +1274,7 @@ sub build_option_index {
               '<tr>'.
               '<td bgcolor="'.$plotcolors->[$optionindex++].'">'.
               ('&nbsp;'x4).'</td>'.
-              '<td>'.$option.'</td>'.
+              '<td>'.&HTML::Entities::encode($option).'</td>'.
               "</tr>\n");
     }
     shift(@Rows); # Throw away 'correct option chosen' color
@@ -1356,6 +1298,8 @@ sub CreateInterface {
     ##
     ## 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>';
@@ -1390,6 +1334,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'}) || 
@@ -1401,10 +1347,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'}) || 
@@ -1420,6 +1369,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 
@@ -1442,91 +1393,6 @@ sub CreateInterface {
     return $Str;
 }
 
-sub ProblemSelector {
-    my $Str;
-    $Str = "\n<table>\n";
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
-        next if ($seq->{'num_assess'}<1);
-        my $seq_str = '';
-        foreach my $res (@{$seq->{'contents'}}) {
-            next if ($res->{'type'} ne 'assessment');
-            foreach my $part (@{$res->{'parts'}}) {
-                my $partdata = $res->{'partdata'}->{$part};
-#                &Apache::lonnet::logthis('----------------');
-#                while (my ($k,$v)=each(%$partdata)) {
-#                    if (ref($v) eq 'ARRAY') {
-#                        &Apache::lonnet::logthis($k.' = '.join(',',@$v));
-#                    } else {
-#                        &Apache::lonnet::logthis($k.' = '.$v);
-#                    }
-#                }
-                if ((! exists($partdata->{'option'}) || 
-                     $partdata->{'option'} == 0      ) &&
-                    (! exists($partdata->{'radiobutton'}) ||
-                     $partdata->{'radiobutton'} == 0)) {
-                    next;
-                }
-                for (my $i=0;$i<scalar(@{$partdata->{'ResponseTypes'}});$i++){
-                    my $respid = $partdata->{'ResponseIds'}->[$i];
-                    my $resptype = $partdata->{'ResponseTypes'}->[$i];
-                    if ($resptype eq 'option' ){
-#                    if ($resptype eq 'option' || $resptype eq 'radiobutton') {
-                        my $value = 
-                            &Apache::lonnet::escape($res->{'symb'}.':'.$part.
-                                                    ':'.$respid.':'.$resptype);
-                        my $checked = '';
-                        if ($ENV{'form.problemchoice'} eq $value) {
-                            $checked = 'checked ';
-                        }
-                        $seq_str .= '<tr><td>'.
-  '<input type="radio" name="problemchoice" value="'.$value.'" '.$checked.'/>'.
-  '</td><td>'.
-  '<a href="'.$res->{'src'}.'">'.$res->{'title'}.'</a> ';
-#  '<a href="'.$res->{'src'}.'">'.$resptype.' '.$res->{'title'}.'</a> ';
-                        if ($partdata->{'option'} > 1) {
-                            $seq_str .= &mt('response').' '.$respid;
-                        }
-                        $seq_str .= "</td></tr>\n";
-                    }
-                }
-            }
-        }
-        if ($seq_str ne '') {
-            $Str .= '<tr><td>&nbsp</td><td><b>'.$seq->{'title'}.'</b></td>'.
-                "</tr>\n".$seq_str;
-        }
-    }
-    $Str .= "</table>\n";
-    return $Str;
-}
-
-#########################################################
-#########################################################
-##
-##              Misc functions
-##
-#########################################################
-#########################################################
-sub get_problem_symb {
-    my $problemstring = shift();
-    my ($symb,$partid,$resid,$resptype) = 
-        ($problemstring=~ /^(.*):([^:]*):([^:]*):([^:]*)$/);
-    return ($symb,$partid,$resid,$resptype);
-}
-
-sub get_resource_from_symb {
-    my ($symb) = @_;
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
-        foreach my $res (@{$seq->{'contents'}}) {
-            if ($res->{'symb'} eq $symb) {
-                return $res;
-            }
-        }
-    }
-    return undef;
-}
-
-
 #########################################################
 #########################################################
 ##
@@ -1578,6 +1444,7 @@ sub Process_OR_Row {
     my @Foilsubs   = split('&',$submission);
     for (my $j=0;$j<=$#Foilgrades;$j++) {
         my ($foilid,$correct)  = split('=',$Foilgrades[$j]);
+        $foilid = &Apache::lonnet::unescape($foilid);
         my (undef,$submission) = split('=',$Foilsubs[$j]);
         if ($correct) {
             $RowData{$foilid}->{'_correct'}++;
@@ -1590,58 +1457,6 @@ sub Process_OR_Row {
     return %RowData;
 }
 
-##
-## 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') {
-                    $Partdata{$part}->{'_Options'}=$value;
-                } elsif ($key eq 'concepts') {
-                    $Partdata{$part}->{'_Concepts'}=$value;
-                } elsif ($key =~ /^concept\.(.*)$/) {
-                    my $concept = $1;
-                    foreach my $foil (@$value) {
-                        $Partdata{$part}->{'_Foils'}->{$foil}->{'_Concept'}=
-                                                                      $concept;
-                    }
-                }
-            } else {
-                if ($key=~ /^foil\.text\.(.*)$/) {
-                    my $foil = $1;
-                    $Partdata{$part}->{'_Foils'}->{$foil}->{'name'}=$foil;
-                    $value =~ s/(\s*$|^\s*)//g;
-                    $Partdata{$part}->{'_Foils'}->{$foil}->{'text'}=$value;
-                } elsif ($key =~ /^foil\.value\.(.*)$/) {
-                    my $foil = $1;
-                    $Partdata{$part}->{'_Foils'}->{$foil}->{'value'}=$value;
-                }
-            }
-        }
-    }
-    return %Partdata;
-}
-
 1;
 
 __END__
-
-#####
-# partdata{part}->{_Foils}->{foilid}->{'name'}     = $
-#                                   ->{'text'}     = $
-#                                   ->{'value'}    = $
-#                                   ->{'_Concept'} = $
-# partdata{part}->{_Options}  = @
-# partdata{part}->{_Concepts} = @