--- loncom/interface/statistics/lonstathelpers.pm	2005/03/21 19:47:54	1.45
+++ loncom/interface/statistics/lonstathelpers.pm	2005/04/07 06:56:24	1.46
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstathelpers.pm,v 1.45 2005/03/21 19:47:54 matthew Exp $
+# $Id: lonstathelpers.pm,v 1.46 2005/04/07 06:56:24 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -49,7 +49,7 @@ routines that are needed across multiple
 package Apache::lonstathelpers;
 
 use strict;
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::loncoursedata();
@@ -154,7 +154,7 @@ sub problem_selector {
                                                      respid=>$respid,
                                                      resptype=>$resptype});
                         my $checked = '';
-                        if ($ENV{'form.problemchoice'} eq $value) {
+                        if ($env{'form.problemchoice'} eq $value) {
                             $checked = 'checked ';
                         }
                         my $title = $res->compTitle;
@@ -214,7 +214,7 @@ and their contents.  A checkbox is provi
 ####################################################
 sub MultipleProblemSelector {
     my ($navmap,$inputname,$formname)=@_;
-    my $cid = $ENV{'request.course.id'};
+    my $cid = $env{'request.course.id'};
     my $Str;
     # Massage the input as needed.
     if (! defined($navmap)) {
@@ -255,7 +255,7 @@ END
     my $iterator = $navmap->getIterator(undef, undef, undef, 1);
     my $sequence_string;
     my $seq_id = 0;
-    my @Accumulator = (&new_accumulator($ENV{'course.'.$cid.'.description'},
+    my @Accumulator = (&new_accumulator($env{'course.'.$cid.'.description'},
                                         '',
                                         '',
                                         $seq_id++,
@@ -339,11 +339,11 @@ sub get_selected_symbs {
     my ($inputfield) = @_;
     my $field = 'form.'.$inputfield;
     my @Symbs;
-    if (exists($ENV{$field})) {
-        if (! ref($ENV{$field})) {
-            @Symbs = (&Apache::lonnet::unescape($ENV{$field}));
+    if (exists($env{$field})) {
+        if (! ref($env{$field})) {
+            @Symbs = (&Apache::lonnet::unescape($env{$field}));
         } else {
-            @Symbs = (map {&Apache::lonnet::unescape($_);} @{$ENV{$field}});
+            @Symbs = (map {&Apache::lonnet::unescape($_);} @{$env{$field}});
         }
     }
     return @Symbs;
@@ -644,7 +644,7 @@ sub analyze_problem_as_student {
     my $symb = $resource->{'symb'};
     my $analysis = &get_from_analysis_cache($sname,$sdom,$symb);
     if (! defined($analysis)) {
-        my $courseid = $ENV{'request.course.id'};
+        my $courseid = $env{'request.course.id'};
         my $Answ=&Apache::lonnet::ssi($url,('grade_target' => 'analyze',
                                             'grade_domain' => $sdom,
                                             'grade_username' => $sname,
@@ -868,7 +868,7 @@ prior to every analysis lookup.
 #####################################################
 sub ensure_proper_cache {
     my ($symb) = @_;
-    my $cid = $ENV{'request.course.id'};
+    my $cid = $env{'request.course.id'};
     my $new_filename =  '/home/httpd/perl/tmp/'.
         'problemanalysis_'.$cid.'_analysis_cache.db';
     if (! defined($cache_filename) ||
@@ -1265,8 +1265,8 @@ sub limit_by_time_form {
 }
 
 sub limit_by_time {
-    if (exists($ENV{'form.limit_by_time'}) &&
-        $ENV{'form.limit_by_time'} ne '' ) {
+    if (exists($env{'form.limit_by_time'}) &&
+        $env{'form.limit_by_time'} ne '' ) {
         return 1;
     } else {
         return 0;
@@ -1306,13 +1306,13 @@ sub manage_caches {
                  } sort(&Apache::lonstatistics::get_selected_sections())
              );
     my $statuskey = $Apache::lonstatistics::enrollment_status;
-    if (exists($ENV{'form.ClearCache'}) || 
-        exists($ENV{'form.updatecaches'}) || 
-        (exists($ENV{'form.firstrun'}) && $ENV{'form.firstrun'} ne 'no') ||
-        (exists($ENV{'form.prevsection'}) &&
-            $ENV{'form.prevsection'} ne $sectionkey) ||
-        (exists($ENV{'form.prevenrollstatus'}) &&
-            $ENV{'form.prevenrollstatus'} ne $statuskey)
+    if (exists($env{'form.ClearCache'}) || 
+        exists($env{'form.updatecaches'}) || 
+        (exists($env{'form.firstrun'}) && $env{'form.firstrun'} ne 'no') ||
+        (exists($env{'form.prevsection'}) &&
+            $env{'form.prevsection'} ne $sectionkey) ||
+        (exists($env{'form.prevenrollstatus'}) &&
+            $env{'form.prevenrollstatus'} ne $statuskey)
         ) {
         if (defined($update_message)) {
             $r->print($update_message);
@@ -1333,7 +1333,7 @@ sub manage_caches {
          '<input type="hidden" name="prevenrollstatus" value="'.$statuskey.'" />'
          );
     #
-    if (! exists($ENV{'form.firstrun'})) {
+    if (! exists($env{'form.firstrun'})) {
         $r->print('<input type="hidden" name="firstrun" value="yes" />');
     } else {
         $r->print('<input type="hidden" name="firstrun" value="no" />');
@@ -1366,7 +1366,7 @@ sub gather_full_student_data {
         return if ($c->aborted());
         my $status = &Apache::loncoursedata::ensure_current_full_data
             ($student->{'username'},$student->{'domain'},
-             $ENV{'request.course.id'});
+             $env{'request.course.id'});
         &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
                                                  &mt('last student'));
     }
@@ -1413,7 +1413,7 @@ sub submission_report_form {
     my $output_selector = $/.'<select name="output">'.$/;
     foreach ('HTML','Excel','CSV') {
         $output_selector .= '    <option value="'.lc($_).'"';
-        if ($ENV{'form.output'} eq lc($_)) {
+        if ($env{'form.output'} eq lc($_)) {
             $output_selector .= ' selected ';
         }
         $output_selector .='>'.&mt($_).'</option>'.$/;