--- loncom/interface/Attic/lonspreadsheet.pm	2002/10/16 16:35:42	1.117
+++ loncom/interface/Attic/lonspreadsheet.pm	2002/10/18 13:46:01	1.118
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.117 2002/10/16 16:35:42 matthew Exp $
+# $Id: lonspreadsheet.pm,v 1.118 2002/10/18 13:46:01 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -61,6 +61,7 @@ use Apache::Constants qw(:common :http);
 use GDBM_File;
 use HTML::TokeParser;
 use Apache::lonhtmlcommon;
+use Apache::loncoursedata;
 #
 # Caches for coursewide information 
 #
@@ -116,60 +117,9 @@ my $tmpdir;
 # =============================================================================
 # ===================================== Implements an instance of a spreadsheet
 
-sub initsheet {
-    my $safeeval = new Safe(shift);
-    my $safehole = new Safe::Hole;
-    $safeeval->permit("entereval");
-    $safeeval->permit(":base_math");
-    $safeeval->permit("sort");
-    $safeeval->deny(":base_io");
-    $safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT');
-    $safeeval->share('$@');
-    my $code=<<'ENDDEFS';
-# ---------------------------------------------------- Inside of the safe space
-
-#
-# f: formulas
-# t: intermediate format (variable references expanded)
-# v: output values
-# c: preloaded constants (A-column)
-# rl: row label
-# os: other spreadsheets (for student spreadsheet only)
-
-undef %sheet_values; 
-undef %t;
-undef %f;
-undef %c;
-undef %rowlabel;
-undef @os;
-
-$maxrow = 0;
-$sheettype = '';
-
-# filename/reference of the sheet
-$filename = '';
-
-# user data
-$uname = '';
-$uhome = '';
-$udom  = '';
-
-# course data
-
-$csec = '';
-$chome= '';
-$cnum = '';
-$cdom = '';
-$cid  = '';
-$coursefilename  = '';
-
-# symb
-
-$usymb = '';
-
-# error messages
-$errormsg = '';
-
+##
+## mask - used to reside in the safe space.  
+##
 sub mask {
     my ($lower,$upper)=@_;
 
@@ -193,7 +143,6 @@ sub mask {
           $alpha='['.$la.'-Za-'.$ua.']';
        }
     }   
-
     if (($ld eq '*') || ($ud eq '*')) {
 	$num='\d+';
     } else {
@@ -213,7 +162,9 @@ sub mask {
        } else {
            my @lda=($ld=~m/\d/g);
            my @uda=($ud=~m/\d/g);
-           my $i; $j=0; $notdone=1;
+           my $i; 
+           my $j=0; 
+           my $notdone=1;
            for ($i=0;($i<=$#lda)&&($notdone);$i++) {
                if ($lda[$i]==$uda[$i]) {
 		   $num.=$lda[$i];
@@ -246,6 +197,65 @@ sub mask {
     return '^'.$alpha.$num."\$";
 }
 
+
+
+sub initsheet {
+    my $safeeval = new Safe(shift);
+    my $safehole = new Safe::Hole;
+    $safeeval->permit("entereval");
+    $safeeval->permit(":base_math");
+    $safeeval->permit("sort");
+    $safeeval->deny(":base_io");
+    $safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT');
+    $safehole->wrap(\&Apache::lonspreadsheet::mask,$safeeval,'&mask');
+    $safehole->wrap(\&Apache::lonspreadsheet::templaterow,$safeeval,'&templaterow');
+    $safeeval->share('$@');
+    my $code=<<'ENDDEFS';
+# ---------------------------------------------------- Inside of the safe space
+
+#
+# f: formulas
+# t: intermediate format (variable references expanded)
+# v: output values
+# c: preloaded constants (A-column)
+# rl: row label
+# os: other spreadsheets (for student spreadsheet only)
+
+undef %sheet_values; 
+undef %t;
+undef %f;
+undef %c;
+undef %rowlabel;
+undef @os;
+
+$maxrow = 0;
+$sheettype = '';
+
+# filename/reference of the sheet
+$filename = '';
+
+# user data
+$uname = '';
+$uhome = '';
+$udom  = '';
+
+# course data
+
+$csec = '';
+$chome= '';
+$cnum = '';
+$cdom = '';
+$cid  = '';
+$coursefilename  = '';
+
+# symb
+
+$usymb = '';
+
+# error messages
+$errormsg = '';
+
+
 #-------------------------------------------------------
 
 =item UWCALC(hashname,modules,units,date) 
@@ -918,20 +928,6 @@ sub calc {
     return '';
 }
 
-sub templaterow {
-    my @cols=();
-    $cols[0]='<b><font size=+1>Template</font></b>';
-    foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M',
-	     'N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
-	     'a','b','c','d','e','f','g','h','i','j','k','l','m',
-	     'n','o','p','q','r','s','t','u','v','w','x','y','z') {
-        my $fm=$f{'template_'.$_};
-        $fm=~s/[\'\"]/\&\#34;/g;
-        push(@cols,"'template_$_','$fm'".'___eq___'.$fm);
-    }
-    return @cols;
-}
-
 #
 # This is actually used for the student spreadsheet, not the assessment sheet
 # Do not be fooled by the name!
@@ -999,12 +995,28 @@ sub exportrowa {
     return @exportarray;
 }
 
+sub templaterow {
+    my @cols=();
+    $cols[0]='<b><font size=+1>Template</font></b>';
+    foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M',
+	     'N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
+	     'a','b','c','d','e','f','g','h','i','j','k','l','m',
+	     'n','o','p','q','r','s','t','u','v','w','x','y','z') {
+        my $fm=$f{'template_'.$_};
+        $fm=~s/[\'\"]/\&\#34;/g;
+        push(@cols,"'template_$_','$fm'".'___eq___'.$fm);
+    }
+    return @cols;
+}
+
+
 # ------------------------------------------- End of "Inside of the safe space"
 ENDDEFS
     $safeeval->reval($code);
     return $safeeval;
 }
 
+
 # ------------------------------------------------ Add or change formula values
 sub setformulas {
     my ($safeeval,%f)=@_;
@@ -1567,66 +1579,29 @@ sub updateclasssheet {
 
     #
     # Read class list and row labels
-    my %classlist;
-    my @tmp = &Apache::lonnet::dump('classlist',$cdom,$cnum);
-    if ($tmp[0] !~ /^error/) {
-        %classlist = @tmp;
-    } else {
-        return 'Could not access course data';
-    }
-    undef @tmp;
+    my $classlist = &Apache::loncoursedata::get_classlist();
+    if (! defined($classlist)) {
+        return 'Could not access course classlist';
+    } 
     #
     my %currentlist=();
-    my $now=time;
-    foreach my $student (keys(%classlist)) {
-        my ($end,$start)=split(/\:/,$classlist{$student});
-        my $active=1;
-        $active = 0 if (($end) && ($now>$end));
-        $active = 1 if ($ENV{'form.Status'} eq 'Any');
-        $active = !$active if ($ENV{'form.Status'} eq 'Expired');
-        if ($active) {
+    foreach my $student (keys(%$classlist)) {
+        my ($studentDomain,$studentName,$end,$start,$id,$studentSection,
+            $fullname,$status)   =   @{$classlist->{$student}};
+        if ($ENV{'form.Status'} eq $status || $ENV{'form.Status'} eq 'Any') {
             my $rowlabel='';
-            my ($studentName,$studentDomain)=split(/\:/,$student);
-            my $studentSection=&Apache::lonnet::usection($studentDomain,
-                                                         $studentName,$cid);
-            $Section{$studentName.':'.$studentDomain} = $studentSection;
-#            if ($studentSection==-1) {
-#                unless ($ENV{'form.showcsv'}) {
-#                    $rowlabel='<font color=red>Data not available: '.
-#                        $studentName.'</font>';
-#                } else {
-#                    $rowlabel='ERROR","'.$studentName.
-#                        '","Data not available","","","';
-#                }
-#            } else {
-                my %reply=&Apache::lonnet::idrget($studentDomain,$studentName);
-                my %studentInformation=&Apache::lonnet::get
-                    ('environment',
-                     ['lastname','generation','firstname','middlename','id'],
-                     $studentDomain,$studentName);
-                if (! $ENV{'form.showcsv'}) {
-                    $rowlabel='<a href="/adm/studentcalc?uname='.$studentName.
-                        '&udom='.$studentDomain.'">'.
-                            $studentSection.'&nbsp;';
-                    foreach ('id','firstname','middlename',
-                             'lastname','generation'){
-                        $rowlabel.=$studentInformation{$_}."&nbsp;";
-                    }
-                    $rowlabel.='</a>';
-                } else {
-                    $rowlabel= '"'.join('","',
-                                        ($studentSection,
-                                         $studentInformation{'id'},
-                                         $studentInformation{'firstname'},
-                                         $studentInformation{'middlename'},
-                                         $studentInformation{'lastname'},
-                                         $studentInformation{'generation'})
-                                        ).'"';
-                }
- #           }
+            if ($ENV{'form.showcsv'}) {
+                $rowlabel= '"'.join('","',($studentName,$studentDomain,
+                                           $fullname,$studentSection,$id).'"');
+            } else {
+                $rowlabel='<a href="/adm/studentcalc?uname='.$studentName.
+                    '&udom='.$studentDomain.'">';
+                $rowlabel.=$studentSection.'&nbsp;'.$id."&nbsp;".$fullname;
+                $rowlabel.='</a>';
+            }
             $currentlist{$student}=$rowlabel;
-        } # end of if ($active)
-    } # end of foreach my $student (keys(%classlist))
+        }
+    }
     #
     # Find discrepancies between the course row table and this
     #
@@ -2304,6 +2279,9 @@ sub cachedssheets {
 sub handler {
     my $r=shift;
 
+    if (! exists($ENV{'form.Status'})) {
+        $ENV{'form.Status'} = 'Active';
+    }
     # Check this server
     my $loaderror=&Apache::lonnet::overloaderror($r);
     if ($loaderror) { return $loaderror; }