--- loncom/interface/lonstatistics.pm	2002/08/14 16:18:55	1.44
+++ loncom/interface/lonstatistics.pm	2002/09/03 01:32:10	1.47.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: lonstatistics.pm,v 1.44 2002/08/14 16:18:55 stredwic Exp $
+# $Id: lonstatistics.pm,v 1.47.2.1 2002/09/03 01:32:10 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -123,6 +123,8 @@ sub ProcessFormData{
     &CheckFormElement($cache, 'ProblemStatisticsSort',
                       'ProblemStatisticsSort', 'Homework Sets Order');
     &CheckFormElement($cache, 'DisplayLegend', 'DisplayLegend', 'Hide Legend');
+    &CheckFormElement($cache, 'SortProblems', 'SortProblems', 
+                      'Sort Within Sequence');
 
     # Search only form elements
     my @headingColumns=();
@@ -316,14 +318,14 @@ sub PrepareData {
         return "Unable to tie hash to db file.";
     }
 
-    if(!$isCached) {
+#    if(!$isCached) {
         my $processTopResourceMapReturn=
-            &Apache::loncoursedata::ProcessTopResourceMap(\%cache, $c, $r);
+            &Apache::loncoursedata::ProcessTopResourceMap(\%cache, $c);
         if($processTopResourceMapReturn ne 'OK') {
             untie(%cache);
             return $processTopResourceMapReturn;
         }
-    }
+ #   }
 
     if($c->aborted()) {
         untie(%cache);
@@ -514,7 +516,7 @@ sub BuildStatistics {
     my $cacheDB = "/home/httpd/perl/tmp/$ENV{'user.name'}".
                   "_$ENV{'user.domain'}_$courseID\_statistics.db";
 
-    $r->print(&Apache::lonhtmlcommon::Title('LON-CAPA Statistics'));
+    $r->print(&Apache::lonhtmlcommon::Title('Course Statistics and Charts'));
 
     my ($returnValue, $students) = &PrepareData($c, $cacheDB, 
                                                 \@studentInformation, 
@@ -541,7 +543,7 @@ sub BuildStatistics {
         }
 
         if(defined($cache{'OptionResponses'})) {
-            $reports{'problem_analysis'} = 'Problem Analysis';
+            $reports{'problem_analysis'} = 'Option Response Analysis';
         }
 
         $r->print('<form name="Statistics" ');
@@ -561,7 +563,7 @@ sub BuildStatistics {
                                                                   $students, 
                                                                   $courseID, 
                                                                   $c,$r);
-    } elsif($GoToPage eq 'Problem Analysis') {
+    } elsif($GoToPage eq 'Option Response Analysis') {
         &Apache::lonproblemanalysis::BuildProblemAnalysisPage($cacheDB, $r);
     } elsif($GoToPage eq 'Student Assessment') {
         &Apache::lonstudentassessment::BuildStudentAssessmentPage($cacheDB,
@@ -580,7 +582,8 @@ sub BuildStatistics {
         $courseDescription =~ s/\ /"_"/eg;
         &Apache::lonproblemstatistics::BuildGraphicChart($GoToPage, $cacheDB,
                                                          $courseDescription,
-                                                         $r);
+                                                         $students, $courseID,
+                                                         $r, $c);
     } elsif($GoToPage eq 'Class list') {
         &BuildClasslist($cacheDB, $students, \@studentInformation,
                         \@headings, $r);