--- loncom/interface/Attic/lonspreadsheet.pm	2002/07/04 17:51:32	1.93
+++ loncom/interface/Attic/lonspreadsheet.pm	2002/10/29 16:04:13	1.130
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.93 2002/07/04 17:51:32 www Exp $
+# $Id: lonspreadsheet.pm,v 1.130 2002/10/29 16:04:13 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,16 +26,6 @@
 # The LearningOnline Network with CAPA
 # Spreadsheet/Grades Display Handler
 #
-# 11/11,11/15,11/27,12/04,12/05,12/06,12/07,
-# 12/08,12/09,12/11,12/12,12/15,12/16,12/18,12/19,12/30,
-# 01/01/01,02/01,03/01,19/01,20/01,22/01,
-# 03/05,03/08,03/10,03/12,03/13,03/15,03/17,
-# 03/19,03/20,03/21,03/27,04/05,04/09,
-# 07/09,07/14,07/21,09/01,09/10,9/11,9/12,9/13,9/14,9/17,
-# 10/16,10/17,10/20,11/05,11/28,12/27 Gerd Kortemeyer
-# 01/14/02 Matthew
-# 02/04/02 Matthew
-
 # POD required stuff:
 
 =head1 NAME
@@ -54,7 +44,6 @@ not the grades of their peers.  The spre
 offering the ability to use Perl code to manipulate data, as well as many
 built-in functions.
 
-
 =head2 Functions available to user of lonspreadsheet
 
 =over 4
@@ -71,6 +60,12 @@ use Apache::lonnet;
 use Apache::Constants qw(:common :http);
 use GDBM_File;
 use HTML::TokeParser;
+use Apache::lonhtmlcommon;
+use Apache::loncoursedata;
+#
+# Caches for coursewide information 
+#
+my %Section;
 
 #
 # Caches for previously calculated spreadsheets
@@ -106,6 +101,14 @@ my %courseopt;
 my %useropt;
 my %parmhash;
 
+#
+# Some hashes for stats on timing and performance
+#
+
+my %starttimes;
+my %usedtimes;
+my %numbertimes;
+
 # Stuff that only the screen handler can know
 
 my $includedir;
@@ -114,73 +117,22 @@ 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');
-    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 %v; 
-undef %t;
-undef %f;
-undef %c;
-undef %rl;
-undef @os;
-
-$maxrow=0;
-$sheettype='';
-
-# filename/reference of the sheet
-
-$filename='';
-
-# user data
-$uname='';
-$uhome='';
-$udom='';
-
-# course data
-
-$csec='';
-$chome='';
-$cnum='';
-$cdom='';
-$cid='';
-$cfn='';
-
-# symb
-
-$usymb='';
-
+##
+## mask - used to reside in the safe space.  
+##
 sub mask {
     my ($lower,$upper)=@_;
-
-    $lower=~/([A-Za-z]|\*)(\d+|\*)/;
-    my $la=$1;
-    my $ld=$2;
-
-    $upper=~/([A-Za-z]|\*)(\d+|\*)/;
-    my $ua=$1;
-    my $ud=$2;
+    #
+    my ($la,$ld) = ($lower=~/([A-Za-z]|\*)(\d+|\*)/);
+    my ($ua,$ud) = ($upper=~/([A-Za-z]|\*)(\d+|\*)/);
+    #
     my $alpha='';
     my $num='';
-
+    #
     if (($la eq '*') || ($ua eq '*')) {
        $alpha='[A-Za-z]';
     } else {
+        
        if (($la=~/[A-Z]/) && ($ua=~/[A-Z]/) ||
            ($la=~/[a-z]/) && ($ua=~/[a-z]/)) {
           $alpha='['.$la.'-'.$ua.']';
@@ -188,7 +140,6 @@ sub mask {
           $alpha='['.$la.'-Za-'.$ua.']';
        }
     }   
-
     if (($ld eq '*') || ($ud eq '*')) {
 	$num='\d+';
     } else {
@@ -208,7 +159,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];
@@ -232,8 +185,8 @@ sub mask {
                }
                $num.=')';
            } else {
-               if ($lda[$#lda]!=$uda[$#uda]) {
-                  $num.='['.$lda[$#lda].'-'.$uda[$#uda].']';
+               if ($lda[-1]!=$uda[-1]) {
+                  $num.='['.$lda[-1].'-'.$uda[-1].']';
 	       }
            }
        }
@@ -241,6 +194,79 @@ 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');
+    $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;   # Holds the (computed, final) values for the sheet
+    # This is only written to by &calc, the spreadsheet computation routine.
+    # It is read by many functions
+undef %t; # Holds the values of the spreadsheet temporarily. Set in &sett, 
+    # which does the translation of strings like C5 into the value in C5.
+    # Used in &calc - %t holds the values that are actually eval'd.
+undef %f;    # Holds the formulas for each cell.  This is the users
+    # (spreadsheet authors) data for each cell.
+    # set by &setformulas and returned by &getformulas
+    # &setformulas is called by &readsheet, &tmpread, &updateclasssheet,
+    # &updatestudentassesssheet, &loadstudent, &loadcourse
+    # &getformulas is called by &writesheet, &tmpwrite, &updateclasssheet,
+    # &updatestudentassesssheet, &loadstudent, &loadcourse, &loadassessment, 
+undef %c; # Holds the constants for a sheet.  In the assessment
+    # sheets, this is the A column.  Used in &MINPARM, &MAXPARM, &expandnamed,
+    # &sett, and &setconstants.  There is no &getconstants.
+    # &setconstants is called by &loadstudent, &loadcourse, &load assessment,
+undef @os;  # Holds the names of other spreadsheets - this is used to specify
+    # the spreadsheets that are available for the assessment sheet.
+    # Set by &setothersheets.  &setothersheets is called by &handler.  A
+    # related subroutine is &othersheets.
+
+$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) 
@@ -372,8 +398,8 @@ sub CDLHASH {
     if ($key =~ /[A-z](\-[A-z])?\d+(\-\d+)?/) {
 	my $keymask = &mask($key);
 	# Assume the keys are addresses
-	my @Temp = grep /$keymask/,keys(%v);
-	@Keys = $v{@Temp};
+	my @Temp = grep /$keymask/,keys(%sheet_values);
+	@Keys = $sheet_values{@Temp};
     } else {
 	$Keys[0]= $key;
     }
@@ -384,8 +410,8 @@ sub CDLHASH {
     @Keys = @Temp;
     if ($value =~ /[A-z](\-[A-z])?\d+(\-\d+)?/) {
 	my $valmask = &mask($value);
-	my @Temp = grep /$valmask/,keys(%v);
-	@Values =$v{@Temp};
+	my @Temp = grep /$valmask/,keys(%sheet_values);
+	@Values =$sheet_values{@Temp};
     } else {
 	$Values[0]= $value;
     }
@@ -419,7 +445,7 @@ sub GETHASH {
 	$index = 0;
     }
     if ($key =~ /^[A-z]\d+$/) {
-	$key = $v{$key};
+	$key = $sheet_values{$key};
     }
     return $hashes{$name}->{$key}->[$index];
 }
@@ -476,8 +502,8 @@ sub HASH {
     if ($key =~ /[A-z](\-[A-z])?\d+(\-\d+)?/) {
 	my $keymask = &mask($key);
 	# Assume the keys are addresses
-	my @Temp = grep /$keymask/,keys(%v);
-	@Keys = $v{@Temp};
+	my @Temp = grep /$keymask/,keys(%sheet_values);
+	@Keys = $sheet_values{@Temp};
     } else {
 	$Keys[0]= $key;
     }
@@ -489,8 +515,8 @@ sub HASH {
     # Check to see if we have multiple $value(s) 
     if ($value =~ /[A-z](\-[A-z])?\d+(\-\d+)?/) {
 	my $valmask = &mask($value);
-	my @Temp = grep /$valmask/,keys(%v);
-	@Values =$v{@Temp};
+	my @Temp = grep /$valmask/,keys(%sheet_values);
+	@Values =$sheet_values{@Temp};
     } else {
 	$Values[0]= $value;
     }
@@ -519,7 +545,7 @@ returns the number of items in the range
 #-------------------------------------------------------
 sub NUM {
     my $mask=mask(@_);
-    my $num= $#{@{grep(/$mask/,keys(%v))}}+1;
+    my $num= $#{@{grep(/$mask/,keys(%sheet_values))}}+1;
     return $num;   
 }
 
@@ -527,8 +553,8 @@ sub BIN {
     my ($low,$high,$lower,$upper)=@_;
     my $mask=mask($lower,$upper);
     my $num=0;
-    foreach (grep /$mask/,keys(%v)) {
-        if (($v{$_}>=$low) && ($v{$_}<=$high)) {
+    foreach (grep /$mask/,keys(%sheet_values)) {
+        if (($sheet_values{$_}>=$low) && ($sheet_values{$_}<=$high)) {
             $num++;
         }
     }
@@ -548,8 +574,8 @@ returns the sum of items in the range.
 sub SUM {
     my $mask=mask(@_);
     my $sum=0;
-    foreach (grep /$mask/,keys(%v)) {
-        $sum+=$v{$_};
+    foreach (grep /$mask/,keys(%sheet_values)) {
+        $sum+=$sheet_values{$_};
     }
     return $sum;   
 }
@@ -566,8 +592,8 @@ compute the average of the items in the
 sub MEAN {
     my $mask=mask(@_);
     my $sum=0; my $num=0;
-    foreach (grep /$mask/,keys(%v)) {
-        $sum+=$v{$_};
+    foreach (grep /$mask/,keys(%sheet_values)) {
+        $sum+=$sheet_values{$_};
         $num++;
     }
     if ($num) {
@@ -589,15 +615,15 @@ compute the standard deviation of the it
 sub STDDEV {
     my $mask=mask(@_);
     my $sum=0; my $num=0;
-    foreach (grep /$mask/,keys(%v)) {
-        $sum+=$v{$_};
+    foreach (grep /$mask/,keys(%sheet_values)) {
+        $sum+=$sheet_values{$_};
         $num++;
     }
     unless ($num>1) { return undef; }
     my $mean=$sum/$num;
     $sum=0;
-    foreach (grep /$mask/,keys(%v)) {
-        $sum+=($v{$_}-$mean)**2;
+    foreach (grep /$mask/,keys(%sheet_values)) {
+        $sum+=($sheet_values{$_}-$mean)**2;
     }
     return sqrt($sum/($num-1));    
 }
@@ -614,8 +640,8 @@ compute the product of the items in the
 sub PROD {
     my $mask=mask(@_);
     my $prod=1;
-    foreach (grep /$mask/,keys(%v)) {
-        $prod*=$v{$_};
+    foreach (grep /$mask/,keys(%sheet_values)) {
+        $prod*=$sheet_values{$_};
     }
     return $prod;   
 }
@@ -632,9 +658,9 @@ compute the maximum of the items in the
 sub MAX {
     my $mask=mask(@_);
     my $max='-';
-    foreach (grep /$mask/,keys(%v)) {
-        unless ($max) { $max=$v{$_}; }
-        if (($v{$_}>$max) || ($max eq '-')) { $max=$v{$_}; }
+    foreach (grep /$mask/,keys(%sheet_values)) {
+        unless ($max) { $max=$sheet_values{$_}; }
+        if (($sheet_values{$_}>$max) || ($max eq '-')) { $max=$sheet_values{$_}; }
     } 
     return $max;   
 }
@@ -651,9 +677,11 @@ compute the minimum of the items in the
 sub MIN {
     my $mask=mask(@_);
     my $min='-';
-    foreach (grep /$mask/,keys(%v)) {
-        unless ($max) { $max=$v{$_}; }
-        if (($v{$_}<$min) || ($min eq '-')) { $min=$v{$_}; }
+    foreach (grep /$mask/,keys(%sheet_values)) {
+        unless ($max) { $max=$sheet_values{$_}; }
+        if (($sheet_values{$_}<$min) || ($min eq '-')) { 
+            $min=$sheet_values{$_}; 
+        }
     }
     return $min;   
 }
@@ -672,8 +700,8 @@ sub SUMMAX {
     my ($num,$lower,$upper)=@_;
     my $mask=mask($lower,$upper);
     my @inside=();
-    foreach (grep /$mask/,keys(%v)) {
-	push (@inside,$v{$_});
+    foreach (grep /$mask/,keys(%sheet_values)) {
+	push (@inside,$sheet_values{$_});
     }
     @inside=sort(@inside);
     my $sum=0; my $i;
@@ -697,8 +725,8 @@ sub SUMMIN {
     my ($num,$lower,$upper)=@_;
     my $mask=mask($lower,$upper);
     my @inside=();
-    foreach (grep /$mask/,keys(%v)) {
-	$inside[$#inside+1]=$v{$_};
+    foreach (grep /$mask/,keys(%sheet_values)) {
+	$inside[$#inside+1]=$sheet_values{$_};
     }
     @inside=sort(@inside);
     my $sum=0; my $i;
@@ -708,6 +736,53 @@ sub SUMMIN {
     return $sum;   
 }
 
+#-------------------------------------------------------
+
+=item MINPARM(parametername)
+
+Returns the minimum value of the parameters matching the parametername.
+parametername should be a string such as 'duedate'.
+
+=cut
+
+#-------------------------------------------------------
+sub MINPARM {
+    my ($expression) = @_;
+    my $min = undef;
+    study($expression);
+    foreach $parameter (keys(%c)) {
+        next if ($parameter !~ /$expression/);
+        if ((! defined($min)) || ($min > $c{$parameter})) {
+            $min = $c{$parameter} 
+        }
+    }
+    return $min;
+}
+
+#-------------------------------------------------------
+
+=item MAXPARM(parametername)
+
+Returns the maximum value of the parameters matching the input parameter name.
+parametername should be a string such as 'duedate'.
+
+=cut
+
+#-------------------------------------------------------
+sub MAXPARM {
+    my ($expression) = @_;
+    my $max = undef;
+    study($expression);
+    foreach $parameter (keys(%c)) {
+        next if ($parameter !~ /$expression/);
+        if ((! defined($min)) || ($max < $c{$parameter})) {
+            $max = $c{$parameter} 
+        }
+    }
+    return $max;
+}
+
+#--------------------------------------------------------
 sub expandnamed {
     my $expression=shift;
     if ($expression=~/^\&/) {
@@ -753,10 +828,22 @@ sub expandnamed {
         foreach $parameter (keys(%c)) {
             push @matches,$parameter if ($parameter =~ /$expression/);
         }
-        if ($#matches == 0) {
+        if (scalar(@matches) == 0) {
+            $returnvalue = 'unmatched parameter: '.$parameter;
+        } elsif (scalar(@matches) == 1) {
             $returnvalue = '$c{\''.$matches[0].'\'}';
+        } elsif (scalar(@matches) > 0) {
+            # more than one match.  Look for a concise one
+            $returnvalue =  "'non-unique parameter name : $expression'";
+            foreach (@matches) {
+                if (/^$expression$/) {
+                    $returnvalue = '$c{\''.$_.'\'}';
+                }
+            }
         } else {
-            $returnvalue =  "'bad parameter name : $expression'";
+            # There was a negative number of matches, which indicates 
+            # something is wrong with reality.  Better warn the user.
+            $returnvalue = 'bizzare parameter: '.$parameter;
         }
         return $returnvalue;
     }
@@ -770,34 +857,32 @@ sub sett {
     } else {
         $pattern='[A-Z]';
     }
+    # Deal with the template row
     foreach (keys(%f)) {
-	if ($_=~/template\_(\w)/) {
-	  my $col=$1;
-          unless ($col=~/^$pattern/) {
-	    foreach (keys(%f)) {
-	      if ($_=~/A(\d+)/) {
-		my $trow=$1;
-                if ($trow) {
-                    # Get the name of this cell
-		    my $lb=$col.$trow;
-                    # Grab the template declaration
-                    $t{$lb}=$f{'template_'.$col};
-                    # Replace '#' with the row number
-                    $t{$lb}=~s/\#/$trow/g;
-                    # Replace '....' with ','
-                    $t{$lb}=~s/\.\.+/\,/g;
-                    # Replace 'A0' with the value from 'A0'
-                    $t{$lb}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g;
-                    # Replace parameters
-                    $t{$lb}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.&expandnamed($2)/ge;
-                }
-	      }
-	    }
-	  }
-      }
+	next if ($_!~/template\_(\w)/);
+        my $col=$1;
+        next if ($col=~/^$pattern/);
+        foreach (keys(%f)) {
+            next if ($_!~/A(\d+)/);
+            my $trow=$1;
+            next if (! $trow);
+            # Get the name of this cell
+            my $lb=$col.$trow;
+            # Grab the template declaration
+            $t{$lb}=$f{'template_'.$col};
+            # Replace '#' with the row number
+            $t{$lb}=~s/\#/$trow/g;
+            # Replace '....' with ','
+            $t{$lb}=~s/\.\.+/\,/g;
+            # Replace 'A0' with the value from 'A0'
+            $t{$lb}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$sheet_values\{\'$2\'\}/g;
+            # Replace parameters
+            $t{$lb}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.&expandnamed($2)/ge;
+        }
     }
+    # Deal with the normal cells
     foreach (keys(%f)) {
-	if (($f{$_}) && ($_!~/template\_/)) {
+	if (exists($f{$_}) && ($_!~/template\_/)) {
             my $matches=($_=~/^$pattern(\d+)/);
             if  (($matches) && ($1)) {
 	        unless ($f{$_}=~/^\!/) {
@@ -806,95 +891,131 @@ sub sett {
             } else {
 	       $t{$_}=$f{$_};
                $t{$_}=~s/\.\.+/\,/g;
-               $t{$_}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g;
+               $t{$_}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$sheet_values\{\'$2\'\}/g;
                $t{$_}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.&expandnamed($2)/ge;
             }
         }
     }
+    # For inserted lines, [B-Z] is also valid
+    unless ($sheettype eq 'assesscalc') {
+       foreach (keys(%f)) {
+	   if ($_=~/[B-Z](\d+)/) {
+	       if ($f{'A'.$1}=~/^[\~\-]/) {
+  	          $t{$_}=$f{$_};
+                  $t{$_}=~s/\.\.+/\,/g;
+                  $t{$_}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$sheet_values\{\'$2\'\}/g;
+                  $t{$_}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.&expandnamed($2)/ge;
+               }
+           }
+       }
+    }
     # For some reason 'A0' gets special treatment...  This seems superfluous
     # but I imagine it is here for a reason.
     $t{'A0'}=$f{'A0'};
     $t{'A0'}=~s/\.\.+/\,/g;
-    $t{'A0'}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g;
+    $t{'A0'}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$sheet_values\{\'$2\'\}/g;
     $t{'A0'}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.&expandnamed($2)/ge;
 }
 
 sub calc {
-    %v=();
+    undef %sheet_values;
     &sett();
     my $notfinished=1;
+    my $lastcalc='';
     my $depth=0;
     while ($notfinished) {
 	$notfinished=0;
         foreach (keys(%t)) {
-            my $old=$v{$_};
-            $v{$_}=eval($t{$_});
+            my $old=$sheet_values{$_};
+            $sheet_values{$_}=eval $t{$_};
 	    if ($@) {
-		%v=();
-                return $@;
+		undef %sheet_values;
+                return $_.': '.$@;
             }
-	    if ($v{$_} ne $old) { $notfinished=1; }
+	    if ($sheet_values{$_} ne $old) { $notfinished=1; $lastcalc=$_; }
         }
         $depth++;
         if ($depth>100) {
-	    %v=();
-            return 'Maximum calculation depth exceeded';
+	    undef %sheet_values;
+            return $lastcalc.': Maximum calculation depth exceeded';
         }
     }
     return '';
 }
 
+# ------------------------------------------- End of "Inside of the safe space"
+ENDDEFS
+    $safeeval->reval($code);
+    return $safeeval;
+}
+
+#
+#
+#
 sub templaterow {
+    my $sheet = shift;
     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_'.$_};
+        my $fm=$sheet->{'f'}->{'template_'.$_};
         $fm=~s/[\'\"]/\&\#34;/g;
-        $cols[$#cols+1]="'template_$_','$fm'".'___eq___'.$fm;
+        push(@cols,"'template_$_','$fm'".'___eq___'.$fm);
     }
     return @cols;
 }
 
+
 sub outrowassess {
-    my $n=shift;
+    # $n is the current row number
+    my $sheet = shift;
+    my $n=shift; 
+    my $csv = $ENV{'form.showcsv'};
     my @cols=();
     if ($n) {
-       my ($usy,$ufn)=split(/\_\_\&\&\&\_\_/,$f{'A'.$n});
-      if ($rl{$usy}) {
-       $cols[0]=$rl{$usy}.'<br>'.
-                '<select name="sel_'.$n.'" onChange="changesheet('.$n.
-                ')"><option name="default">Default</option>';
-      } else { $cols[0]=''; }
-       foreach (@os) {
-           $cols[0].='<option name="'.$_.'"';
-            if ($ufn eq $_) {
-               $cols[0].=' selected';
+        my ($usy,$ufn)=split(/__&&&\__/,$sheet->{'f'}->{'A'.$n});
+        if ($sheet->{'rowlabel'}->{$usy}) {
+            $cols[0]=&format_rowlabel($sheet->{'rowlabel'}->{$usy});
+            if (! $csv) {
+                $cols[0].='<br>'.
+                '<select name="sel_'.$n.'" onChange="changesheet('.$n.')">'.
+                    '<option name="default">Default</option>';
             }
-            $cols[0].='>'.$_.'</option>';
-       }
-       $cols[0].='</select>';
+        } else { 
+            $cols[0]=''; 
+        }
+        if (! $csv) {
+            foreach (@{$sheet->{'othersheets'}}) {
+                $cols[0].='<option name="'.$_.'"';
+                if ($ufn eq $_) {
+                    $cols[0].=' selected';
+                }
+                $cols[0].='>'.$_.'</option>';
+            }
+            $cols[0].='</select>';
+        }
     } else {
-       $cols[0]='<b><font size=+1>Export</font></b>';
+        $cols[0]='<b><font size=+1>Export</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{$_.$n};
+        my $fm=$sheet->{'f'}->{$_.$n};
         $fm=~s/[\'\"]/\&\#34;/g;
-        push(@cols,"'$_$n','$fm'".'___eq___'.$v{$_.$n});
+        push(@cols,"'$_$n','$fm'".'___eq___'.$sheet->{'values'}->{$_.$n});
     }
     return @cols;
 }
 
 sub outrow {
+    my $sheet=shift;
     my $n=shift;
     my @cols=();
     if ($n) {
-       $cols[0]=$rl{$f{'A'.$n}};
+        $cols[0]=&format_rowlabel($sheet->{'rowlabel'}->{$sheet->{'f'}->{'A'.$n}});
     } else {
        $cols[0]='<b><font size=+1>Export</font></b>';
     }
@@ -902,190 +1023,87 @@ sub outrow {
 	     '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{$_.$n};
+        my $fm=$sheet->{'f'}->{$_.$n};
         $fm=~s/[\'\"]/\&\#34;/g;
-        $cols[$#cols+1]="'$_$n','$fm'".'___eq___'.$v{$_.$n};
+        push(@cols,"'$_$n','$fm'".'___eq___'.$sheet->{'values'}->{$_.$n});
     }
     return @cols;
 }
 
-sub exportrowa {
-    my @exportarray=();
-    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') {
-	$exportarray[$#exportarray+1]=$v{$_.'0'};
-    } 
-    return @exportarray;
-}
-
-# ------------------------------------------- End of "Inside of the safe space"
-ENDDEFS
-    $safeeval->reval($code);
-    return $safeeval;
-}
-
 # ------------------------------------------------ Add or change formula values
-
 sub setformulas {
-    my ($safeeval,%f)=@_;
-    %{$safeeval->varglob('f')}=%f;
+    my ($sheet)=shift;
+    %{$sheet->{'safe'}->varglob('f')}=%{$sheet->{'f'}};
 }
 
 # ------------------------------------------------ Add or change formula values
-
 sub setconstants {
-    my ($safeeval,%c)=@_;
-    %{$safeeval->varglob('c')}=%c;
+    my ($sheet)=shift;
+    my ($constants) = @_;
+    if (! ref($constants)) {
+        my %tmp = @_;
+        $constants = \%tmp;
+    }
+    $sheet->{'constants'} = $constants;
+    return %{$sheet->{'safe'}->varglob('c')}=%{$sheet->{'constants'}};
 }
 
 # --------------------------------------------- Set names of other spreadsheets
-
 sub setothersheets {
-    my ($safeeval,@os)=@_;
-    @{$safeeval->varglob('os')}=@os;
+    my $sheet = shift;
+    my @othersheets = @_;
+    $sheet->{'othersheets'} = \@othersheets;
+    @{$sheet->{'safe'}->varglob('os')}=@othersheets;
+    return;
 }
 
 # ------------------------------------------------ Add or change formula values
-
 sub setrowlabels {
-    my ($safeeval,%rl)=@_;
-    %{$safeeval->varglob('rl')}=%rl;
+    my $sheet=shift;
+    my ($rowlabel) = @_;
+    if (! ref($rowlabel)) {
+        my %tmp = @_;
+        $rowlabel = \%tmp;
+    }
+    $sheet->{'rowlabel'}=$rowlabel;
 }
 
 # ------------------------------------------------------- Calculate spreadsheet
-
 sub calcsheet {
-    my $safeeval=shift;
-    $safeeval->reval('&calc();');
-}
-
-# ------------------------------------------------------------------ Get values
-
-sub getvalues {
-    my $safeeval=shift;
-    return $safeeval->reval('%v');
+    my $sheet=shift;
+    my $result =  $sheet->{'safe'}->reval('&calc();');
+    %{$sheet->{'values'}} = %{$sheet->{'safe'}->varglob('sheet_values')};
+    return $result;
 }
 
 # ---------------------------------------------------------------- Get formulas
-
 sub getformulas {
-    my $safeeval=shift;
-    return %{$safeeval->varglob('f')};
-}
-
-# -------------------------------------------------------------------- Get type
-
-sub gettype {
-    my $safeeval=shift;
-    return $safeeval->reval('$sheettype');
-}
-
-# ------------------------------------------------------------------ Set maxrow
-
-sub setmaxrow {
-    my ($safeeval,$row)=@_;
-    $safeeval->reval('$maxrow='.$row.';');
-}
-
-# ------------------------------------------------------------------ Get maxrow
-
-sub getmaxrow {
-    my $safeeval=shift;
-    return $safeeval->reval('$maxrow');
-}
-
-# ---------------------------------------------------------------- Set filename
-
-sub setfilename {
-    my ($safeeval,$fn)=@_;
-    $safeeval->reval('$filename="'.$fn.'";');
-}
-
-# ---------------------------------------------------------------- Get filename
-
-sub getfilename {
-    my $safeeval=shift;
-    return $safeeval->reval('$filename');
-}
-
-# --------------------------------------------------------------- Get course ID
-
-sub getcid {
-    my $safeeval=shift;
-    return $safeeval->reval('$cid');
+    my $sheet = shift;
+    return %{$sheet->{'safe'}->varglob('f')};
 }
 
-# --------------------------------------------------------- Get course filename
-
-sub getcfn {
-    my $safeeval=shift;
-    return $safeeval->reval('$cfn');
-}
-
-# ----------------------------------------------------------- Get course number
-
-sub getcnum {
-    my $safeeval=shift;
-    return $safeeval->reval('$cnum');
-}
-
-# ------------------------------------------------------------- Get course home
-
-sub getchome {
-    my $safeeval=shift;
-    return $safeeval->reval('$chome');
-}
-
-# ----------------------------------------------------------- Get course domain
-
-sub getcdom {
-    my $safeeval=shift;
-    return $safeeval->reval('$cdom');
-}
-
-# ---------------------------------------------------------- Get course section
-
-sub getcsec {
-    my $safeeval=shift;
-    return $safeeval->reval('$csec');
-}
-
-# --------------------------------------------------------------- Get user name
-
-sub getuname {
-    my $safeeval=shift;
-    return $safeeval->reval('$uname');
-}
-
-# ------------------------------------------------------------- Get user domain
-
-sub getudom {
-    my $safeeval=shift;
-    return $safeeval->reval('$udom');
-}
-
-# --------------------------------------------------------------- Get user home
-
-sub getuhome {
-    my $safeeval=shift;
-    return $safeeval->reval('$uhome');
-}
-
-# -------------------------------------------------------------------- Get symb
-
-sub getusymb {
-    my $safeeval=shift;
-    return $safeeval->reval('$usymb');
+# ----------------------------------------------------- Get value of $f{'A'.$n}
+sub getfa {
+    my $sheet = shift;
+    my ($n)=@_;
+    return $sheet->{'safe'}->reval('$f{"A'.$n.'"}');
 }
 
 # ------------------------------------------------------------- Export of A-row
-
 sub exportdata {
-    my $safeeval=shift;
-    return $safeeval->reval('&exportrowa()');
+    my $sheet=shift;
+    my @exportarray=();
+    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') {
+        if (exists($sheet->{'values'}->{$_.'0'})) {
+            push(@exportarray,$sheet->{'values'}->{$_.'0'});
+        } else {
+            push(@exportarray,'');
+        }
+    } 
+    return @exportarray;
 }
 
-
 # ========================================================== End of Spreadsheet
 # =============================================================================
 
@@ -1095,148 +1113,168 @@ sub exportdata {
 # --------------------------------------------- Produce output row n from sheet
 
 sub rown {
-    my ($safeeval,$n)=@_;
+    my ($sheet,$n)=@_;
     my $defaultbg;
     my $rowdata='';
     my $dataflag=0;
     unless ($n eq '-') {
-       $defaultbg=((($n-1)/5)==int(($n-1)/5))?'#E0E0':'#FFFF';
+        $defaultbg=((($n-1)/5)==int(($n-1)/5))?'#E0E0':'#FFFF';
     } else {
-       $defaultbg='#E0FF';
+        $defaultbg='#E0FF';
     }
     unless ($ENV{'form.showcsv'}) {
-       $rowdata.="\n<tr><td><b><font size=+1>$n</font></b></td>";
+        $rowdata.="\n<tr><td><b><font size=+1>$n</font></b></td>";
     } else {
-       $rowdata.="\n".'"'.$n.'"';
+        $rowdata.="\n".'"'.$n.'"';
     }
     my $showf=0;
-    my $proc;
-    my $maxred;
-    my $sheettype=&gettype($safeeval);
+    #
+    # Determine how many pink (uneditable) cells there are in this sheet.
+    my $maxred=1;
+    my $sheettype=$sheet->{'sheettype'};
     if ($sheettype eq 'studentcalc') {
-        $proc='&outrowassess';
         $maxred=26;
-    } else {
-        $proc='&outrow';
-    }
-    if ($sheettype eq 'assesscalc') {
+    } elsif ($sheettype eq 'assesscalc') {
         $maxred=1;
     } else {
         $maxred=26;
     }
-    if ($n eq '-') { $proc='&templaterow'; $n=-1; $dataflag=1; }
-    foreach ($safeeval->reval($proc.'('.$n.')')) {
-       my $bgcolor=$defaultbg.((($showf-1)/5==int(($showf-1)/5))?'99':'DD');
-       my ($fm,$vl)=split(/\_\_\_eq\_\_\_/,$_);
-       if ((($vl ne '') || ($vl eq '0')) &&
-           (($showf==1) || ($sheettype ne 'studentcalc'))) { $dataflag=1; }
-       if ($showf==0) { $vl=$_; }
-      unless ($ENV{'form.showcsv'}) {
-       if ($showf<=$maxred) { $bgcolor='#FFDDDD'; }
-       if (($n==0) && ($showf<=26)) { $bgcolor='#CCCCFF'; } 
-       if (($showf>$maxred) || ((!$n) && ($showf>0))) {
-	   if ($vl eq '') {
-	       $vl='<font size=+2 color='.$bgcolor.'>&#35;</font>';
-           }
-           $rowdata.=
-       '<td bgcolor='.$bgcolor.'><a href="javascript:celledit('.$fm.');">'.$vl.
-	       '</a></td>';
-       } else {
-           $rowdata.='<td bgcolor='.$bgcolor.'>&nbsp;'.$vl.'&nbsp;</td>';
-       }
-      } else {
-	  $rowdata.=',"'.$vl.'"';
-      }
-       $showf++;
+    $maxred=1 if (&getfa($sheet,$n)=~/^[\~\-]/);
+    #
+    # Get the proper row
+    my @rowdata;
+    if ($n eq '-') { 
+        @rowdata = &templaterow($sheet);
+        $n=-1; 
+        $dataflag=1; 
+    } elsif ($sheettype eq 'studentcalc') {
+        @rowdata = &outrowassess($sheet,$n);
+    } else {
+        @rowdata = &outrow($sheet,$n);
+    }
+    #
+    foreach (@rowdata) {
+        my $bgcolor=$defaultbg.((($showf-1)/5==int(($showf-1)/5))?'99':'DD');
+        my ($fm,$vl)=split(/\_\_\_eq\_\_\_/,$_);
+        if ((($vl ne '') || ($vl eq '0')) &&
+            (($showf==1) || ($sheettype ne 'studentcalc'))) { $dataflag=1; }
+        if ($showf==0) { $vl=$_; }
+        unless ($ENV{'form.showcsv'}) {
+            if ($showf<=$maxred) { $bgcolor='#FFDDDD'; }
+            if (($n==0) && ($showf<=26)) { $bgcolor='#CCCCFF'; } 
+            if (($showf>$maxred) || ((!$n) && ($showf>0))) {
+                if ($vl eq '') {
+                    $vl='<font size=+2 color='.$bgcolor.'>&#35;</font>';
+                }
+                $rowdata.='<td bgcolor='.$bgcolor.'>';
+                if ($ENV{'request.role'} =~ /^st\./) {
+                    $rowdata.=$vl;
+                } else {
+                    $rowdata.='<a href="javascript:celledit('.$fm.');">'.
+                        $vl.'</a>';
+                }
+                $rowdata.='</td>';
+            } else {
+                $rowdata.='<td bgcolor='.$bgcolor.'>&nbsp;'.$vl.'&nbsp;</td>';
+            }
+        } else {
+            $rowdata.=',"'.$vl.'"';
+        }
+        $showf++;
     }  # End of foreach($safeval...)
     if ($ENV{'form.showall'} || ($dataflag)) {
-       return $rowdata.($ENV{'form.showcsv'}?'':'</tr>');
+        return $rowdata.($ENV{'form.showcsv'}?'':'</tr>');
     } else {
-       return '';
+        return '';
     }
 }
 
 # ------------------------------------------------------------- Print out sheet
 
 sub outsheet {
-    my ($r,$safeeval)=@_;
-    my $maxred;
-    my $realm;
-    if (&gettype($safeeval) eq 'assesscalc') {
+    my ($r,$sheet)=@_;
+    my $maxred = 26;    # The maximum number of cells to show as 
+                        # red (uneditable) 
+                        # To make student sheets uneditable could we 
+                        # set $maxred = 52?
+                        #
+    my $realm='Course'; # 'assessment', 'user', or 'course' sheet
+    if ($sheet->{'sheettype'} eq 'assesscalc') {
         $maxred=1;
         $realm='Assessment';
-    } elsif (&gettype($safeeval) eq 'studentcalc') {
+    } elsif ($sheet->{'sheettype'} eq 'studentcalc') {
         $maxred=26;
         $realm='User';
-    } else {
-        $maxred=26;
-        $realm='Course';
     }
-    my $maxyellow=52-$maxred;
+    #
+    # Column label
     my $tabledata;
-    unless ($ENV{'form.showcsv'}) {
-       $tabledata=
-        '<table border=2><tr><th colspan=2 rowspan=2><font size=+2>'.
-                  $realm.'</font></th>'.
+    if ($ENV{'form.showcsv'}) {
+        $tabledata='<pre>';
+    } else { 
+        $tabledata='<table border=2><tr><th colspan=2 rowspan=2>'.
+            '<font size=+2>'.$realm.'</font></th>'.
                   '<td bgcolor=#FFDDDD colspan='.$maxred.
                   '><b><font size=+1>Import</font></b></td>'.
-                  '<td colspan='.$maxyellow.
+                  '<td colspan='.(52-$maxred).
 		  '><b><font size=+1>Calculations</font></b></td></tr><tr>';
-    my $showf=0;
-    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') {
-        $showf++;
-        if ($showf<=$maxred) { 
-           $tabledata.='<td bgcolor="#FFDDDD">'; 
-        } else {
-           $tabledata.='<td>';
+        my $showf=0;
+        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') {
+            $showf++;
+            if ($showf<=$maxred) { 
+                $tabledata.='<td bgcolor="#FFDDDD">'; 
+            } else {
+                $tabledata.='<td>';
+            }
+            $tabledata.="<b><font size=+1>$_</font></b></td>";
         }
-        $tabledata.="<b><font size=+1>$_</font></b></td>";
+        $tabledata.='</tr>'.&rown($sheet,'-').
+            &rown($sheet,0);
     }
-    $tabledata.='</tr>'.&rown($safeeval,'-').&rown($safeeval,0);
-   } else { $tabledata='<pre>'; }
-
     $r->print($tabledata);
-
+    #
+    # Prepare to output rows
     my $row;
-    my $maxrow=&getmaxrow($safeeval);
-
+    #
+    # Sort the rows in some manner
+    #
     my @sortby=();
     my @sortidx=();
-    for ($row=1;$row<=$maxrow;$row++) {
-       $sortby[$row-1]=$safeeval->reval('$f{"A'.$row.'"}');
-       $sortidx[$row-1]=$row-1;
-    }
-    @sortidx=sort { $sortby[$a] cmp $sortby[$b]; } @sortidx;
-
-        my $what='Student';
-        if (&gettype($safeeval) eq 'assesscalc') {
-	    $what='Item';
-	} elsif (&gettype($safeeval) eq 'studentcalc') {
-            $what='Assessment';
-        }
-
+    for ($row=1;$row<=$sheet->{'maxrow'};$row++) {
+        push (@sortby, $sheet->{'safe'}->reval('$f{"A'.$row.'"}'));
+        push (@sortidx, $row-1);
+    }
+    @sortidx=sort { lc($sortby[$a]) cmp lc($sortby[$b]); } @sortidx;
+    #
+    # Determine the type of child spreadsheets
+    my $what='Student';
+    if ($sheet->{'sheettype'} eq 'assesscalc') {
+        $what='Item';
+    } elsif ($sheet->{'sheettype'} eq 'studentcalc') {
+        $what='Assessment';
+    }
+    #
+    # Loop through the rows and output them one at a time
     my $n=0;
-    for ($row=0;$row<$maxrow;$row++) {
-     my $thisrow=&rown($safeeval,$sortidx[$row]+1);
-     if ($thisrow) {
-       if (($n/25==int($n/25)) && (!$ENV{'form.showcsv'})) {
-	$r->print("</table>\n<br>\n");
-        $r->rflush();
-        $r->print('<table border=2><tr><td>&nbsp;<td>'.$what.'</td>');
-        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') {
-           $r->print('<td>'.$_.'</td>');
+    for ($row=0;$row<$sheet->{'maxrow'};$row++) {
+        my $thisrow=&rown($sheet,$sortidx[$row]+1);
+        if ($thisrow) {
+            if (($n/25==int($n/25)) && (!$ENV{'form.showcsv'})) {
+                $r->print("</table>\n<br>\n");
+                $r->rflush();
+                $r->print('<table border=2><tr><td>&nbsp;<td>'.$what.'</td>');
+                $r->print('<td>'.
+                          join('</td><td>',
+                               (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.
+                                      'abcdefghijklmnopqrstuvwxyz'))).
+                          "</td></tr>\n");
+            }
+            $n++;
+            $r->print($thisrow);
         }
-        $r->print('</tr>');
-       }
-       $n++;
-       $r->print($thisrow);
-      }
     }
     $r->print($ENV{'form.showcsv'}?'</pre>':'</table>');
 }
@@ -1245,11 +1283,12 @@ sub outsheet {
 # ----------------------------------------------- Read list of available sheets
 # 
 sub othersheets {
-    my ($safeeval,$stype)=@_;
+    my ($sheet,$stype)=@_;
+    $stype = $sheet->{'sheettype'} if (! defined($stype));
     #
-    my $cnum=&getcnum($safeeval);
-    my $cdom=&getcdom($safeeval);
-    my $chome=&getchome($safeeval);
+    my $cnum  = $sheet->{'cnum'};
+    my $cdom  = $sheet->{'cdom'};
+    my $chome = $sheet->{'chome'};
     #
     my @alternatives=();
     my %results=&Apache::lonnet::dump($stype.'_spreadsheets',$cdom,$cnum);
@@ -1292,178 +1331,186 @@ sub parse_sheet {
 #
 # -------------------------------------- Read spreadsheet formulas for a course
 #
-
 sub readsheet {
-  my ($safeeval,$fn)=@_;
-  my $stype=&gettype($safeeval);
-  my $cnum=&getcnum($safeeval);
-  my $cdom=&getcdom($safeeval);
-  my $chome=&getchome($safeeval);
-
-  if (! defined($fn)) {
-      # There is no filename. Look for defaults in course and global, cache
-      unless ($fn=$defaultsheets{$cnum.'_'.$cdom.'_'.$stype}) {
-          my %tmphash = &Apache::lonnet::get('environment',
-                                             ['spreadsheet_default_'.$stype],
-                                             $cdom,$cnum);
-          my ($tmp) = keys(%tmphash);
-          if ($tmp =~ /^(con_lost|error|no_such_host)/i) {
-              $fn = 'default_'.$stype;
-          } else {
-              $fn = $tmphash{'spreadsheet_default_'.$stype};
-          } 
-          unless (($fn) && ($fn!~/^error\:/)) {
- 	     $fn='default_'.$stype;
-          }
-          $defaultsheets{$cnum.'_'.$cdom.'_'.$stype}=$fn; 
-      }
-  }
-
-# ---------------------------------------------------------- fn now has a value
-
-  &setfilename($safeeval,$fn);
-
-# ------------------------------------------------------ see if sheet is cached
-  my $fstring='';
-  if ($fstring=$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}) {
-      &setformulas($safeeval,split(/\_\_\_\;\_\_\_/,$fstring));
-  } else {
-
-# ---------------------------------------------------- Not cached, need to read
-
-     my %f=();
-
-     if ($fn=~/^default\_/) {
-         my $sheetxml='';
-         my $fh;
-         my $dfn=$fn;
-         $dfn=~s/\_/\./g;
-         if ($fh=Apache::File->new($includedir.'/'.$dfn)) {
-             $sheetxml=join('',<$fh>);
-         } else {
-             $sheetxml='<field row="0" col="A">"Error"</field>';
-         }
-         %f=%{&parse_sheet(\$sheetxml)};
-     } elsif($fn=~/\/*\.spreadsheet$/) {
-         my $sheetxml=&Apache::lonnet::getfile
-             (&Apache::lonnet::filelocation('',$fn));
-         if ($sheetxml == -1) {
-             $sheetxml='<field row="0" col="A">"Error loading spreadsheet '
-                 .$fn.'"</field>';
-         }
-         %f=%{&parse_sheet(\$sheetxml)};
-     } else {
-         my $sheet='';
-         my %tmphash = &Apache::lonnet::dump($fn,$cdom,$cnum);
-         my ($tmp) = keys(%tmphash);
-         unless ($tmp =~ /^(con_lost|error|no_such_host)/i) {
-             foreach (keys(%tmphash)) {
-                 $f{$_}=$tmphash{$_};
-             }
-         }
-     }
-# --------------------------------------------------------------- Cache and set
-       $spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f);  
-       &setformulas($safeeval,%f);
+    my ($sheet,$fn)=@_;
+    #
+    my $stype = $sheet->{'sheettype'};
+    my $cnum  = $sheet->{'cnum'};
+    my $cdom  = $sheet->{'cdom'};
+    my $chome = $sheet->{'chome'};
+    #
+    if (! defined($fn)) {
+        # There is no filename. Look for defaults in course and global, cache
+        unless ($fn=$defaultsheets{$cnum.'_'.$cdom.'_'.$stype}) {
+            my %tmphash = &Apache::lonnet::get('environment',
+                                               ['spreadsheet_default_'.$stype],
+                                               $cdom,$cnum);
+            my ($tmp) = keys(%tmphash);
+            if ($tmp =~ /^(con_lost|error|no_such_host)/i) {
+                $fn = 'default_'.$stype;
+            } else {
+                $fn = $tmphash{'spreadsheet_default_'.$stype};
+            } 
+            unless (($fn) && ($fn!~/^error\:/)) {
+                $fn='default_'.$stype;
+            }
+            $defaultsheets{$cnum.'_'.$cdom.'_'.$stype}=$fn; 
+        }
+    }
+    # $fn now has a value
+    $sheet->{'filename'} = $fn;
+    # see if sheet is cached
+    my $fstring='';
+    if ($fstring=$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}) {
+        my %tmp = split(/___;___/,$fstring);
+        $sheet->{'f'} = \%tmp;
+        &setformulas($sheet);
+    } else {
+        # Not cached, need to read
+        my %f=();
+        if ($fn=~/^default\_/) {
+            my $sheetxml='';
+            my $fh;
+            my $dfn=$fn;
+            $dfn=~s/\_/\./g;
+            if ($fh=Apache::File->new($includedir.'/'.$dfn)) {
+                $sheetxml=join('',<$fh>);
+            } else {
+                $sheetxml='<field row="0" col="A">"Error"</field>';
+            }
+            %f=%{&parse_sheet(\$sheetxml)};
+        } elsif($fn=~/\/*\.spreadsheet$/) {
+            my $sheetxml=&Apache::lonnet::getfile
+                (&Apache::lonnet::filelocation('',$fn));
+            if ($sheetxml == -1) {
+                $sheetxml='<field row="0" col="A">"Error loading spreadsheet '
+                    .$fn.'"</field>';
+            }
+            %f=%{&parse_sheet(\$sheetxml)};
+        } else {
+            my $sheet='';
+            my %tmphash = &Apache::lonnet::dump($fn,$cdom,$cnum);
+            my ($tmp) = keys(%tmphash);
+            unless ($tmp =~ /^(con_lost|error|no_such_host)/i) {
+                foreach (keys(%tmphash)) {
+                    $f{$_}=$tmphash{$_};
+                }
+            }
+        }
+        # Cache and set
+        $spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f);  
+        $sheet->{'f'}=\%f;
+        &setformulas($sheet);
     }
 }
 
 # -------------------------------------------------------- Make new spreadsheet
-
 sub makenewsheet {
     my ($uname,$udom,$stype,$usymb)=@_;
-    my $safeeval=initsheet($stype);
-    $safeeval->reval(
-       '$uname="'.$uname.
-      '";$udom="'.$udom.
-      '";$uhome="'.&Apache::lonnet::homeserver($uname,$udom).
-      '";$sheettype="'.$stype.
-      '";$usymb="'.$usymb.
-      '";$csec="'.&Apache::lonnet::usection($udom,$uname,
-                                            $ENV{'request.course.id'}).
-      '";$cid="'.$ENV{'request.course.id'}.
-      '";$cfn="'.$ENV{'request.course.fn'}.
-      '";$cnum="'.$ENV{'course.'.$ENV{'request.course.id'}.'.num'}.
-      '";$cdom="'.$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.
-      '";$chome="'.$ENV{'course.'.$ENV{'request.course.id'}.'.home'}.'";');
-    return $safeeval;
+    my $sheet={};
+    $sheet->{'uname'} = $uname;
+    $sheet->{'udom'}  = $udom;
+    $sheet->{'sheettype'} = $stype;
+    $sheet->{'usymb'} = $usymb;
+    $sheet->{'cid'}   = $ENV{'request.course.id'};
+    $sheet->{'csec'}  = $Section{$uname.':'.$udom};
+    $sheet->{'coursefilename'}   = $ENV{'request.course.fn'};
+    $sheet->{'cnum'}  = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+    $sheet->{'cdom'}  = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+    $sheet->{'chome'} = $ENV{'course.'.$ENV{'request.course.id'}.'.home'};
+    $sheet->{'uhome'} = &Apache::lonnet::homeserver($uname,$udom);
+    #
+    #
+    $sheet->{'f'} = {};
+    $sheet->{'constants'} = {};
+    $sheet->{'othersheets'} = [];
+    $sheet->{'rowlabel'} = {};
+    #
+    #
+    $sheet->{'safe'}=&initsheet($sheet->{'sheettype'});
+    #
+    # Place all the %$sheet items into the safe space except the safe space
+    # itself
+    my $initstring = '';
+    foreach (qw/uname udom sheettype usymb cid csec coursefilename
+             cnum cdom chome uhome/) {
+        $initstring.= qq{\$$_="$sheet->{$_}";};
+    }
+    $sheet->{'safe'}->reval($initstring);
+    return $sheet;
 }
 
 # ------------------------------------------------------------ Save spreadsheet
-
 sub writesheet {
-  my ($safeeval,$makedef)=@_;
-  my $cid=&getcid($safeeval);
-  if (&Apache::lonnet::allowed('opa',$cid)) {
-    my %f=&getformulas($safeeval);
-    my $stype=&gettype($safeeval);
-    my $cnum=&getcnum($safeeval);
-    my $cdom=&getcdom($safeeval);
-    my $chome=&getchome($safeeval);
-    my $fn=&getfilename($safeeval);
-
-# ------------------------------------------------------------- Cache new sheet
-    $spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f);    
-# ----------------------------------------------------------------- Write sheet
-    my $sheetdata='';
-    foreach (keys(%f)) {
-     unless ($f{$_} eq 'import') {
-       $sheetdata.=&Apache::lonnet::escape($_).'='.
-	   &Apache::lonnet::escape($f{$_}).'&';
-     }
-    }
-    $sheetdata=~s/\&$//;
-    my $reply=&Apache::lonnet::reply('put:'.$cdom.':'.$cnum.':'.$fn.':'.
-              $sheetdata,$chome);
-    if ($reply eq 'ok') {
-          $reply=&Apache::lonnet::reply('put:'.$cdom.':'.$cnum.':'.
-              $stype.'_spreadsheets:'.
-              &Apache::lonnet::escape($fn).'='.$ENV{'user.name'}.'@'.
-                                               $ENV{'user.domain'},
-              $chome);
-          if ($reply eq 'ok') {
-              if ($makedef) { 
-                return &Apache::lonnet::reply('put:'.$cdom.':'.$cnum.
-                                ':environment:spreadsheet_default_'.$stype.'='.
-                                &Apache::lonnet::escape($fn),
-                                $chome);
-	      } else {
-		  return $reply;
-    	      }
-	   } else {
-	       return $reply;
-           }
-      } else {
-	  return $reply;
-      }
-  }
-  return 'unauthorized';
+    my ($sheet,$makedef)=@_;
+    my $cid=$sheet->{'cid'};
+    if (&Apache::lonnet::allowed('opa',$cid)) {
+        my %f=&getformulas($sheet);
+        my $stype= $sheet->{'sheettype'};
+        my $cnum = $sheet->{'cnum'};
+        my $cdom = $sheet->{'cdom'};
+        my $chome= $sheet->{'chome'};
+        my $fn   = $sheet->{'filename'};
+        # Cache new sheet
+        $spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f);
+        # Write sheet
+        my $sheetdata='';
+        foreach (keys(%f)) {
+            unless ($f{$_} eq 'import') {
+                $sheetdata.=&Apache::lonnet::escape($_).'='.
+                    &Apache::lonnet::escape($f{$_}).'&';
+            }
+        }
+        $sheetdata=~s/\&$//;
+        my $reply=&Apache::lonnet::reply('put:'.$cdom.':'.$cnum.':'.$fn.':'.
+                                         $sheetdata,$chome);
+        if ($reply eq 'ok') {
+            $reply=&Apache::lonnet::reply('put:'.$cdom.':'.$cnum.':'.
+                                          $stype.'_spreadsheets:'.
+                                          &Apache::lonnet::escape($fn).
+                                          '='.$ENV{'user.name'}.'@'.
+                                          $ENV{'user.domain'},
+                                          $chome);
+            if ($reply eq 'ok') {
+                if ($makedef) { 
+                    return &Apache::lonnet::reply('put:'.$cdom.':'.$cnum.
+                                                  ':environment:'.
+                                                  'spreadsheet_default_'.
+                                                  $stype.'='.
+                                                  &Apache::lonnet::escape($fn),
+                                                  $chome);
+                } 
+                return $reply;
+            } 
+            return $reply;
+        } 
+        return $reply;
+    }
+    return 'unauthorized';
 }
 
 # ----------------------------------------------- Make a temp copy of the sheet
 # "Modified workcopy" - interactive only
 #
-
 sub tmpwrite {
-    my $safeeval=shift;
+    my ($sheet) = @_;
     my $fn=$ENV{'user.name'}.'_'.
-           $ENV{'user.domain'}.'_spreadsheet_'.&getusymb($safeeval).'_'.
-           &getfilename($safeeval);
+        $ENV{'user.domain'}.'_spreadsheet_'.$sheet->{'usymb'}.'_'.
+           $sheet->{'filename'};
     $fn=~s/\W/\_/g;
     $fn=$tmpdir.$fn.'.tmp';
     my $fh;
     if ($fh=Apache::File->new('>'.$fn)) {
-	print $fh join("\n",&getformulas($safeeval));
+	print $fh join("\n",&getformulas($sheet));
     }
 }
 
 # ---------------------------------------------------------- Read the temp copy
-
 sub tmpread {
-    my ($safeeval,$nfield,$nform)=@_;
+    my ($sheet,$nfield,$nform)=@_;
     my $fn=$ENV{'user.name'}.'_'.
-           $ENV{'user.domain'}.'_spreadsheet_'.&getusymb($safeeval).'_'.
-           &getfilename($safeeval);
+           $ENV{'user.domain'}.'_spreadsheet_'.$sheet->{'usymb'}.'_'.
+           $sheet->{'filename'};
     $fn=~s/\W/\_/g;
     $fn=$tmpdir.$fn.'.tmp';
     my $fh;
@@ -1484,419 +1531,386 @@ sub tmpread {
         }
     }
     if ($nform eq 'changesheet') {
-        $fo{'A'.$nfield}=(split(/\_\_\&\&\&\_\_/,$fo{'A'.$nfield}))[0];
+        $fo{'A'.$nfield}=(split(/__&&&\__/,$fo{'A'.$nfield}))[0];
         unless ($ENV{'form.sel_'.$nfield} eq 'Default') {
 	    $fo{'A'.$nfield}.='__&&&__'.$ENV{'form.sel_'.$nfield};
         }
     } elsif ($nfield eq 'insertrow') {
         $countrows++;
+        my $newrow=substr('000000'.$countrows,-7);
         if ($nform eq 'top') {
-	    $fo{'A'.$countrows}='AAAAA_'.$countrows;
+	    $fo{'A'.$countrows}='--- '.$newrow;
         } else {
-            $fo{'A'.$countrows}='zzzzz_'.$countrows;
+            $fo{'A'.$countrows}='~~~ '.$newrow;
         }
     } else {
        if ($nfield) { $fo{$nfield}=$nform; }
     }
-    &setformulas($safeeval,%fo);
+    $sheet->{'f'}=\%fo;
+    &setformulas($sheet);
 }
 
-# ================================================================== Parameters
-# -------------------------------------------- Figure out a cascading parameter
-#
-# For this function to work
-#
-# * parmhash needs to be tied
-# * courseopt and useropt need to be initialized for this user and course
-#
-
-sub parmval {
-    my ($what,$safeeval)=@_;
-    my $cid=&getcid($safeeval);
-    my $csec=&getcsec($safeeval);
-    my $uname=&getuname($safeeval);
-    my $udom=&getudom($safeeval);
-    my $symb=&getusymb($safeeval);
+##################################################
+##################################################
 
-    unless ($symb) { return ''; }
-    my $result='';
-
-    my ($mapname,$id,$fn)=split(/\_\_\_/,$symb);
-# ----------------------------------------------------- Cascading lookup scheme
-       my $rwhat=$what;
-       $what=~s/^parameter\_//;
-       $what=~s/\_([^\_]+)$/\.$1/;
+=pod
 
-       my $symbparm=$symb.'.'.$what;
-       my $mapparm=$mapname.'___(all).'.$what;
-       my $usercourseprefix=$uname.'_'.$udom.'_'.$cid;
+=item &parmval()
 
-       my $seclevel=
-            $usercourseprefix.'.['.
-		$csec.'].'.$what;
-       my $seclevelr=
-            $usercourseprefix.'.['.
-		$csec.'].'.$symbparm;
-       my $seclevelm=
-            $usercourseprefix.'.['.
-		$csec.'].'.$mapparm;
+Determine the value of a parameter.
 
-       my $courselevel=
-            $usercourseprefix.'.'.$what;
-       my $courselevelr=
-            $usercourseprefix.'.'.$symbparm;
-       my $courselevelm=
-            $usercourseprefix.'.'.$mapparm;
+Inputs: $what, the parameter needed, $sheet, the safe space
 
-# ---------------------------------------------------------- fourth, check user
-      
-      if ($uname) { 
+Returns: The value of a parameter, or '' if none.
 
-       if ($useropt{$courselevelr}) { return $useropt{$courselevelr}; }
+This function cascades through the possible levels searching for a value for
+a parameter.  The levels are checked in the following order:
+user, course (at section level and course level), map, and lonnet::metadata.
+This function uses %parmhash, which must be tied prior to calling it.
+This function also requires %courseopt and %useropt to be initialized for
+this user and course.
 
-       if ($useropt{$courselevelm}) { return $useropt{$courselevelm}; }
-
-       if ($useropt{$courselevel}) { return $useropt{$courselevel}; }
-
-      }
-
-# --------------------------------------------------------- third, check course
-     
-       if ($csec) {
- 
-        if ($courseopt{$seclevelr}) { return $courseopt{$seclevelr}; }
-
-        if ($courseopt{$seclevelm}) { return $courseopt{$seclevelm}; }  
-
-        if ($courseopt{$seclevel}) { return $courseopt{$seclevel}; }
-  
-      }
-
-       if ($courseopt{$courselevelr}) { return $courseopt{$courselevelr}; }
-
-       if ($courseopt{$courselevelm}) { return $courseopt{$courselevelm}; }
-
-       if ($courseopt{$courselevel}) { return $courseopt{$courselevel}; }
-
-# ----------------------------------------------------- second, check map parms
-
-       my $thisparm=$parmhash{$symbparm};
-       if ($thisparm) { return $thisparm; }
-
-# -------------------------------------------------------- first, check default
+=cut
 
-       return &Apache::lonnet::metadata($fn,$rwhat.'.default');
-        
+##################################################
+##################################################
+sub parmval {
+    my ($what,$sheet)=@_;
+    my $symb  = $sheet->{'usymb'};
+    unless ($symb) { return ''; }
+    #
+    my $cid   = $sheet->{'cid'};
+    my $csec  = $sheet->{'csec'};
+    my $uname = $sheet->{'uname'};
+    my $udom  = $sheet->{'udom'};
+    my $result='';
+    #
+    my ($mapname,$id,$fn)=split(/\_\_\_/,$symb);
+    # Cascading lookup scheme
+    my $rwhat=$what;
+    $what =~ s/^parameter\_//;
+    $what =~ s/\_([^\_]+)$/\.$1/;
+    #
+    my $symbparm = $symb.'.'.$what;
+    my $mapparm  = $mapname.'___(all).'.$what;
+    my $usercourseprefix = $uname.'_'.$udom.'_'.$cid;
+    #
+    my $seclevel  = $usercourseprefix.'.['.$csec.'].'.$what;
+    my $seclevelr = $usercourseprefix.'.['.$csec.'].'.$symbparm;
+    my $seclevelm = $usercourseprefix.'.['.$csec.'].'.$mapparm;
+    #
+    my $courselevel  = $usercourseprefix.'.'.$what;
+    my $courselevelr = $usercourseprefix.'.'.$symbparm;
+    my $courselevelm = $usercourseprefix.'.'.$mapparm;
+    # fourth, check user
+    if (defined($uname)) {
+        return $useropt{$courselevelr} if (defined($useropt{$courselevelr}));
+        return $useropt{$courselevelm} if (defined($useropt{$courselevelm}));
+        return $useropt{$courselevel}  if (defined($useropt{$courselevel}));
+    }
+    # third, check course
+    if (defined($csec)) {
+        return $courseopt{$seclevelr} if (defined($courseopt{$seclevelr}));
+        return $courseopt{$seclevelm} if (defined($courseopt{$seclevelm}));
+        return $courseopt{$seclevel}  if (defined($courseopt{$seclevel}));
+    }
+    #
+    return $courseopt{$courselevelr} if (defined($courseopt{$courselevelr}));
+    return $courseopt{$courselevelm} if (defined($courseopt{$courselevelm}));
+    return $courseopt{$courselevel}  if (defined($courseopt{$courselevel}));
+    # second, check map parms
+    my $thisparm = $parmhash{$symbparm};
+    return $thisparm if (defined($thisparm));
+    # first, check default
+    return &Apache::lonnet::metadata($fn,$rwhat.'.default');
+}
+
+sub format_rowlabel {
+    my $rowlabel = shift;
+    my ($type,$labeldata) = split(':',$rowlabel,2);
+    my $result = '';
+    if ($type eq 'symb') {
+        my ($symb,$uname,$udom,$title) = split(':',$labeldata);
+        $symb = &Apache::lonnet::unescape($symb);
+        if ($ENV{'form.showcsv'}) {
+            $result = $title;
+        } else {
+            $result = '<a href="/adm/assesscalc?usymb='.$symb.
+                '&uname='.$uname.'&udom='.$udom.'">'.$title.'</a>';
+        }
+    } elsif ($type eq 'student') {
+        my ($sname,$sdom,$fullname,$section,$id) = split(':',$labeldata);
+        if ($ENV{'form.showcsv'}) {
+            $result = '"'.
+                join('","',($sname,$sdom,$fullname,$section,$id).'"');
+        } else {
+            $result ='<a href="/adm/studentcalc?uname='.$sname.
+                '&udom='.$sdom.'">';
+            $result.=$section.'&nbsp;'.$id."&nbsp;".$fullname.'</a>';
+        }
+    } elsif ($type eq 'parameter') {
+        if ($ENV{'form.showcsv'}) {
+            $labeldata =~ s/<br>/ /g;
+        }
+        $result = $labeldata;
+    } else {
+        &Apache::lonnet::logthis("lonspreadsheet:bogus rowlabel type: $type");
+    }
+    return $result;
 }
 
 # ---------------------------------------------- Update rows for course listing
-
 sub updateclasssheet {
-    my $safeeval=shift;
-    my $cnum=&getcnum($safeeval);
-    my $cdom=&getcdom($safeeval);
-    my $cid=&getcid($safeeval);
-    my $chome=&getchome($safeeval);
-
-# ---------------------------------------------- Read class list and row labels
+    my ($sheet) = @_;
+    my $cnum  =$sheet->{'cnum'};
+    my $cdom  =$sheet->{'cdom'};
+    my $cid   =$sheet->{'cid'};
+    my $chome =$sheet->{'chome'};
+    #
+    %Section = ();
 
-    my $classlst=&Apache::lonnet::reply
-                                 ('dump:'.$cdom.':'.$cnum.':classlist',$chome);
+    #
+    # Read class list and row labels
+    my $classlist = &Apache::loncoursedata::get_classlist();
+    if (! defined($classlist)) {
+        return 'Could not access course classlist';
+    } 
+    #
     my %currentlist=();
-    my $now=time;
-    unless ($classlst=~/^error\:/) {
-        foreach (split(/\&/,$classlst)) {
-            my ($name,$value)=split(/\=/,$_);
-            my ($end,$start)=split(/\:/,&Apache::lonnet::unescape($value));
-            my $active=1;
-            if (($end) && ($now>$end)) { $active=0; }
-            if ($active) {
-                my $rowlabel='';
-                $name=&Apache::lonnet::unescape($name);
-                my ($sname,$sdom)=split(/\:/,$name);
-                my $ssec=&Apache::lonnet::usection($sdom,$sname,$cid);
-                if ($ssec==-1) {
-		   unless ($ENV{'form.showcsv'}) {
-                    $rowlabel='<font color=red>Data not available: '.$name.
-			      '</font>';
-		   } else {
-		       $rowlabel='ERROR","'.$name.
-                                 '","Data not available","","","';
-                   }
-                } else {
-                    my %reply=&Apache::lonnet::idrget($sdom,$sname);
-                    my $reply=&Apache::lonnet::reply('get:'.$sdom.':'.$sname.
-		      ':environment:firstname&middlename&lastname&generation',
-                      &Apache::lonnet::homeserver($sname,$sdom));
-		   unless ($ENV{'form.showcsv'}) {
-                    $rowlabel='<a href="/adm/studentcalc?uname='.$sname.
-                              '&udom='.$sdom.'">'.
-                              $ssec.'&nbsp;'.$reply{$sname}.'<br>';
-                    foreach ( split(/\&/,$reply)) {
-                        $rowlabel.=&Apache::lonnet::unescape($_).' ';
-                    }
-                    $rowlabel.='</a>';
-		   } else {
-		    $rowlabel=$ssec.'","'.$reply{$sname}.'"';
-                    my $ncount=0;
-                    foreach (split(/\&/,$reply)) {
-                        $rowlabel.=',"'.&Apache::lonnet::unescape($_).'"';
-                        $ncount++;
-                    }
-                    unless ($ncount==4) { $rowlabel.=',""'; }
-                    $rowlabel=~s/\"$//;
-		   }
-                }
-		$currentlist{&Apache::lonnet::unescape($name)}=$rowlabel;
+    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') {
+            $currentlist{$student}=join(':',('student',$studentName,
+                                             $studentDomain,$fullname,
+                                             $studentSection,$id));
+        }
+    }
+    #
+    # Find discrepancies between the course row table and this
+    #
+    my %f=&getformulas($sheet);
+    my $changed=0;
+    #
+    $sheet->{'maxrow'}=0;
+    my %existing=();
+    #
+    # Now obsolete rows
+    foreach (keys(%f)) {
+        if ($_=~/^A(\d+)/) {
+            if ($1 > $sheet->{'maxrow'}) {
+                $sheet->{'maxrow'}= $1;
             }
-        } # end of foreach (split(/\&/,$classlst))
-#
-# -------------------- Find discrepancies between the course row table and this
-#
-        my %f=&getformulas($safeeval);
-        my $changed=0;
-
-        my $maxrow=0;
-        my %existing=();
-
-# ----------------------------------------------------------- Now obsolete rows
-	foreach (keys(%f)) {
-	    if ($_=~/^A(\d+)/) {
-                $maxrow=($1>$maxrow)?$1:$maxrow;
-                $existing{$f{$_}}=1;
-		unless ((defined($currentlist{$f{$_}})) || (!$1)) {
-		   $f{$_}='!!! Obsolete';
-                   $changed=1;
-                }
+            $existing{$f{$_}}=1;
+            unless ((defined($currentlist{$f{$_}})) || (!$1) ||
+                    ($f{$_}=~/^(~~~|---)/)) {
+                $f{$_}='!!! Obsolete';
+                $changed=1;
             }
         }
-
-# -------------------------------------------------------- New and unknown keys
-     
-        foreach (sort keys(%currentlist)) {
-            unless ($existing{$_}) {
-		$changed=1;
-                $maxrow++;
-                $f{'A'.$maxrow}=$_;
-            }
+    }
+    #
+    # New and unknown keys
+    foreach my $student (sort keys(%currentlist)) {
+        unless ($existing{$student}) {
+            $changed=1;
+            $sheet->{'maxrow'}++;
+            $f{'A'.$sheet->{'maxrow'}}=$student;
         }
-     
-        if ($changed) { &setformulas($safeeval,%f); }
-
-        &setmaxrow($safeeval,$maxrow);
-        &setrowlabels($safeeval,%currentlist);
-
-    } else {
-        return 'Could not access course data';
     }
+    if ($changed) { 
+        $sheet->{'f'} = \%f;
+        &setformulas($sheet,%f); 
+    }
+    #
+    &setrowlabels($sheet,\%currentlist);
 }
 
 # ----------------------------------- Update rows for student and assess sheets
-
 sub updatestudentassesssheet {
-    my $safeeval=shift;
+    my ($sheet) = @_;
+    #
     my %bighash;
-    my $stype=&gettype($safeeval);
-    my %current=();
-    unless ($updatedata{$ENV{'request.course.fn'}.'_'.$stype}) {
-# -------------------------------------------------------------------- Tie hash
-      if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
-                       &GDBM_READER,0640)) {
-# --------------------------------------------------------- Get all assessments
-
-	my %allkeys=('timestamp' => 
-                     'Timestamp of Last Transaction<br>timestamp',
-                     'subnumber' =>
-                     'Number of Submissions<br>subnumber',
-                     'tutornumber' =>
-                     'Number of Tutor Responses<br>tutornumber',
-                     'totalpoints' =>
-                     'Total Points Granted<br>totalpoints');
-
-        my $adduserstr='';
-        if ((&getuname($safeeval) ne $ENV{'user.name'}) ||
-            (&getudom($safeeval) ne $ENV{'user.domain'})) {
-            $adduserstr='&uname='.&getuname($safeeval).
-		'&udom='.&getudom($safeeval);
-        }
-
-        my %allassess=('_feedback' =>
-	              '<a href="/adm/assesscalc?usymb=_feedback'.$adduserstr.
-                       '">Feedback</a>',
-                       '_evaluation' =>
-	              '<a href="/adm/assesscalc?usymb=_evaluation'.$adduserstr.
-                       '">Evaluation</a>',
-                       '_tutoring' =>
-	              '<a href="/adm/assesscalc?usymb=_tutoring'.$adduserstr.
-                       '">Tutoring</a>',
-                       '_discussion' =>
-	              '<a href="/adm/assesscalc?usymb=_discussion'.$adduserstr.
-                       '">Discussion</a>'
-        );
-
-        foreach (keys(%bighash)) {
-	    if ($_=~/^src\_(\d+)\.(\d+)$/) {
-	       my $mapid=$1;
-               my $resid=$2;
-               my $id=$mapid.'.'.$resid;
-               my $srcf=$bighash{$_};
-               if ($srcf=~/\.(problem|exam|quiz|assess|survey|form)$/) {
-                 my $symb=
-                     &Apache::lonnet::declutter($bighash{'map_id_'.$mapid}).
-			    '___'.$resid.'___'.
-			    &Apache::lonnet::declutter($srcf);
-		 $allassess{$symb}=
-	            '<a href="/adm/assesscalc?usymb='.$symb.$adduserstr.'">'.
-                     $bighash{'title_'.$id}.'</a>';
-                 if ($stype eq 'assesscalc') {
-		     foreach (split(/\,/,
-				    &Apache::lonnet::metadata($srcf,'keys'))) {
-                       if (($_=~/^stores\_(.*)/) || ($_=~/^parameter\_(.*)/)) {
-			  my $key=$_;
-                          my $display=
-			      &Apache::lonnet::metadata($srcf,$key.'.display');
-                          unless ($display) {
-                              $display.=
-			         &Apache::lonnet::metadata($srcf,$key.'.name');
-                          }
-                          $display.='<br>'.$key;
-                          $allkeys{$key}=$display;
-		       }
-                   } # end of foreach
-	         }
-	      }
-	   }
+    #
+    my $stype = $sheet->{'sheettype'};
+    my $uname = $sheet->{'uname'};
+    my $udom  = $sheet->{'udom'};
+    $sheet->{'rowlabel'} = {};
+    my $identifier =$sheet->{'coursefilename'}.'_'.$stype.'_'.$uname.'_'.$udom;
+    if  ($updatedata{$identifier}) {
+        %{$sheet->{'rowlabel'}}=split(/___;___/,$updatedata{$identifier});
+    } else {
+        # Tie hash
+        tie(%bighash,'GDBM_File',$sheet->{'coursefilename'}.'.db',
+            &GDBM_READER(),0640);
+        if (! tied(%bighash)) {
+            return 'Could not access course data';
+        }
+        # Get all assessments
+        #
+        # parameter_labels is used in the assessment sheets to provide labels
+        # for the parameters.
+        my %parameter_labels=
+            ('timestamp' => 
+                 'parameter:Timestamp of Last Transaction<br>timestamp',
+             'subnumber' =>
+                 'parameter:Number of Submissions<br>subnumber',
+             'tutornumber' =>
+                 'parameter:Number of Tutor Responses<br>tutornumber',
+             'totalpoints' =>
+                 'parameter:Total Points Granted<br>totalpoints');
+        #
+        # assesslist holds the descriptions of all assessments
+        my %assesslist;
+        foreach ('Feedback','Evaluation','Tutoring','Discussion') {
+            my $symb = '_'.lc($_);
+            $assesslist{$symb} = join(':',('symb',$symb,$uname,$udom,$_));
+        }
+        while (($_,undef) = each(%bighash)) {
+            next if ($_!~/^src\_(\d+)\.(\d+)$/);
+            my $mapid=$1;
+            my $resid=$2;
+            my $id=$mapid.'.'.$resid;
+            my $srcf=$bighash{$_};
+            if ($srcf=~/\.(problem|exam|quiz|assess|survey|form)$/) {
+                my $symb=
+                    &Apache::lonnet::declutter($bighash{'map_id_'.$mapid}).
+                        '___'.$resid.'___'.&Apache::lonnet::declutter($srcf);
+                $assesslist{$symb}='symb:'.&Apache::lonnet::escape($symb).':'
+                    .$uname.':'.$udom.':'.$bighash{'title_'.$id};
+                next if ($stype ne 'assesscalc');
+                foreach my $key (split(/\,/,
+                                       &Apache::lonnet::metadata($srcf,'keys')
+                                       )) {
+                    next if ($key !~ /^(stores|parameter)_/);
+                    my $display=
+                        &Apache::lonnet::metadata($srcf,$key.'.display');
+                    unless ($display) {
+                        $display.=
+                            &Apache::lonnet::metadata($srcf,$key.'.name');
+                    }
+                    $display.='<br>'.$key;
+                    $parameter_labels{$key}='parameter:'.$display;
+                } # end of foreach
+            }
         } # end of foreach (keys(%bighash))
         untie(%bighash);
-    
-#
-# %allkeys has a list of storage and parameter displays by unikey
-# %allassess has a list of all resource displays by symb
-#
-
+        #
+        # %parameter_labels has a list of storage and parameter displays by 
+        # unikey
+        # %assesslist has a list of all resource, by symb
+        #
         if ($stype eq 'assesscalc') {
-	    %current=%allkeys;
+            $sheet->{'rowlabel'} = \%parameter_labels;
         } elsif ($stype eq 'studentcalc') {
-            %current=%allassess;
+            $sheet->{'rowlabel'} = \%assesslist;
         }
-        $updatedata{$ENV{'request.course.fn'}.'_'.$stype}=
-	    join('___;___',%current);
-    } else {
-        return 'Could not access course data';
+        $updatedata{$sheet->{'coursefilename'}.'_'.$stype.'_'
+                        .$uname.'_'.$udom}=
+                            join('___;___',%{$sheet->{'rowlabel'}});
+        # Get current from cache
     }
-# ------------------------------------------------------ Get current from cache
-    } else {
-        %current=split(/\_\_\_\;\_\_\_/,
-		       $updatedata{$ENV{'request.course.fn'}.'_'.$stype});
-    }
-# -------------------- Find discrepancies between the course row table and this
-#
-        my %f=&getformulas($safeeval);
-        my $changed=0;
-
-        my $maxrow=0;
-        my %existing=();
-
-# ----------------------------------------------------------- Now obsolete rows
-	foreach (keys(%f)) {
-	    if ($_=~/^A(\d+)/) {
-                $maxrow=($1>$maxrow)?$1:$maxrow;
-                my ($usy,$ufn)=split(/\_\_\&\&\&\_\_/,$f{$_});
-                $existing{$usy}=1;
-		unless ((defined($current{$usy})) || (!$1)) {
-		   $f{$_}='!!! Obsolete';
-                   $changed=1;
-	        } elsif ($ufn) {
-		    $current{$usy}
-                       =~s/assesscalc\?usymb\=/assesscalc\?ufn\=$ufn\&usymb\=/;
-                }
-            }
-        }
-
-# -------------------------------------------------------- New and unknown keys
-     
-        foreach (keys(%current)) {
-            unless ($existing{$_}) {
-		$changed=1;
-                $maxrow++;
-                $f{'A'.$maxrow}=$_;
-            }
-        }
+    # Find discrepancies between the course row table and this
+    #
+    my %f=&getformulas($sheet);
+    my $changed=0;
     
-        if ($changed) { &setformulas($safeeval,%f); }
-
-        &setmaxrow($safeeval,$maxrow);
-        &setrowlabels($safeeval,%current);
- 
-        undef %current;
-        undef %existing;
+    $sheet->{'maxrow'} = 0;
+    my %existing=();
+    # Now obsolete rows
+    foreach (keys(%f)) {
+        next if ($_!~/^A(\d+)/);
+        if ($1 > $sheet->{'maxrow'}) {
+            $sheet->{'maxrow'} = $1;
+        }
+        my ($usy,$ufn)=split(/__&&&\__/,$f{$_});
+        $existing{$usy}=1;
+        unless ((exists($sheet->{'rowlabel'}->{$usy}) && 
+                 (defined($sheet->{'rowlabel'}->{$usy})) || (!$1) ||
+                ($f{$_}=~/^(~~~|---)/))){
+            $f{$_}='!!! Obsolete';
+            $changed=1;
+        } elsif ($ufn) {
+            $sheet->{'rowlabel'}->{$usy}
+                =~s/assesscalc\?usymb\=/assesscalc\?ufn\=$ufn\&usymb\=/;
+        }
+    }
+    # New and unknown keys
+    foreach (keys(%{$sheet->{'rowlabel'}})) {
+        unless ($existing{$_}) {
+            $changed=1;
+            $sheet->{'maxrow'}++;
+            $f{'A'.$sheet->{'maxrow'}}=$_;
+        }
+    }
+    if ($changed) { 
+        $sheet->{'f'} = \%f;
+        &setformulas($sheet); 
+    }
+    #
+    undef %existing;
 }
 
 # ------------------------------------------------ Load data for one assessment
 
 sub loadstudent {
-    my $safeeval=shift;
+    my ($sheet)=@_;
     my %c=();
-    my %f=&getformulas($safeeval);
-    $cachedassess=&getuname($safeeval).':'.&getudom($safeeval);
-    %cachedstores=();
-    {
-      my $reply=&Apache::lonnet::reply('dump:'.&getudom($safeeval).':'.
-                                               &getuname($safeeval).':'.
-                                               &getcid($safeeval),
-                                               &getuhome($safeeval));
-      unless ($reply=~/^error\:/) {
-	 foreach ( split(/\&/,$reply)) {
-            my ($name,$value)=split(/\=/,$_);
-            $cachedstores{&Apache::lonnet::unescape($name)}=
-	                  &Apache::lonnet::unescape($value);
-	}
-      }
+    my %f=&getformulas($sheet);
+    $cachedassess=$sheet->{'uname'}.':'.$sheet->{'udom'};
+    # Get ALL the student preformance data
+    my @tmp = &Apache::lonnet::dump($sheet->{'cid'},
+                                    $sheet->{'udom'},
+                                    $sheet->{'uname'},
+                                    undef);
+    if ($tmp[0] !~ /^error:/) {
+        %cachedstores = @tmp;
     }
+    undef @tmp;
+    # 
     my @assessdata=();
     foreach (keys(%f)) {
-	if ($_=~/^A(\d+)/) {
-	   my $row=$1;
-           unless (($f{$_}=~/^\!/) || ($row==0)) {
-	      my ($usy,$ufn)=split(/\_\_\&\&\&\_\_/,$f{$_});
-	      @assessdata=&exportsheet(&getuname($safeeval),
-                                       &getudom($safeeval),
-                                       'assesscalc',$usy,$ufn);
-              my $index=0;
-              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') {
-                  if ($assessdata[$index]) {
-		     my $col=$_;
-		     if ($assessdata[$index]=~/\D/) {
-                         $c{$col.$row}="'".$assessdata[$index]."'";
- 		     } else {
-		         $c{$col.$row}=$assessdata[$index];
-		     }
-                     unless ($col eq 'A') { 
-			 $f{$col.$row}='import';
-                     }
-		  }
-                  $index++;
-              }
-	   }
+	next if ($_!~/^A(\d+)/);
+        my $row=$1;
+        next if (($f{$_}=~/^[\!\~\-]/) || ($row==0));
+        my ($usy,$ufn)=split(/__&&&\__/,$f{$_});
+        @assessdata=&exportsheet($sheet,$sheet->{'uname'},
+                                 $sheet->{'udom'},
+                                 'assesscalc',$usy,$ufn);
+        my $index=0;
+        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') {
+            if ($assessdata[$index]) {
+                my $col=$_;
+                if ($assessdata[$index]=~/\D/) {
+                    $c{$col.$row}="'".$assessdata[$index]."'";
+                } else {
+                    $c{$col.$row}=$assessdata[$index];
+                }
+                unless ($col eq 'A') { 
+                    $f{$col.$row}='import';
+                }
+            }
+            $index++;
         }
     }
     $cachedassess='';
     undef %cachedstores;
-    &setformulas($safeeval,%f);
-    &setconstants($safeeval,%c);
+    $sheet->{'f'} = \%f;
+    &setformulas($sheet);
+    &setconstants($sheet,\%c);
 }
 
 # --------------------------------------------------- Load data for one student
-
+#
 sub loadcourse {
-    my ($safeeval,$r)=@_;
+    my ($sheet,$r)=@_;
     my %c=();
-    my %f=&getformulas($safeeval);
+    my %f=&getformulas($sheet);
     my $total=0;
     foreach (keys(%f)) {
 	if ($_=~/^A(\d+)/) {
-	    unless ($f{$_}=~/^\!/) { $total++; }
+	    unless ($f{$_}=~/^[\!\~\-]/) { $total++; }
         }
     }
     my $now=0;
@@ -1914,193 +1928,161 @@ sub loadcourse {
 ENDPOP
     $r->rflush();
     foreach (keys(%f)) {
-	if ($_=~/^A(\d+)/) {
-	   my $row=$1;
-           unless (($f{$_}=~/^\!/)  || ($row==0)) {
-	      my @studentdata=&exportsheet(split(/\:/,$f{$_}),
-                                           'studentcalc');
-              undef %userrdatas;
-              $now++;
-              $r->print('<script>popwin.document.popremain.remaining.value="'.
+	next if ($_!~/^A(\d+)/);
+        my $row=$1;
+        next if (($f{$_}=~/^[\!\~\-]/)  || ($row==0));
+        my ($sname,$sdom) = split(':',$f{$_});
+        my @studentdata=&exportsheet($sheet,$sname,$sdom,'studentcalc');
+        undef %userrdatas;
+        $now++;
+        $r->print('<script>popwin.document.popremain.remaining.value="'.
                   $now.'/'.$total.': '.int((time-$since)/$now*($total-$now)).
-                        ' secs remaining";</script>');
-              $r->rflush(); 
-
-              my $index=0;
-             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') {
-                  if ($studentdata[$index]) {
-		     my $col=$_;
-		     if ($studentdata[$index]=~/\D/) {
-                         $c{$col.$row}="'".$studentdata[$index]."'";
- 		     } else {
-		         $c{$col.$row}=$studentdata[$index];
-		     }
-                     unless ($col eq 'A') { 
-			 $f{$col.$row}='import';
-                     }
-		  }
-                  $index++;
-              }
-	   }
+                  ' secs remaining";</script>');
+        $r->rflush(); 
+        #
+        my $index=0;
+        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') {
+            if (defined($studentdata[$index++])) {
+                my $col=$_;
+                if ($studentdata[$index]=~/\D/) {
+                    $c{$col.$row}="'".$studentdata[$index]."'";
+                } else {
+                    $c{$col.$row}=$studentdata[$index];
+                }
+                unless ($col eq 'A') { 
+                    $f{$col.$row}='import';
+                }
+            }
         }
     }
-    &setformulas($safeeval,%f);
-    &setconstants($safeeval,%c);
+    $sheet->{'f'}=\%f;
+    &setformulas($sheet);
+    &setconstants($sheet,\%c);
     $r->print('<script>popwin.close()</script>');
     $r->rflush(); 
 }
 
 # ------------------------------------------------ Load data for one assessment
-
+#
 sub loadassessment {
-    my $safeeval=shift;
+    my ($sheet)=@_;
 
-    my $uhome=&getuhome($safeeval);
-    my $uname=&getuname($safeeval);
-    my $udom=&getudom($safeeval);
-    my $symb=&getusymb($safeeval);
-    my $cid=&getcid($safeeval);
-    my $cnum=&getcnum($safeeval);
-    my $cdom=&getcdom($safeeval);
-    my $chome=&getchome($safeeval);
+    my $uhome = $sheet->{'uhome'};
+    my $uname = $sheet->{'uname'};
+    my $udom  = $sheet->{'udom'};
+    my $symb  = $sheet->{'usymb'};
+    my $cid   = $sheet->{'cid'};
+    my $cnum  = $sheet->{'cnum'};
+    my $cdom  = $sheet->{'cdom'};
+    my $chome = $sheet->{'chome'};
 
     my $namespace;
     unless ($namespace=$cid) { return ''; }
-
-# ----------------------------------------------------------- Get stored values
-
-   my %returnhash=();
-
-   if ($cachedassess eq $uname.':'.$udom) {
-#
-# get data out of the dumped stores
-# 
-
-       my $version=$cachedstores{'version:'.$symb};
-       my $scope;
-       for ($scope=1;$scope<=$version;$scope++) {
-           foreach (split(/\:/,$cachedstores{$scope.':keys:'.$symb})) {
-               $returnhash{$_}=$cachedstores{$scope.':'.$symb.':'.$_};
-           } 
-       }
-
-   } else {
-#
-# restore individual
-#
-
-    my $answer=&Apache::lonnet::reply(
-       "restore:$udom:$uname:".
-       &Apache::lonnet::escape($namespace).":".
-       &Apache::lonnet::escape($symb),$uhome);
-    foreach (split(/\&/,$answer)) {
-	my ($name,$value)=split(/\=/,$_);
-        $returnhash{&Apache::lonnet::unescape($name)}=
-                    &Apache::lonnet::unescape($value);
-    }
-    my $version;
-    for ($version=1;$version<=$returnhash{'version'};$version++) {
-       foreach (split(/\:/,$returnhash{$version.':keys'})) {
-          $returnhash{$_}=$returnhash{$version.':'.$_};
-       } 
+    # Get stored values
+    my %returnhash=();
+    if ($cachedassess eq $uname.':'.$udom) {
+        #
+        # get data out of the dumped stores
+        # 
+        my $version=$cachedstores{'version:'.$symb};
+        my $scope;
+        for ($scope=1;$scope<=$version;$scope++) {
+            foreach (split(/\:/,$cachedstores{$scope.':keys:'.$symb})) {
+                $returnhash{$_}=$cachedstores{$scope.':'.$symb.':'.$_};
+            } 
+        }
+    } else {
+        #
+        # restore individual
+        #
+        %returnhash = &Apache::lonnet::restore($symb,$namespace,$udom,$uname);
+        for (my $version=1;$version<=$returnhash{'version'};$version++) {
+            foreach (split(/\:/,$returnhash{$version.':keys'})) {
+                $returnhash{$_}=$returnhash{$version.':'.$_};
+            } 
+        }
     }
-   }
-# ----------------------------- returnhash now has all stores for this resource
-
-# --------- convert all "_" to "." to be able to use libraries, multiparts, etc
-
+    #
+    # returnhash now has all stores for this resource
+    # convert all "_" to "." to be able to use libraries, multiparts, etc
+    #
+    # This is dumb.  It is also necessary :(
     my @oldkeys=keys %returnhash;
-
-    foreach (@oldkeys) {
-        my $name=$_;
-        my $value=$returnhash{$_};
-        delete $returnhash{$_};
+    #
+    foreach my $name (@oldkeys) {
+        my $value=$returnhash{$name};
+        delete $returnhash{$name};
         $name=~s/\_/\./g;
         $returnhash{$name}=$value;
     }
-
-# ---------------------------- initialize coursedata and userdata for this user
+    # initialize coursedata and userdata for this user
     undef %courseopt;
     undef %useropt;
 
     my $userprefix=$uname.'_'.$udom.'_';
 
     unless ($uhome eq 'no_host') { 
-# -------------------------------------------------------------- Get coursedata
-      unless
-        ((time-$courserdatas{$cid.'.last_cache'})<240) {
-         my $reply=&Apache::lonnet::reply('dump:'.$cdom.':'.$cnum.
-              ':resourcedata',$chome);
-         if ($reply!~/^error\:/) {
-            $courserdatas{$cid}=$reply;
+        # Get coursedata
+        unless ((time-$courserdatas{$cid.'.last_cache'})<240) {
+            my %Tmp = &Apache::lonnet::dump('resourcedata',$cdom,$cnum);
+            $courserdatas{$cid}=\%Tmp;
             $courserdatas{$cid.'.last_cache'}=time;
-         }
-      }
-      foreach (split(/\&/,$courserdatas{$cid})) {
-         my ($name,$value)=split(/\=/,$_);
-         $courseopt{$userprefix.&Apache::lonnet::unescape($name)}=
-                    &Apache::lonnet::unescape($value);  
-      }
-# --------------------------------------------------- Get userdata (if present)
-      unless
-        ((time-$userrdatas{$uname.'___'.$udom.'.last_cache'})<240) {
-         my $reply=
-       &Apache::lonnet::reply('dump:'.$udom.':'.$uname.':resourcedata',$uhome);
-         if ($reply!~/^error\:/) {
-	     $userrdatas{$uname.'___'.$udom}=$reply;
-	     $userrdatas{$uname.'___'.$udom.'.last_cache'}=time;
-         }
-      }
-      foreach (split(/\&/,$userrdatas{$uname.'___'.$udom})) {
-         my ($name,$value)=split(/\=/,$_);
-         $useropt{$userprefix.&Apache::lonnet::unescape($name)}=
-	          &Apache::lonnet::unescape($value);
-      }
+        }
+        while (my ($name,$value) = each(%{$courserdatas{$cid}})) {
+            $courseopt{$userprefix.$name}=$value;
+        }
+        # Get userdata (if present)
+        unless ((time-$userrdatas{$uname.'@'.$udom.'.last_cache'})<240) {
+            my %Tmp = &Apache::lonnet::dump('resourcedata',$udom,$uname);
+            $userrdatas{$cid} = \%Tmp;
+            # Most of the time the user does not have a 'resourcedata.db' 
+            # file.  We need to cache that we got nothing instead of bothering
+            # with requesting it every time.
+            $userrdatas{$uname.'@'.$udom.'.last_cache'}=time;
+        }
+        while (my ($name,$value) = each(%{$userrdatas{$cid}})) {
+            $useropt{$userprefix.$name}=$value;
+        }
     }
-# ----------------- now courseopt, useropt initialized for this user and course
-# (used by parmval)
-
-#
-# Load keys for this assessment only
-#
+    # now courseopt, useropt initialized for this user and course
+    # (used by parmval)
+    #
+    # Load keys for this assessment only
+    #
     my %thisassess=();
     my ($symap,$syid,$srcf)=split(/\_\_\_/,$symb);
-    
     foreach (split(/\,/,&Apache::lonnet::metadata($srcf,'keys'))) {
         $thisassess{$_}=1;
     } 
-#
-# Load parameters
-#
-   my %c=();
-
-   if (tie(%parmhash,'GDBM_File',
-           &getcfn($safeeval).'_parms.db',&GDBM_READER,0640)) {
-    my %f=&getformulas($safeeval);
-    foreach (keys(%f))  {
-	if ($_=~/^A/) {
-            unless ($f{$_}=~/^\!/) {
-  	       if ($f{$_}=~/^parameter/) {
-		if ($thisassess{$f{$_}}) {
-                  my $val=&parmval($f{$_},$safeeval);
-                  $c{$_}=$val;
-                  $c{$f{$_}}=$val;
-	        }
-	       } else {
-		  my $key=$f{$_};
-                  my $ckey=$key;
-                  $key=~s/^stores\_/resource\./;
-                  $key=~s/\_/\./g;
- 	          $c{$_}=$returnhash{$key};
-                  $c{$ckey}=$returnhash{$key};
-	       }
-	   }
+    #
+    # Load parameters
+    #
+    my %c=();
+    if (tie(%parmhash,'GDBM_File',
+            $sheet->{'coursefilename'}.'_parms.db',&GDBM_READER(),0640)) {
+        my %f=&getformulas($sheet);
+        foreach my $cell (keys(%f))  {
+            next if ($cell !~ /^A/);
+            next if  ($f{$cell} =~/^[\!\~\-]/);
+            if ($f{$cell}=~/^parameter/) {
+                if (defined($thisassess{$f{$cell}})) {
+                    my $val       = &parmval($f{$cell},$sheet);
+                    $c{$cell}     = $val;
+                    $c{$f{$cell}} = $val;
+                }
+            } else {
+                my $key=$f{$cell};
+                my $ckey=$key;
+                $key=~s/^stores\_/resource\./;
+                $key=~s/\_/\./g;
+                $c{$cell}=$returnhash{$key};
+                $c{$ckey}=$returnhash{$key};
+            }
         }
+        untie(%parmhash);
     }
-    untie(%parmhash);
-   }
-   &setconstants($safeeval,%c);
+    &setconstants($sheet,\%c);
 }
 
 # --------------------------------------------------------- Various form fields
@@ -2108,7 +2090,7 @@ sub loadassessment {
 sub textfield {
     my ($title,$name,$value)=@_;
     return "\n<p><b>$title:</b><br>".
-           '<input type=text name="'.$name.'" size=80 value="'.$value.'">';
+        '<input type=text name="'.$name.'" size=80 value="'.$value.'">';
 }
 
 sub hiddenfield {
@@ -2133,12 +2115,12 @@ sub selectbox {
 #
 
 sub updatesheet {
-    my $safeeval=shift;
-    my $stype=&gettype($safeeval);
+    my ($sheet)=@_;
+    my $stype=$sheet->{'sheettype'};
     if ($stype eq 'classcalc') {
-	return &updateclasssheet($safeeval);
+	return &updateclasssheet($sheet);
     } else {
-        return &updatestudentassesssheet($safeeval);
+        return &updatestudentassesssheet($sheet);
     }
 }
 
@@ -2148,14 +2130,14 @@ sub updatesheet {
 #
 
 sub loadrows {
-    my ($safeeval,$r)=@_;
-    my $stype=&gettype($safeeval);
+    my ($sheet,$r)=@_;
+    my $stype=$sheet->{'sheettype'};
     if ($stype eq 'classcalc') {
-	&loadcourse($safeeval,$r);
+	&loadcourse($sheet,$r);
     } elsif ($stype eq 'studentcalc') {
-        &loadstudent($safeeval);
+        &loadstudent($sheet);
     } else {
-        &loadassessment($safeeval);
+        &loadassessment($sheet);
     }
 }
 
@@ -2165,6 +2147,7 @@ sub checkthis {
     my ($keyname,$time)=@_;
     return ($time<$expiredates{$keyname});
 }
+
 sub forcedrecalc {
     my ($uname,$udom,$stype,$usymb)=@_;
     my $key=$uname.':'.$udom.':'.$stype.':'.$usymb;
@@ -2172,7 +2155,7 @@ sub forcedrecalc {
     if ($ENV{'form.forcerecalc'}) { return 1; }
     unless ($time) { return 1; }
     if ($stype eq 'assesscalc') {
-        my $map=(split(/\_\_\_/,$usymb))[0];
+        my $map=(split(/___/,$usymb))[0];
         if (&checkthis('::assesscalc:',$time) ||
             &checkthis('::assesscalc:'.$map,$time) ||
             &checkthis('::assesscalc:'.$usymb,$time) ||
@@ -2191,102 +2174,94 @@ sub forcedrecalc {
 }
 
 # ============================================================== Export handler
+# exportsheet
+# returns the export row for a spreadsheet.
 #
-# Non-interactive call from with program
-#
-
 sub exportsheet {
- my ($uname,$udom,$stype,$usymb,$fn)=@_;
- my @exportarr=();
-
- if (($usymb=~/^\_(\w+)/) && (!$fn)) {
-    $fn='default_'.$1;
- }
-
-#
-# Check if cached
-#
-
- my $key=$uname.':'.$udom.':'.$stype.':'.$usymb;
- my $found='';
-
- if ($oldsheets{$key}) {
-     foreach (split(/\_\_\_\&\_\_\_/,$oldsheets{$key})) {
-         my ($name,$value)=split(/\_\_\_\=\_\_\_/,$_);
-         if ($name eq $fn) {
-	     $found=$value;
-         }
-     }
- }
-
- unless ($found) {
-     &cachedssheets($uname,$udom,&Apache::lonnet::homeserver($uname,$udom));
-     if ($oldsheets{$key}) {
-	foreach (split(/\_\_\_\&\_\_\_/,$oldsheets{$key})) {
-            my ($name,$value)=split(/\_\_\_\=\_\_\_/,$_);
+    my ($sheet,$uname,$udom,$stype,$usymb,$fn)=@_;
+    $uname = $uname || $sheet->{'uname'};
+    $udom  = $udom  || $sheet->{'udom'};
+    $stype = $stype || $sheet->{'sheettype'};
+    my @exportarr=();
+    if (defined($usymb) && ($usymb=~/^\_(\w+)/) && (!$fn)) {
+        $fn='default_'.$1;
+    }
+    #
+    # Check if cached
+    #
+    my $key=$uname.':'.$udom.':'.$stype.':'.$usymb;
+    my $found='';
+    if ($oldsheets{$key}) {
+        foreach (split(/___&\___/,$oldsheets{$key})) {
+            my ($name,$value)=split(/___=___/,$_);
             if ($name eq $fn) {
-	        $found=$value;
+                $found=$value;
             }
-        } 
-     }
- }
-#
-# Check if still valid
-#
- if ($found) {
-     if (&forcedrecalc($uname,$udom,$stype,$usymb)) {
-	 $found='';
-     }
- }
- 
- if ($found) {
-#
-# Return what was cached
-#
-     @exportarr=split(/\_\_\_\;\_\_\_/,$found);
-
- } else {
-#
-# Not cached
-#        
-
-    my $thissheet=&makenewsheet($uname,$udom,$stype,$usymb);
-    &readsheet($thissheet,$fn);
-    &updatesheet($thissheet);
-    &loadrows($thissheet);
-    &calcsheet($thissheet); 
-    @exportarr=&exportdata($thissheet);
-#
-# Store now
-#
-    my $cid=$ENV{'request.course.id'}; 
+        }
+    }
+    unless ($found) {
+        &cachedssheets($sheet,$uname,$udom);
+        if ($oldsheets{$key}) {
+            foreach (split(/___&\___/,$oldsheets{$key})) {
+                my ($name,$value)=split(/___=___/,$_);
+                if ($name eq $fn) {
+                    $found=$value;
+                }
+            } 
+        }
+    }
+    #
+    # Check if still valid
+    #
+    if ($found) {
+        if (&forcedrecalc($uname,$udom,$stype,$usymb)) {
+            $found='';
+        }
+    }
+    if ($found) {
+        #
+        # Return what was cached
+        #
+        @exportarr=split(/___;___/,$found);
+        return @exportarr;
+    }
+    #
+    # Not cached
+    #        
+    my ($newsheet)=&makenewsheet($uname,$udom,$stype,$usymb);
+    &readsheet($newsheet,$fn);
+    &updatesheet($newsheet);
+    &loadrows($newsheet);
+    &calcsheet($newsheet); 
+    @exportarr=&exportdata($newsheet);
+    #
+    # Store now
+    #
+    my $cid=$newsheet->{'cid'};
     my $current='';
     if ($stype eq 'studentcalc') {
-       $current=&Apache::lonnet::reply('get:'.
-                                     $ENV{'course.'.$cid.'.domain'}.':'.
-                                     $ENV{'course.'.$cid.'.num'}.
-				     ':nohist_calculatedsheets:'.
-                                     &Apache::lonnet::escape($key),
-                                     $ENV{'course.'.$cid.'.home'});
-    } else {
-       $current=&Apache::lonnet::reply('get:'.
-                                     &getudom($thissheet).':'.
-                                     &getuname($thissheet).
-				     ':nohist_calculatedsheets_'.
-                                     $ENV{'request.course.id'}.':'.
-                                     &Apache::lonnet::escape($key),
-                                     &getuhome($thissheet));
-
+        $current=&Apache::lonnet::reply('get:'.$sheet->{'cdom'}.':'.
+                                        $sheet->{'cnum'}.
+                                        ':nohist_calculatedsheets:'.
+                                        &Apache::lonnet::escape($key),
+                                        $sheet->{'chome'});
+    } else {
+        $current=&Apache::lonnet::reply('get:'.$sheet->{'udom'}.':'.
+                                        $sheet->{'uname'}.
+                                        ':nohist_calculatedsheets_'.
+                                        $sheet->{'cid'}.':'.
+                                        &Apache::lonnet::escape($key),
+                                        $sheet->{'uhome'});
     }
     my %currentlystored=();
     unless ($current=~/^error\:/) {
-       foreach (split(/\_\_\_\&\_\_\_/,&Apache::lonnet::unescape($current))) {
-           my ($name,$value)=split(/\_\_\_\=\_\_\_/,$_);
-           $currentlystored{$name}=$value;
-       }
+        foreach (split(/___&\___/,&Apache::lonnet::unescape($current))) {
+            my ($name,$value)=split(/___=___/,$_);
+            $currentlystored{$name}=$value;
+        }
     }
     $currentlystored{$fn}=join('___;___',@exportarr);
-
+    #
     my $newstore='';
     foreach (keys(%currentlystored)) {
         if ($newstore) { $newstore.='___&___'; }
@@ -2294,47 +2269,32 @@ sub exportsheet {
     }
     my $now=time;
     if ($stype eq 'studentcalc') {
-       &Apache::lonnet::reply('put:'.
-                         $ENV{'course.'.$cid.'.domain'}.':'.
-                         $ENV{'course.'.$cid.'.num'}.
-			 ':nohist_calculatedsheets:'.
-                         &Apache::lonnet::escape($key).'='.
-			 &Apache::lonnet::escape($newstore).'&'.
-                         &Apache::lonnet::escape($key).'.time='.$now,
-                         $ENV{'course.'.$cid.'.home'});
-   } else {
-       &Apache::lonnet::reply('put:'.
-                         &getudom($thissheet).':'.
-                         &getuname($thissheet).
-			 ':nohist_calculatedsheets_'.
-                         $ENV{'request.course.id'}.':'.
-                         &Apache::lonnet::escape($key).'='.
-			 &Apache::lonnet::escape($newstore).'&'.
-                         &Apache::lonnet::escape($key).'.time='.$now,
-                         &getuhome($thissheet));
-   }
- }
- return @exportarr;
+        &Apache::lonnet::put('nohist_calculatedsheets',
+                             { $key => $newstore,
+                               $key.time => $now },
+                             $sheet->{'cid'},$sheet->{'cnum'});
+    } else {
+        &Apache::lonnet::put('nohist_calculatedsheets_'.$sheet->{'cid'},
+                             { $key => $newstore,
+                               $key.time => $now },
+                             $sheet->{'udom'},
+                             $sheet->{'uname'})
+    }
+    return @exportarr;
 }
+
 # ============================================================ Expiration Dates
 #
 # Load previously cached student spreadsheets for this course
 #
-
 sub expirationdates {
     undef %expiredates;
     my $cid=$ENV{'request.course.id'};
-    my $reply=&Apache::lonnet::reply('dump:'.
-				     $ENV{'course.'.$cid.'.domain'}.':'.
-                                     $ENV{'course.'.$cid.'.num'}.
-				     ':nohist_expirationdates',
-                                     $ENV{'course.'.$cid.'.home'});
-    unless ($reply=~/^error\:/) {
-	foreach (split(/\&/,$reply)) {
-            my ($name,$value)=split(/\=/,$_);
-            $expiredates{&Apache::lonnet::unescape($name)}
-                        =&Apache::lonnet::unescape($value);
-        }
+    my @tmp = &Apache::lonnet::dump('nohist_expirationdates',
+                                    $ENV{'course.'.$cid.'.domain'},
+                                    $ENV{'course.'.$cid.'.num'});
+    if (lc($tmp[0])!~/^error/){
+        %expiredates = @tmp;
     }
 }
 
@@ -2345,16 +2305,13 @@ sub expirationdates {
 
 sub cachedcsheets {
     my $cid=$ENV{'request.course.id'};
-    my $reply=&Apache::lonnet::reply('dump:'.
-				     $ENV{'course.'.$cid.'.domain'}.':'.
-                                     $ENV{'course.'.$cid.'.num'}.
-				     ':nohist_calculatedsheets',
-                                     $ENV{'course.'.$cid.'.home'});
-    unless ($reply=~/^error\:/) {
-	foreach ( split(/\&/,$reply)) {
-            my ($name,$value)=split(/\=/,$_);
-            $oldsheets{&Apache::lonnet::unescape($name)}
-                      =&Apache::lonnet::unescape($value);
+    my @tmp = &Apache::lonnet::dump('nohist_calculatedsheets',
+                                    $ENV{'course.'.$cid.'.domain'},
+                                    $ENV{'course.'.$cid.'.num'});
+    if ($tmp[0] !~ /^error/) {
+        my %StupidTempHash = @tmp;
+        while (my ($key,$value) = each %StupidTempHash) {
+            $oldsheets{$key} = $value;
         }
     }
 }
@@ -2365,22 +2322,21 @@ sub cachedcsheets {
 #
 
 sub cachedssheets {
-  my ($sname,$sdom,$shome)=@_;
-  unless (($loadedcaches{$sname.'_'.$sdom}) || ($shome eq 'no_host')) {
-    my $cid=$ENV{'request.course.id'};
-    my $reply=&Apache::lonnet::reply('dump:'.$sdom.':'.$sname.
-			             ':nohist_calculatedsheets_'.
-                                      $ENV{'request.course.id'},
-                                     $shome);
-    unless ($reply=~/^error\:/) {
-	foreach ( split(/\&/,$reply)) {
-            my ($name,$value)=split(/\=/,$_);
-            $oldsheets{&Apache::lonnet::unescape($name)}
-                      =&Apache::lonnet::unescape($value);
+    my ($sheet,$uname,$udom) = @_;
+    $uname = $uname || $sheet->{'uname'};
+    $udom  = $udom  || $sheet->{'udom'};
+    if (! $loadedcaches{$sheet->{'uname'}.'_'.$sheet->{'udom'}}) {
+        my @tmp = &Apache::lonnet::dump('nohist_calculatedsheets',
+                                        $sheet->{'udom'},
+                                        $sheet->{'uname'});
+        if ($tmp[0] !~ /^error/) {
+            my %StupidTempHash = @tmp;
+            while (my ($key,$value) = each %StupidTempHash) {
+                $oldsheets{$key} = $value;
+            }
+            $loadedcaches{$sheet->{'uname'}.'_'.$sheet->{'udom'}}=1;
         }
     }
-    $loadedcaches{$sname.'_'.$sdom}=1;
-  }
 }
 
 # ===================================================== Calculated sheets cache
@@ -2393,63 +2349,70 @@ sub cachedssheets {
 # Interactive call to screen
 #
 #
-
-
 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; }
+    # Check the course homeserver
+    $loaderror= &Apache::lonnet::overloaderror($r,
+                      $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
+    if ($loaderror) { return $loaderror; } 
+    
     if ($r->header_only) {
-      $r->content_type('text/html');
-      $r->send_http_header;
-      return OK;
+        $r->content_type('text/html');
+        $r->send_http_header;
+        return OK;
+    }
+    # Global directory configs
+    $includedir = $r->dir_config('lonIncludes');
+    $tmpdir = $r->dir_config('lonDaemons').'/tmp/';
+    # Needs to be in a course
+    if (! $ENV{'request.course.fn'}) { 
+        # Not in a course, or not allowed to modify parms
+        $ENV{'user.error.msg'}=
+            $r->uri.":opa:0:0:Cannot modify spreadsheet";
+        return HTTP_NOT_ACCEPTABLE; 
     }
-
-# ---------------------------------------------------- Global directory configs
-
-$includedir=$r->dir_config('lonIncludes');
-$tmpdir=$r->dir_config('lonDaemons').'/tmp/';
-
-# ----------------------------------------------------- Needs to be in a course
-
-  if ($ENV{'request.course.fn'}) { 
-
-# --------------------------- Get query string for limited number of parameters
-
+    # Get query string for limited number of parameters
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['uname','udom','usymb','ufn']);
-
+    if ($ENV{'request.role'} =~ /^st\./) {
+        delete $ENV{'form.unewfield'}   if (exists($ENV{'form.unewfield'}));
+        delete $ENV{'form.unewformula'} if (exists($ENV{'form.unewformula'}));
+    }
     if (($ENV{'form.usymb'}=~/^\_(\w+)/) && (!$ENV{'form.ufn'})) {
-	$ENV{'form.ufn'}='default_'.$1;
+        $ENV{'form.ufn'}='default_'.$1;
     }
-
-# -------------------------------------- Interactive loading of specific sheet?
+    # Interactive loading of specific sheet?
     if (($ENV{'form.load'}) && ($ENV{'form.loadthissheet'} ne 'Default')) {
-	$ENV{'form.ufn'}=$ENV{'form.loadthissheet'};
+        $ENV{'form.ufn'}=$ENV{'form.loadthissheet'};
     }
-# ------------------------------------------- Nothing there? Must be login user
-
+    #
+    # Determine the user name and domain for the sheet.
     my $aname;
     my $adom;
-
     unless ($ENV{'form.uname'}) {
-	$aname=$ENV{'user.name'};
+        $aname=$ENV{'user.name'};
         $adom=$ENV{'user.domain'};
     } else {
         $aname=$ENV{'form.uname'};
         $adom=$ENV{'form.udom'};
     }
-
-# ------------------------------------------------------------------- Open page
-
+    #
+    # Open page
     $r->content_type('text/html');
     $r->header_out('Cache-control','no-cache');
     $r->header_out('Pragma','no-cache');
     $r->send_http_header;
-
-# --------------------------------------------------------------- Screen output
-
+    # Screen output
     $r->print('<html><head><title>LON-CAPA Spreadsheet</title>');
-    $r->print(<<ENDSCRIPT);
+    if ($ENV{'request.role'} !~ /^st\./) {
+        $r->print(<<ENDSCRIPT);
 <script language="JavaScript">
 
     function celledit(cn,cf) {
@@ -2475,257 +2438,200 @@ $tmpdir=$r->dir_config('lonDaemons').'/t
 
 </script>
 ENDSCRIPT
-    $r->print('</head><body bgcolor="#FFFFFF">'.
-       '<img align=right src=/adm/lonIcons/lonlogos.gif>'.
-       '<h1>LON-CAPA Spreadsheet</h1>'.
-       '<form action="'.$r->uri.'" name=sheet method=post>'.
-       &hiddenfield('uname',$ENV{'form.uname'}).
-       &hiddenfield('udom',$ENV{'form.udom'}).
-       &hiddenfield('usymb',$ENV{'form.usymb'}).
-       &hiddenfield('unewfield','').
-       &hiddenfield('unewformula',''));
-
-# ---------------------- Make sure that this gets out, even if user hits "stop"
-
+    }
+    $r->print('</head>'.&Apache::loncommon::bodytag('Grades Spreadsheet').
+              '<form action="'.$r->uri.'" name=sheet method=post>');
+    $r->print(&hiddenfield('uname',$ENV{'form.uname'}).
+              &hiddenfield('udom',$ENV{'form.udom'}).
+              &hiddenfield('usymb',$ENV{'form.usymb'}).
+              &hiddenfield('unewfield','').
+              &hiddenfield('unewformula',''));
     $r->rflush();
-
-# ---------------------------------------------------------------- Full recalc?
-
-
+    #
+    # Full recalc?
     if ($ENV{'form.forcerecalc'}) {
-	$r->print('<h4>Completely Recalculating Sheet ...</h4>');
+        $r->print('<h4>Completely Recalculating Sheet ...</h4>');
         undef %spreadsheets;
         undef %courserdatas;
         undef %userrdatas;
         undef %defaultsheets;
         undef %updatedata;
-   }
- 
-# ---------------------------------------- Read new sheet or modified worksheet
-
+    }
+    # Read new sheet or modified worksheet
     $r->uri=~/\/(\w+)$/;
-
-    my $asheet=&makenewsheet($aname,$adom,$1,$ENV{'form.usymb'});
-
-# ------------------------ If a new formula had been entered, go from work copy
-
+    my ($sheet)=&makenewsheet($aname,$adom,$1,$ENV{'form.usymb'});
+    #
+    # If a new formula had been entered, go from work copy
     if ($ENV{'form.unewfield'}) {
         $r->print('<h2>Modified Workcopy</h2>');
         $ENV{'form.unewformula'}=~s/\'/\"/g;
         $r->print('<p>New formula: '.$ENV{'form.unewfield'}.'='.
                   $ENV{'form.unewformula'}.'<p>');
-        &setfilename($asheet,$ENV{'form.ufn'});
-	&tmpread($asheet,
-                 $ENV{'form.unewfield'},$ENV{'form.unewformula'});
-
-     } elsif ($ENV{'form.saveas'}) {
-        &setfilename($asheet,$ENV{'form.ufn'});
-	&tmpread($asheet);
-    } else {
-        &readsheet($asheet,$ENV{'form.ufn'});
-    }
-
-# -------------------------------------------------- Print out user information
-
-    unless (&gettype($asheet) eq 'classcalc') {
-        $r->print('<p><b>User:</b> '.&getuname($asheet).
-                  '<br><b>Domain:</b> '.&getudom($asheet));
-        if (&getcsec($asheet) eq '-1') {
-           $r->print('<h3><font color=red>'.
-                     'Not a student in this course</font></h3>');
-        } else {
-           $r->print('<br><b>Section/Group:</b> '.&getcsec($asheet));
-        }
+        $sheet->{'filename'} = $ENV{'form.ufn'};
+        &tmpread($sheet,$ENV{'form.unewfield'},$ENV{'form.unewformula'});
+    } elsif ($ENV{'form.saveas'}) {
+        $sheet->{'filename'} = $ENV{'form.ufn'};
+        &tmpread($sheet);
+    } else {
+        &readsheet($sheet,$ENV{'form.ufn'});
+    }
+    # Print out user information
+    if ($sheet->{'sheettype'} ne 'classcalc') {
+        $r->print('<p><b>User:</b> '.$sheet->{'uname'}.
+                  '<br><b>Domain:</b> '.$sheet->{'udom'});
+        $r->print('<br><b>Section/Group:</b> '.$sheet->{'csec'});
         if ($ENV{'form.usymb'}) {
-           $r->print('<br><b>Assessment:</b> <tt>'.$ENV{'form.usymb'}.'</tt>');
+            $r->print('<br><b>Assessment:</b> <tt>'.
+                      $ENV{'form.usymb'}.'</tt>');
         }
     }
-
-# ---------------------------------------------------------------- Course title
-
-    $r->print('<h1>'.
-            $ENV{'course.'.$ENV{'request.course.id'}.'.description'}.
-             '</h1><h3>'.localtime().'</h3>');
-
-# ---------------------------------------------------- See if user can see this
-
-    if ((&gettype($asheet) eq 'classcalc') || 
-        (&getuname($asheet) ne $ENV{'user.name'}) ||
-        (&getudom($asheet) ne $ENV{'user.domain'})) {
-        unless (&Apache::lonnet::allowed('vgr',&getcid($asheet))) {
-	    $r->print(
-           '<h1>Access Permission Denied</h1></form></body></html>');
+    #
+    # Check user permissions
+    if (($sheet->{'sheettype'} eq 'classcalc'       ) || 
+        ($sheet->{'uname'}     ne $ENV{'user.name'} ) ||
+        ($sheet->{'udom'}      ne $ENV{'user.domain'})) {
+        unless (&Apache::lonnet::allowed('vgr',$sheet->{'cid'})) {
+            $r->print('<h1>Access Permission Denied</h1>'.
+                      '</form></body></html>');
             return OK;
         }
     }
-
-# ---------------------------------------------------------- Additional options
-
-    $r->print(
- '<input type=submit name=forcerecalc value="Completely Recalculate Sheet"><p>'
-		 );
-    if (&gettype($asheet) eq 'assesscalc') {
-       $r->print ('<p><font size=+2><a href="/adm/studentcalc?uname='.
-                                               &getuname($asheet).
-                                               '&udom='.&getudom($asheet).
-                  '">Level up: Student Sheet</a></font><p>');
-    }
-    
-    if ((&gettype($asheet) eq 'studentcalc') && 
-        (&Apache::lonnet::allowed('vgr',&getcid($asheet)))) {
-       $r->print (
-                   '<p><font size=+2><a href="/adm/classcalc">'.
+    # Additional options
+    $r->print('<br />'.
+              '<input type="submit" name="forcerecalc" '.
+              'value="Completely Recalculate Sheet"><p>');
+    if ($sheet->{'sheettype'} eq 'assesscalc') {
+        $r->print('<p><font size=+2>'.
+                  '<a href="/adm/studentcalc?'.
+                  'uname='.$sheet->{'uname'}.
+                  '&udom='.$sheet->{'udom'}.'">'.
+                  'Level up: Student Sheet</a></font><p>');
+    }
+    if (($sheet->{'sheettype'} eq 'studentcalc') && 
+        (&Apache::lonnet::allowed('vgr',$sheet->{'cid'}))) {
+        $r->print ('<p><font size=+2><a href="/adm/classcalc">'.
                    'Level up: Course Sheet</a></font><p>');
     }
-    
-
-# ----------------------------------------------------------------- Save dialog
-
-
+    # Save dialog
     if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
         my $fname=$ENV{'form.ufn'};
         $fname=~s/\_[^\_]+$//;
         if ($fname eq 'default') { $fname='course_default'; }
         $r->print('<input type=submit name=saveas value="Save as ...">'.
-              '<input type=text size=20 name=newfn value="'.$fname.
-              '"> (make default: <input type=checkbox name="makedefufn">)<p>');
+                  '<input type=text size=20 name=newfn value="'.$fname.'">'.
+                  'make default: <input type=checkbox name="makedefufn"><p>');
     }
-
-    $r->print(&hiddenfield('ufn',&getfilename($asheet)));
-
-# ----------------------------------------------------------------- Load dialog
+    $r->print(&hiddenfield('ufn',$sheet->{'filename'}));
+    # Load dialog
     if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
-	$r->print('<p><input type=submit name=load value="Load ...">'.
+        $r->print('<p><input type=submit name=load value="Load ...">'.
                   '<select name="loadthissheet">'.
                   '<option name="default">Default</option>');
-        foreach (&othersheets($asheet,&gettype($asheet))) {
-	    $r->print('<option name="'.$_.'"');
+        foreach (&othersheets($sheet)) {
+            $r->print('<option name="'.$_.'"');
             if ($ENV{'form.ufn'} eq $_) {
-               $r->print(' selected');
+                $r->print(' selected');
             }
             $r->print('>'.$_.'</option>');
         } 
         $r->print('</select><p>');
-        if (&gettype($asheet) eq 'studentcalc') {
-	    &setothersheets($asheet,&othersheets($asheet,'assesscalc'));
+        if ($sheet->{'sheettype'} eq 'studentcalc') {
+            &setothersheets($sheet,
+                            &othersheets($sheet,'assesscalc'));
         }
     }
-
-# --------------------------------------------------------------- Cached sheets
-
+    # Cached sheets
     &expirationdates();
-
     undef %oldsheets;
     undef %loadedcaches;
-
-    if (&gettype($asheet) eq 'classcalc') {
-        $r->print("Loading previously calculated student sheets ...<br>\n");
+    if ($sheet->{'sheettype'} eq 'classcalc') {
+        $r->print("Loading previously calculated student sheets ...\n");
         $r->rflush();
         &cachedcsheets();
-    } elsif (&gettype($asheet) eq 'studentcalc') {
-        $r->print("Loading previously calculated assessment sheets ...<br>\n");
+    } elsif ($sheet->{'sheettype'} eq 'studentcalc') {
+        $r->print("Loading previously calculated assessment sheets ...\n");
         $r->rflush();
-        &cachedssheets(&getuname($asheet),&getudom($asheet),
-                       &getuhome($asheet));
+        &cachedssheets($sheet);
     }
-
-# ----------------------------------------------------- Update sheet, load rows
-
+    # Update sheet, load rows
     $r->print("Loaded sheet(s), updating rows ...<br>\n");
     $r->rflush();
-
-    &updatesheet($asheet);
-
-    $r->print("Updated rows, loading row data ...<br>\n");
+    #
+    &updatesheet($sheet);
+    $r->print("Updated rows, loading row data ...\n");
     $r->rflush();
-
-    &loadrows($asheet,$r);
-
+    #
+    &loadrows($sheet,$r);
     $r->print("Loaded row data, calculating sheet ...<br>\n");
     $r->rflush();
-
-    my $calcoutput=&calcsheet($asheet);
+    #
+    my $calcoutput=&calcsheet($sheet);
     $r->print('<h3><font color=red>'.$calcoutput.'</h3></font>');
-
-# ---------------------------------------------------- See if something to save
-
+    # See if something to save
     if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
         my $fname='';
-	if ($ENV{'form.saveas'} && ($fname=$ENV{'form.newfn'})) {
+        if ($ENV{'form.saveas'} && ($fname=$ENV{'form.newfn'})) {
             $fname=~s/\W/\_/g;
             if ($fname eq 'default') { $fname='course_default'; }
-            $fname.='_'.&gettype($asheet);
-            &setfilename($asheet,$fname);
+            $fname.='_'.$sheet->{'sheettype'};
+            $sheet->{'filename'} = $fname;
             $ENV{'form.ufn'}=$fname;
-	    $r->print('<p>Saving spreadsheet: '.
-                         &writesheet($asheet,$ENV{'form.makedefufn'}).'<p>');
-	}
+            $r->print('<p>Saving spreadsheet: '.
+                      &writesheet($sheet,$ENV{'form.makedefufn'}).
+                      '<p>');
+        }
     }
-
-# ------------------------------------------------ Write the modified worksheet
-
-   $r->print('<b>Current sheet:</b> '.&getfilename($asheet).'<p>');
-
-   &tmpwrite($asheet);
-
-    if (&gettype($asheet) eq 'studentcalc') {
-	$r->print('<br>Show rows with empty A column: ');
+    #
+    # Write the modified worksheet
+    $r->print('<b>Current sheet:</b> '.$sheet->{'filename'}.'<p>');
+    &tmpwrite($sheet);
+    if ($sheet->{'sheettype'} eq 'studentcalc') {
+        $r->print('<br>Show rows with empty A column: ');
     } else {
         $r->print('<br>Show empty rows: ');
-    } 
-
+    }
+    #
     $r->print(&hiddenfield('userselhidden','true').
-             '<input type=checkbox name=showall onClick="submit()"');
-
+              '<input type="checkbox" name="showall" onClick="submit()"');
+    #
     if ($ENV{'form.showall'}) { 
-       $r->print(' checked'); 
+        $r->print(' checked'); 
     } else {
-	unless ($ENV{'form.userselhidden'}) {
-           unless 
-	($ENV{'course.'.$ENV{'request.course.id'}.'.hideemptyrows'} eq 'yes') {
-          $r->print(' checked');
-          $ENV{'form.showall'}=1;
-           }
-       }
+        unless ($ENV{'form.userselhidden'}) {
+            unless 
+                ($ENV{'course.'.$sheet->{'cid'}.'.hideemptyrows'} eq 'yes') {
+                    $r->print(' checked');
+                    $ENV{'form.showall'}=1;
+                }
+        }
     }
     $r->print('>');
-
-    if (&gettype($asheet) eq 'classcalc') {
-       $r->print(
-   ' Output CSV format: <input type=checkbox name=showcsv onClick="submit()"');
-       if ($ENV{'form.showcsv'}) { $r->print(' checked'); }
-       $r->print('>');
+    #
+    # CSV format checkbox (classcalc sheets only)
+    $r->print(' Output CSV format: <input type="checkbox" '.
+              'name="showcsv" onClick="submit()"');
+    $r->print(' checked') if ($ENV{'form.showcsv'});
+    $r->print('>');
+    if ($sheet->{'sheettype'} eq 'classcalc') {
+        $r->print('&nbsp;Student Status: '.
+                  &Apache::lonhtmlcommon::StatusOptions
+                  ($ENV{'form.Status'},'sheet'));
     }
-
-# ------------------------------------------------------------------ Insertrows
-
-   $r->print(<<ENDINSERTBUTTONS);
+    #
+    # Buttons to insert rows
+    $r->print(<<ENDINSERTBUTTONS);
 <br>
 <input type='button' onClick='insertrow("top");' 
 value='Insert Row Top'>
 <input type='button' onClick='insertrow("bottom");' 
 value='Insert Row Bottom'><br>
 ENDINSERTBUTTONS
-
-# ------------------------------------------------------------- Print out sheet
-
-    &outsheet($r,$asheet);
+    # Print out sheet
+    &outsheet($r,$sheet);
     $r->print('</form></body></html>');
-
-# ------------------------------------------------------------------------ Done
-  } else {
-# ----------------------------- Not in a course, or not allowed to modify parms
-      $ENV{'user.error.msg'}=
-        $r->uri.":opa:0:0:Cannot modify spreadsheet";
-      return HTTP_NOT_ACCEPTABLE; 
-  }
+    #  Done
     return OK;
-
 }
 
 1;
 __END__
-
-
-
-