--- loncom/interface/statistics/lonproblemstatistics.pm	2005/03/27 05:08:03	1.103
+++ loncom/interface/statistics/lonproblemstatistics.pm	2005/04/07 06:56:24	1.104
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemstatistics.pm,v 1.103 2005/03/27 05:08:03 matthew Exp $
+# $Id: lonproblemstatistics.pm,v 1.104 2005/04/07 06:56:24 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -50,7 +50,7 @@ Excel files, and plots.
 package Apache::lonproblemstatistics;
 
 use strict;
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonhtmlcommon;
 use Apache::loncoursedata;
@@ -516,35 +516,35 @@ my %SelectedFields;
 sub parse_field_selection {
     #
     # Pull out the defaults
-    if (! defined($ENV{'form.fieldselections'})) {
-        $ENV{'form.fieldselections'} = [];
+    if (! defined($env{'form.fieldselections'})) {
+        $env{'form.fieldselections'} = [];
         foreach my $field (@Fields) {
             next if ($field->{'selectable'} ne 'yes');
             if ($field->{'defaultselected'} eq 'yes') {
-                push(@{$ENV{'form.fieldselections'}},$field->{'name'});
+                push(@{$env{'form.fieldselections'}},$field->{'name'});
             }
         }
     }
     #
     # Make sure the data we are plotting is there
     my %NeededFields;
-    if (exists($ENV{'form.plot'}) && $ENV{'form.plot'} ne '' &&
-        $ENV{'form.plot'} ne 'none') {
-        if ($ENV{'form.plot'} eq 'degrees') {
+    if (exists($env{'form.plot'}) && $env{'form.plot'} ne '' &&
+        $env{'form.plot'} ne 'none') {
+        if ($env{'form.plot'} eq 'degrees') {
             $NeededFields{'deg_of_diff'}++;
             $NeededFields{'deg_of_disc'}++;
-        } elsif ($ENV{'form.plot'} eq 'tries statistics') {
+        } elsif ($env{'form.plot'} eq 'tries statistics') {
             $NeededFields{'mean_tries'}++;
             $NeededFields{'std_tries'}++;
             $NeededFields{'problem_num'}++;
         } else {
-            $NeededFields{$ENV{'form.plot'}}++;
+            $NeededFields{$env{'form.plot'}}++;
         }
     }
     #
     # This should not happen, but in case it does...
-    if (ref($ENV{'form.fieldselections'}) ne 'ARRAY') {
-        $ENV{'form.fieldselections'} = [$ENV{'form.fieldselections'}];
+    if (ref($env{'form.fieldselections'}) ne 'ARRAY') {
+        $env{'form.fieldselections'} = [$env{'form.fieldselections'}];
     }
     #
     # Set the field data and the selected fields (for easier checking)
@@ -559,7 +559,7 @@ sub parse_field_selection {
             $field->{'selected'} = 'yes';
             $SelectedFields{$field->{'name'}}++;
         }
-        foreach my $selection (@{$ENV{'form.fieldselections'}}) {
+        foreach my $selection (@{$env{'form.fieldselections'}}) {
             if ($selection eq $field->{'name'} || $selection eq 'all') {
                 $field->{'selected'} = 'yes';
                 $SelectedFields{$field->{'name'}}++;
@@ -686,7 +686,7 @@ sub BuildProblemStatisticsPage {
     # Finally let the user know we are here
     my $interface = &CreateInterface($r);
     $r->print($interface);
-    $r->print('<input type="hidden" name="sortby" value="'.$ENV{'form.sortby'}.
+    $r->print('<input type="hidden" name="sortby" value="'.$env{'form.sortby'}.
               '" />');
     #
     my @CacheButtonHTML = 
@@ -697,7 +697,7 @@ sub BuildProblemStatisticsPage {
     }
     #
     $r->print($Str);
-    if (! exists($ENV{'form.firstrun'})) {
+    if (! exists($env{'form.firstrun'})) {
         $r->print('<h3>'.
                   &mt('Press "Generate Statistics" when you are ready.').
                   '</h3><p>'.
@@ -720,7 +720,7 @@ sub BuildProblemStatisticsPage {
                   '<h3>'.$navmap.'</h3>');
         return;
     }
-    if (exists($ENV{'form.Excel'})) {
+    if (exists($env{'form.Excel'})) {
         $r->print('<h4>'.
                   &Apache::lonstatistics::section_and_enrollment_description().
                   '</h4>');
@@ -748,9 +748,9 @@ sub BuildProblemStatisticsPage {
             $r->rflush();
         }
         #
-        my $sortby = $ENV{'form.sortby'};
+        my $sortby = $env{'form.sortby'};
         $sortby = 'container' if (! defined($sortby) || $sortby =~ /^\s*$/);
-        my $plot = $ENV{'form.plot'};
+        my $plot = $env{'form.plot'};
         if ($plot eq '' || $plot eq 'none') {
             undef($plot);
         }
@@ -825,7 +825,7 @@ sub output_html_stats {
     my ($r)=@_;
     &compute_all_statistics($r);
     $r->print(&html_preamble());
-    &sort_data($ENV{'form.sortby'});
+    &sort_data($env{'form.sortby'});
     #
     my $count=0;
     foreach my $data (@StatsArray) {
@@ -847,7 +847,7 @@ sub output_html_stats {
 sub html_preamble {
     my $Str='';
     $Str .= "<h2>".
-        $ENV{'course.'.$ENV{'request.course.id'}.'.description'}.
+        $env{'course.'.$env{'request.course.id'}.'.description'}.
         "</h2>\n";
     my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits();
     if (defined($starttime) || defined($endtime)) {
@@ -971,7 +971,7 @@ sub sequence_html_output {
 sub make_plot {
     my ($r,$plot) = @_;
     &compute_all_statistics($r);
-    &sort_data($ENV{'form.sortby'});
+    &sort_data($env{'form.sortby'});
     if ($plot eq 'degrees') {
         &degrees_plot($r);
     } elsif ($plot eq 'tries statistics') {
@@ -1225,8 +1225,8 @@ END
 sub plot_dropdown {
     my $current = '';
     #
-    if (defined($ENV{'form.plot'})) {
-        $current = $ENV{'form.plot'};
+    if (defined($env{'form.plot'})) {
+        $current = $env{'form.plot'};
     }
     #
     my @Additional_Plots = (
@@ -1279,7 +1279,7 @@ sub Excel_output {
     return if (! defined($excel_workbook));
     #
     # Add a worksheet
-    my $sheetname = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+    my $sheetname = $env{'course.'.$env{'request.course.id'}.'.description'};
     if (length($sheetname) > 31) {
         $sheetname = substr($sheetname,0,31);
     }
@@ -1292,7 +1292,7 @@ sub Excel_output {
     #
     # Put the course description in the header
     $excel_sheet->write($rows_output,$cols_output++,
-                   $ENV{'course.'.$ENV{'request.course.id'}.'.description'},
+                   $env{'course.'.$env{'request.course.id'}.'.description'},
                         $format->{'h1'});
     $cols_output += 3;
     #
@@ -1539,7 +1539,7 @@ sub get_statistics {
     #
     my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits();
     my $symb = $resource->symb;
-    my $courseid = $ENV{'request.course.id'};
+    my $courseid = $env{'request.course.id'};
     #
     my $data = &Apache::loncoursedata::get_problem_statistics
                         ([&Apache::lonstatistics::get_selected_sections()],
@@ -1564,7 +1564,7 @@ sub get_statistics {
         my $sections = '"'.join(' ',@Sections).'"';
         $sections =~ s/&+/_/g;  # Ensure no special characters
         $data->{'sections'}=$sections;
-        $data->{'course'} = $ENV{'request.course.id'};
+        $data->{'course'} = $env{'request.course.id'};
         my $urlres=(&Apache::lonnet::decode_symb($resource->symb))[2];
         $data->{'urlres'}=$urlres;
         my %storestats =