--- loncom/interface/Attic/lonspreadsheet.pm	2000/12/30 19:59:18	1.21
+++ loncom/interface/Attic/lonspreadsheet.pm	2002/09/30 18:03:39	1.113
@@ -1,11 +1,57 @@
+#
+# $Id: lonspreadsheet.pm,v 1.113 2002/09/30 18:03:39 matthew Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # 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 Gerd Kortemeyer
+# POD required stuff:
 
-package Apache::lonspreadsheet;
+=head1 NAME
 
+lonspreadsheet
+
+=head1 SYNOPSIS
+
+Spreadsheet interface to internal LON-CAPA data
+
+=head1 DESCRIPTION
+
+Lonspreadsheet provides course coordinators the ability to manage their
+students grades online.  The students are able to view their own grades, but
+not the grades of their peers.  The spreadsheet is highly customizable,
+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
+
+=cut
+
+package Apache::lonspreadsheet;
+            
 use strict;
 use Safe;
 use Safe::Hole;
@@ -14,12 +60,38 @@ use Apache::lonnet;
 use Apache::Constants qw(:common :http);
 use GDBM_File;
 use HTML::TokeParser;
+use Apache::lonhtmlcommon;
+#
+# Caches for coursewide information 
+#
+my %Section;
+
+#
+# Caches for previously calculated spreadsheets
+#
+
+my %oldsheets;
+my %loadedcaches;
+my %expiredates;
+
+#
+# Cache for stores of an individual user
+#
+
+my $cachedassess;
+my %cachedstores;
 
 #
 # These cache hashes need to be independent of user, resource and course
-# (user and course are in the keys)
+# (user and course can/should be in the keys)
 #
-use vars qw(%spreadsheets %courserdatas %userrdatas);
+
+my %spreadsheets;
+my %courserdatas;
+my %userrdatas;
+my %defaultsheets;
+my %updatedata;
+
 #
 # These global hashes are dependent on user, course and resource, 
 # and need to be initialized every time when a sheet is calculated
@@ -27,21 +99,32 @@ use vars qw(%spreadsheets %courserdatas
 my %courseopt;
 my %useropt;
 my %parmhash;
-my $csec;
-my $uname;
-my $udom;
+
+#
+# Some hashes for stats on timing and performance
+#
+
+my %starttimes;
+my %usedtimes;
+my %numbertimes;
+
+# Stuff that only the screen handler can know
+
+my $includedir;
+my $tmpdir;
 
 # =============================================================================
 # ===================================== Implements an instance of a spreadsheet
 
 sub initsheet {
-    my $safeeval = new Safe;
+    my $safeeval = new Safe(shift);
     my $safehole = new Safe::Hole;
     $safeeval->permit("entereval");
     $safeeval->permit(":base_math");
     $safeeval->permit("sort");
     $safeeval->deny(":base_io");
     $safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT');
+    $safeeval->share('$@');
     my $code=<<'ENDDEFS';
 # ---------------------------------------------------- Inside of the safe space
 
@@ -51,16 +134,41 @@ sub initsheet {
 # v: output values
 # c: preloaded constants (A-column)
 # rl: row label
+# os: other spreadsheets (for student spreadsheet only)
 
-%v=(); 
-%t=();
-%f=();
-%c=();
-%rl=();
-
-$maxrow=0;
-$sheettype='';
-$filename='';
+undef %sheet_values; 
+undef %t;
+undef %f;
+undef %c;
+undef %rowlabel;
+undef @os;
+
+$maxrow = 0;
+$sheettype = '';
+
+# filename/reference of the sheet
+$filename = '';
+
+# user data
+$uname = '';
+$uhome = '';
+$udom  = '';
+
+# course data
+
+$csec = '';
+$chome= '';
+$cnum = '';
+$cdom = '';
+$cid  = '';
+$coursefilename  = '';
+
+# symb
+
+$usymb = '';
+
+# error messages
+$errormsg = '';
 
 sub mask {
     my ($lower,$upper)=@_;
@@ -91,16 +199,16 @@ sub mask {
     } else {
         if (length($ld)!=length($ud)) {
            $num.='(';
-	   map {
+	   foreach ($ld=~m/\d/g) {
               $num.='['.$_.'-9]';
-           } ($ld=~m/\d/g);
+	   }
            if (length($ud)-length($ld)>1) {
               $num.='|\d{'.(length($ld)+1).','.(length($ud)-1).'}';
 	   }
            $num.='|';
-           map {
+           foreach ($ud=~m/\d/g) {
                $num.='[0-'.$_.']';
-           } ($ud=~m/\d/g);
+           }
            $num.=')';
        } else {
            my @lda=($ld=~m/\d/g);
@@ -138,12 +246,285 @@ sub mask {
     return '^'.$alpha.$num."\$";
 }
 
+#-------------------------------------------------------
+
+=item UWCALC(hashname,modules,units,date) 
+
+returns the proportion of the module 
+weights not previously completed by the student.
+
+=over 4
+
+=item hashname 
+
+name of the hash the module dates have been inserted into
+
+=item modules 
+
+reference to a cell which contains a comma deliminated list of modules 
+covered by the assignment.
+
+=item units 
+
+reference to a cell which contains a comma deliminated list of module 
+weights with respect to the assignment
+
+=item date 
+
+reference to a cell which contains the date the assignment was completed.
+
+=back 
+
+=cut
+
+#-------------------------------------------------------
+sub UWCALC {
+    my ($hashname,$modules,$units,$date) = @_;
+    my @Modules = split(/,/,$modules);
+    my @Units   = split(/,/,$units);
+    my $total_weight;
+    foreach (@Units) {
+	$total_weight += $_;
+    }
+    my $usum=0;
+    for (my $i=0; $i<=$#Modules; $i++) {
+	if (&HASH($hashname,$Modules[$i]) eq $date) {
+	    $usum += $Units[$i];
+	}
+    }
+    return $usum/$total_weight;
+}
+
+#-------------------------------------------------------
+
+=item CDLSUM(list) 
+
+returns the sum of the elements in a cell which contains
+a Comma Deliminate List of numerical values.
+'list' is a reference to a cell which contains a comma deliminated list.
+
+=cut
+
+#-------------------------------------------------------
+sub CDLSUM {
+    my ($list)=@_;
+    my $sum;
+    foreach (split/,/,$list) {
+	$sum += $_;
+    }
+    return $sum;
+}
+
+#-------------------------------------------------------
+
+=item CDLITEM(list,index) 
+
+returns the item at 'index' in a Comma Deliminated List.
+
+=over 4
+
+=item list
+
+reference to a cell which contains a comma deliminated list.
+
+=item index 
+
+the Perl index of the item requested (first element in list has
+an index of 0) 
+
+=back
+
+=cut
+
+#-------------------------------------------------------
+sub CDLITEM {
+    my ($list,$index)=@_;
+    my @Temp = split/,/,$list;
+    return $Temp[$index];
+}
+
+#-------------------------------------------------------
+
+=item CDLHASH(name,key,value) 
+
+loads a comma deliminated list of keys into
+the hash 'name', all with a value of 'value'.
+
+=over 4
+
+=item name  
+
+name of the hash.
+
+=item key
+
+(a pointer to) a comma deliminated list of keys.
+
+=item value
+
+a single value to be entered for each key.
+
+=back
+
+=cut
+
+#-------------------------------------------------------
+sub CDLHASH {
+    my ($name,$key,$value)=@_;
+    my @Keys;
+    my @Values;
+    # Check to see if we have multiple $key values
+    if ($key =~ /[A-z](\-[A-z])?\d+(\-\d+)?/) {
+	my $keymask = &mask($key);
+	# Assume the keys are addresses
+	my @Temp = grep /$keymask/,keys(%sheet_values);
+	@Keys = $sheet_values{@Temp};
+    } else {
+	$Keys[0]= $key;
+    }
+    my @Temp;
+    foreach $key (@Keys) {
+	@Temp = (@Temp, split/,/,$key);
+    }
+    @Keys = @Temp;
+    if ($value =~ /[A-z](\-[A-z])?\d+(\-\d+)?/) {
+	my $valmask = &mask($value);
+	my @Temp = grep /$valmask/,keys(%sheet_values);
+	@Values =$sheet_values{@Temp};
+    } else {
+	$Values[0]= $value;
+    }
+    $value = $Values[0];
+    # Add values to hash
+    for (my $i = 0; $i<=$#Keys; $i++) {
+	my $key   = $Keys[$i];
+	if (! exists ($hashes{$name}->{$key})) {
+	    $hashes{$name}->{$key}->[0]=$value;
+	} else {
+	    my @Temp = sort(@{$hashes{$name}->{$key}},$value);
+	    $hashes{$name}->{$key} = \@Temp;
+	}
+    }
+    return "hash '$name' updated";
+}
+
+#-------------------------------------------------------
+
+=item GETHASH(name,key,index) 
+
+returns the element in hash 'name' 
+reference by the key 'key', at index 'index' in the values list.
+
+=cut
+
+#-------------------------------------------------------
+sub GETHASH {
+    my ($name,$key,$index)=@_;
+    if (! defined($index)) {
+	$index = 0;
+    }
+    if ($key =~ /^[A-z]\d+$/) {
+	$key = $sheet_values{$key};
+    }
+    return $hashes{$name}->{$key}->[$index];
+}
+
+#-------------------------------------------------------
+
+=item CLEARHASH(name) 
+
+clears all the values from the hash 'name'
+
+=item CLEARHASH(name,key) 
+
+clears all the values from the hash 'name' associated with the given key.
+
+=cut
+
+#-------------------------------------------------------
+sub CLEARHASH {
+    my ($name,$key)=@_;
+    if (defined($key)) {
+	if (exists($hashes{$name}->{$key})) {
+	    $hashes{$name}->{$key}=undef;
+	    return "hash '$name' key '$key' cleared";
+	}
+    } else {
+	if (exists($hashes{$name})) {
+	    $hashes{$name}=undef;
+	    return "hash '$name' cleared";
+	}
+    }
+    return "Error in clearing hash";
+}
+
+#-------------------------------------------------------
+
+=item HASH(name,key,value) 
+
+loads values into an internal hash.  If a key 
+already has a value associated with it, the values are sorted numerically.  
+
+=item HASH(name,key) 
+
+returns the 0th value in the hash 'name' associated with 'key'.
+
+=cut
+
+#-------------------------------------------------------
+sub HASH {
+    my ($name,$key,$value)=@_;
+    my @Keys;
+    undef @Keys;
+    my @Values;
+    # Check to see if we have multiple $key values
+    if ($key =~ /[A-z](\-[A-z])?\d+(\-\d+)?/) {
+	my $keymask = &mask($key);
+	# Assume the keys are addresses
+	my @Temp = grep /$keymask/,keys(%sheet_values);
+	@Keys = $sheet_values{@Temp};
+    } else {
+	$Keys[0]= $key;
+    }
+    # If $value is empty, return the first value associated 
+    # with the first key.
+    if (! $value) {
+	return $hashes{$name}->{$Keys[0]}->[0];
+    }
+    # 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(%sheet_values);
+	@Values =$sheet_values{@Temp};
+    } else {
+	$Values[0]= $value;
+    }
+    # Add values to hash
+    for (my $i = 0; $i<=$#Keys; $i++) {
+	my $key   = $Keys[$i];
+	my $value = ($i<=$#Values ? $Values[$i] : $Values[0]);
+	if (! exists ($hashes{$name}->{$key})) {
+	    $hashes{$name}->{$key}->[0]=$value;
+	} else {
+	    my @Temp = sort(@{$hashes{$name}->{$key}},$value);
+	    $hashes{$name}->{$key} = \@Temp;
+	}
+    }
+    return $Values[-1];
+}
+
+#-------------------------------------------------------
+
+=item NUM(range)
+
+returns the number of items in the range.
+
+=cut
+
+#-------------------------------------------------------
 sub NUM {
     my $mask=mask(@_);
-    my $num=0;
-    map {
-        $num++;
-    } grep /$mask/,keys %v;
+    my $num= $#{@{grep(/$mask/,keys(%sheet_values))}}+1;
     return $num;   
 }
 
@@ -151,31 +532,49 @@ sub BIN {
     my ($low,$high,$lower,$upper)=@_;
     my $mask=mask($lower,$upper);
     my $num=0;
-    map {
-        if (($v{$_}>=$low) && ($v{$_}<=$high)) {
+    foreach (grep /$mask/,keys(%sheet_values)) {
+        if (($sheet_values{$_}>=$low) && ($sheet_values{$_}<=$high)) {
             $num++;
         }
-    } grep /$mask/,keys %v;
+    }
     return $num;   
 }
 
 
+#-------------------------------------------------------
+
+=item SUM(range)
+
+returns the sum of items in the range.
+
+=cut
+
+#-------------------------------------------------------
 sub SUM {
     my $mask=mask(@_);
     my $sum=0;
-    map {
-        $sum+=$v{$_};
-    } grep /$mask/,keys %v;
+    foreach (grep /$mask/,keys(%sheet_values)) {
+        $sum+=$sheet_values{$_};
+    }
     return $sum;   
 }
 
+#-------------------------------------------------------
+
+=item MEAN(range)
+
+compute the average of the items in the range.
+
+=cut
+
+#-------------------------------------------------------
 sub MEAN {
     my $mask=mask(@_);
     my $sum=0; my $num=0;
-    map {
-        $sum+=$v{$_};
+    foreach (grep /$mask/,keys(%sheet_values)) {
+        $sum+=$sheet_values{$_};
         $num++;
-    } grep /$mask/,keys %v;
+    }
     if ($num) {
        return $sum/$num;
     } else {
@@ -183,58 +582,106 @@ sub MEAN {
     }   
 }
 
+#-------------------------------------------------------
+
+=item STDDEV(range)
+
+compute the standard deviation of the items in the range.
+
+=cut
+
+#-------------------------------------------------------
 sub STDDEV {
     my $mask=mask(@_);
     my $sum=0; my $num=0;
-    map {
-        $sum+=$v{$_};
+    foreach (grep /$mask/,keys(%sheet_values)) {
+        $sum+=$sheet_values{$_};
         $num++;
-    } grep /$mask/,keys %v;
+    }
     unless ($num>1) { return undef; }
     my $mean=$sum/$num;
     $sum=0;
-    map {
-        $sum+=($v{$_}-$mean)**2;
-    } grep /$mask/,keys %v;
+    foreach (grep /$mask/,keys(%sheet_values)) {
+        $sum+=($sheet_values{$_}-$mean)**2;
+    }
     return sqrt($sum/($num-1));    
 }
 
+#-------------------------------------------------------
+
+=item PROD(range)
+
+compute the product of the items in the range.
+
+=cut
+
+#-------------------------------------------------------
 sub PROD {
     my $mask=mask(@_);
     my $prod=1;
-    map {
-        $prod*=$v{$_};
-    } grep /$mask/,keys %v;
+    foreach (grep /$mask/,keys(%sheet_values)) {
+        $prod*=$sheet_values{$_};
+    }
     return $prod;   
 }
 
+#-------------------------------------------------------
+
+=item MAX(range)
+
+compute the maximum of the items in the range.
+
+=cut
+
+#-------------------------------------------------------
 sub MAX {
     my $mask=mask(@_);
     my $max='-';
-    map {
-        unless ($max) { $max=$v{$_}; }
-        if (($v{$_}>$max) || ($max eq '-')) { $max=$v{$_}; }
-    } grep /$mask/,keys %v;
+    foreach (grep /$mask/,keys(%sheet_values)) {
+        unless ($max) { $max=$sheet_values{$_}; }
+        if (($sheet_values{$_}>$max) || ($max eq '-')) { $max=$sheet_values{$_}; }
+    } 
     return $max;   
 }
 
+#-------------------------------------------------------
+
+=item MIN(range)
+
+compute the minimum of the items in the range.
+
+=cut
+
+#-------------------------------------------------------
 sub MIN {
     my $mask=mask(@_);
     my $min='-';
-    map {
-        unless ($max) { $max=$v{$_}; }
-        if (($v{$_}<$min) || ($min eq '-')) { $min=$v{$_}; }
-    } grep /$mask/,keys %v;
+    foreach (grep /$mask/,keys(%sheet_values)) {
+        unless ($max) { $max=$sheet_values{$_}; }
+        if (($sheet_values{$_}<$min) || ($min eq '-')) { 
+            $min=$sheet_values{$_}; 
+        }
+    }
     return $min;   
 }
 
+#-------------------------------------------------------
+
+=item SUMMAX(num,lower,upper)
+
+compute the sum of the largest 'num' items in the range from
+'lower' to 'upper'
+
+=cut
+
+#-------------------------------------------------------
 sub SUMMAX {
     my ($num,$lower,$upper)=@_;
     my $mask=mask($lower,$upper);
     my @inside=();
-    map {
-	$inside[$#inside+1]=$v{$_};
-    } grep /$mask/,keys %v;
+    foreach (grep /$mask/,keys(%sheet_values)) {
+	push (@inside,$sheet_values{$_});
+    }
     @inside=sort(@inside);
     my $sum=0; my $i;
     for ($i=$#inside;(($i>$#inside-$num) && ($i>=0));$i--) { 
@@ -243,13 +690,23 @@ sub SUMMAX {
     return $sum;   
 }
 
+#-------------------------------------------------------
+
+=item SUMMIN(num,lower,upper)
+
+compute the sum of the smallest 'num' items in the range from
+'lower' to 'upper'
+
+=cut
+
+#-------------------------------------------------------
 sub SUMMIN {
     my ($num,$lower,$upper)=@_;
     my $mask=mask($lower,$upper);
     my @inside=();
-    map {
-	$inside[$#inside+1]=$v{$_};
-    } grep /$mask/,keys %v;
+    foreach (grep /$mask/,keys(%sheet_values)) {
+	$inside[$#inside+1]=$sheet_values{$_};
+    }
     @inside=sort(@inside);
     my $sum=0; my $i;
     for ($i=0;(($i<$num) && ($i<=$#inside));$i++) { 
@@ -258,6 +715,115 @@ 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=~/^\&/) {
+	my ($func,$var,$formula)=($expression=~/^\&(\w+)\(([^\;]+)\;(.*)\)/);
+	my @vars=split(/\W+/,$formula);
+        my %values=();
+        undef %values;
+	foreach ( @vars ) {
+            my $varname=$_;
+            if ($varname=~/\D/) {
+               $formula=~s/$varname/'$c{\''.$varname.'\'}'/ge;
+               $varname=~s/$var/\(\\w\+\)/g;
+	       foreach (keys(%c)) {
+		  if ($_=~/$varname/) {
+		      $values{$1}=1;
+                  }
+               }
+	    }
+        }
+        if ($func eq 'EXPANDSUM') {
+            my $result='';
+	    foreach (keys(%values)) {
+                my $thissum=$formula;
+                $thissum=~s/$var/$_/g;
+                $result.=$thissum.'+';
+            } 
+            $result=~s/\+$//;
+            return $result;
+        } else {
+	    return 0;
+        }
+    } else {
+        # it is not a function, so it is a parameter name
+        # We should do the following:
+        #    1. Take the list of parameter names
+        #    2. look through the list for ones that match the parameter we want
+        #    3. If there are no collisions, return the one that matches
+        #    4. If there is a collision, return 'bad parameter name error'
+        my $returnvalue = '';
+        my @matches = ();
+        $#matches = -1;
+        study $expression;
+        foreach $parameter (keys(%c)) {
+            push @matches,$parameter if ($parameter =~ /$expression/);
+        }
+        if ($#matches == 0) {
+            $returnvalue = '$c{\''.$matches[0].'\'}';
+        } elsif ($#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'";
+        }
+        return $returnvalue;
+    }
+}
+
 sub sett {
     %t=();
     my $pattern='';
@@ -266,63 +832,87 @@ sub sett {
     } else {
         $pattern='[A-Z]';
     }
-    map {
-	if ($_=~/template\_(\w)/) {
-	  my $col=$1;
-          unless ($col=~/^$pattern/) {
-            map {
-	      if ($_=~/A(\d+)/) {
-		my $trow=$1;
-                if ($trow) {
-		    my $lb=$col.$trow;
-                    $t{$lb}=$f{'template_'.$col};
-                    $t{$lb}=~s/\#/$trow/g;
-                    $t{$lb}=~s/\.\.+/\,/g;
-                    $t{$lb}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g;
-                }
-	      }
-            } keys %f;
-	  }
-      }
-    } keys %f;
-    map {
-	if (($f{$_}) && ($_!~/template\_/)) {
-            if ($_=~/^$pattern/) {
+    # Deal with the template row
+    foreach (keys(%f)) {
+	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 (exists($f{$_}) && ($_!~/template\_/)) {
+            my $matches=($_=~/^$pattern(\d+)/);
+            if  (($matches) && ($1)) {
 	        unless ($f{$_}=~/^\!/) {
 		    $t{$_}=$c{$_};
                 }
             } 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;
             }
         }
-    } keys %f;
+    }
+    # 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;
-        map {
-            my $old=$v{$_};
-            $v{$_}=eval($t{$_});
+        foreach (keys(%t)) {
+            my $old=$sheet_values{$_};
+            $sheet_values{$_}=eval $t{$_};
 	    if ($@) {
-		%v=();
-                return $@;
+		undef %sheet_values;
+                return $_.': '.$@;
             }
-	    if ($v{$_} ne $old) { $notfinished=1; }
-        } keys %t;
+	    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 '';
@@ -331,33 +921,53 @@ sub calc {
 sub templaterow {
     my @cols=();
     $cols[0]='<b><font size=+1>Template</font></b>';
-    map {
+    foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M',
+	     'N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
+	     'a','b','c','d','e','f','g','h','i','j','k','l','m',
+	     'n','o','p','q','r','s','t','u','v','w','x','y','z') {
         my $fm=$f{'template_'.$_};
         $fm=~s/[\'\"]/\&\#34;/g;
-        $cols[$#cols+1]="'template_$_','$fm'".'___eq___'.$fm;
-    } ('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');
+        push(@cols,"'template_$_','$fm'".'___eq___'.$fm);
+    }
     return @cols;
 }
 
+#
+# This is actually used for the student spreadsheet, not the assessment sheet
+# Do not be fooled by the name!
+#
 sub outrowassess {
+    # $n is the current row number
     my $n=shift;
     my @cols=();
     if ($n) {
-       $cols[0]=$rl{$f{'A'.$n}};
+        my ($usy,$ufn)=split(/__&&&\__/,$f{'A'.$n});
+        if ($rowlabel{$usy}) {
+            $cols[0]=$rowlabel{$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';
+            }
+            $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>';
     }
-    map {
+    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};
         $fm=~s/[\'\"]/\&\#34;/g;
-        $cols[$#cols+1]="'$_$n','$fm'".'___eq___'.$v{$_.$n};
-    } ('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');
+        push(@cols,"'$_$n','$fm'".'___eq___'.$sheet_values{$_.$n});
+    }
     return @cols;
 }
 
@@ -365,29 +975,28 @@ sub outrow {
     my $n=shift;
     my @cols=();
     if ($n) {
-       $cols[0]=$rl{$f{'A'.$n}};
+       $cols[0]=$rowlabel{$f{'A'.$n}};
     } else {
        $cols[0]='<b><font size=+1>Export</font></b>';
     }
-    map {
+    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};
         $fm=~s/[\'\"]/\&\#34;/g;
-        $cols[$#cols+1]="'$_$n','$fm'".'___eq___'.$v{$_.$n};
-    } ('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');
+        push(@cols,"'$_$n','$fm'".'___eq___'.$sheet_values{$_.$n});
+    }
     return @cols;
 }
 
 sub exportrowa {
-    my $rowa='';
-    map {
-	$rowa.=$v{$_.'0'}."___;___";
-    } ('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');
-    $rowa=~s/\_\_\_\;\_\_\_$//;
-    return $rowa;
+    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') {
+	push(@exportarray,$sheet_values{$_.'0'});
+    } 
+    return @exportarray;
 }
 
 # ------------------------------------------- End of "Inside of the safe space"
@@ -399,50 +1008,57 @@ ENDDEFS
 # ------------------------------------------------ Add or change formula values
 
 sub setformulas {
-    my ($safeeval,@f)=@_;
-    $safeeval->reval('%f='."('".join("','",@f)."');");
+    my ($safeeval,%f)=@_;
+    %{$safeeval->varglob('f')}=%f;
 }
 
 # ------------------------------------------------ Add or change formula values
 
 sub setconstants {
-    my ($safeeval,@c)=@_;
-    $safeeval->reval('%c='."('".join("','",@c)."');");
+    my ($safeeval,%c)=@_;
+    %{$safeeval->varglob('c')}=%c;
+}
+
+# --------------------------------------------- Set names of other spreadsheets
+
+sub setothersheets {
+    my ($safeeval,@os)=@_;
+    @{$safeeval->varglob('os')}=@os;
 }
 
 # ------------------------------------------------ Add or change formula values
 
 sub setrowlabels {
-    my ($safeeval,@rl)=@_;
-    $safeeval->reval('%rl='."('".join("','",@rl)."');");
+    my ($safeeval,%rowlabel)=@_;
+    %{$safeeval->varglob('rowlabel')}=%rowlabel;
 }
 
 # ------------------------------------------------------- Calculate spreadsheet
 
 sub calcsheet {
     my $safeeval=shift;
-    $safeeval->reval('&calc();');
+    return $safeeval->reval('&calc();');
 }
 
 # ------------------------------------------------------------------ Get values
 
 sub getvalues {
     my $safeeval=shift;
-    return $safeeval->reval('%v');
+    return $safeeval->reval('%sheet_values');
 }
 
 # ---------------------------------------------------------------- Get formulas
 
 sub getformulas {
     my $safeeval=shift;
-    return $safeeval->reval('%f');
+    return %{$safeeval->varglob('f')};
 }
 
-# -------------------------------------------------------------------- Set type
+# ----------------------------------------------------- Get value of $f{'A'.$n}
 
-sub settype {
-    my ($safeeval,$type)=@_;
-    $safeeval->reval('$sheettype="'.$type.'";');
+sub getfa {
+    my ($safeeval,$n)=@_;
+    return $safeeval->reval('$f{"A'.$n.'"}');
 }
 
 # -------------------------------------------------------------------- Get type
@@ -451,6 +1067,7 @@ sub gettype {
     my $safeeval=shift;
     return $safeeval->reval('$sheettype');
 }
+
 # ------------------------------------------------------------------ Set maxrow
 
 sub setmaxrow {
@@ -479,185 +1096,455 @@ sub getfilename {
     return $safeeval->reval('$filename');
 }
 
+# --------------------------------------------------------------- Get course ID
+
+sub getcid {
+    my $safeeval=shift;
+    return $safeeval->reval('$cid');
+}
+
+# --------------------------------------------------------- Get course filename
+
+sub getcoursefilename {
+    my $safeeval=shift;
+    return $safeeval->reval('$coursefilename');
+}
+
+# ----------------------------------------------------------- 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');
+}
+
 # ------------------------------------------------------------- Export of A-row
 
-sub exportrow {
+sub exportdata {
     my $safeeval=shift;
     return $safeeval->reval('&exportrowa()');
 }
 
+
 # ========================================================== End of Spreadsheet
 # =============================================================================
 
-
+#
+# Procedures for screen output
+#
 # --------------------------------------------- Produce output row n from sheet
 
 sub rown {
     my ($safeeval,$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';
+    }
+    unless ($ENV{'form.showcsv'}) {
+        $rowdata.="\n<tr><td><b><font size=+1>$n</font></b></td>";
     } else {
-       $defaultbg='#E0FF';
+        $rowdata.="\n".'"'.$n.'"';
     }
-    my $rowdata="\n<tr><td><b><font size=+1>$n</font></b></td>";
     my $showf=0;
     my $proc;
-    my $maxred;
-    if (&gettype($safeeval) eq 'assesscalc') {
+    my $maxred=1;
+    my $sheettype=&gettype($safeeval);
+    if ($sheettype eq 'studentcalc') {
         $proc='&outrowassess';
-        $maxred=1;
+        $maxred=26;
     } else {
         $proc='&outrow';
+    }
+    if ($sheettype eq 'assesscalc') {
+        $maxred=1;
+    } else {
         $maxred=26;
     }
-    if ($n eq '-') { $proc='&templaterow'; $n=-1; }
-    map {
-       my $bgcolor=$defaultbg.((($showf-1)/5==int(($showf-1)/5))?'99':'DD');
-       my ($fm,$vl)=split(/\_\_\_eq\_\_\_/,$_);
-       if ($showf==0) { $vl=$_; }
-       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>';
-       }
-       $showf++;
-    } $safeeval->reval($proc.'('.$n.')');
-    return $rowdata.'</tr>';
+    if (&getfa($safeeval,$n)=~/^[\~\-]/) { $maxred=1; }
+    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.'>';
+                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>');
+    } else {
+        return '';
+    }
 }
 
 # ------------------------------------------------------------- Print out sheet
 
 sub outsheet {
-    my $safeeval=shift;
-    my $maxred;
-    my $realm;
-    if (&gettype($safeeval) eq 'assesscalc') {
+    my ($r,$safeeval,$sheetdata)=@_;
+    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 ($sheetdata->{'sheettype'} eq 'assesscalc') {
         $maxred=1;
         $realm='Assessment';
-    } elsif (&gettype($safeeval) eq 'studentcalc') {
+    } elsif ($sheetdata->{'sheettype'} eq 'studentcalc') {
         $maxred=26;
         $realm='User';
-    } else {
-        $maxred=26;
-        $realm='Course';
     }
-    my $maxyellow=52-$maxred;
-    my $tabledata='<table border=2><tr><th colspan=2 rowspan=2><font size=+2>'.
-                  $realm.'</font></th>'.
+    #
+    # Column label
+    my $tabledata;
+    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;
-    map {
-        $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>";
-    } ('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');
-    $tabledata.='</tr>';
+        $tabledata.='</tr>'.&rown($safeeval,'-').&rown($safeeval,0);
+    }
+    $r->print($tabledata);
+    #
+    # Prepare to output rows
     my $row;
     my $maxrow=&getmaxrow($safeeval);
-    $tabledata.=&rown($safeeval,'-');
-    for ($row=0;$row<=$maxrow;$row++) {
-        $tabledata.=&rown($safeeval,$row);
+    #
+    my @sortby=();
+    my @sortidx=();
+    for ($row=1;$row<=$maxrow;$row++) {
+        push (@sortby, $safeeval->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 ($sheetdata->{'sheettype'} eq 'assesscalc') {
+        $what='Item';
+    } elsif ($sheetdata->{'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>');
+                $r->print('<td>'.
+                          join('</td><td>',
+                               (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.
+                                      'abcdefghijklmnopqrstuvwxyz'))).
+                          "</td></tr>\n");
+            }
+            $n++;
+            $r->print($thisrow);
+        }
     }
-    $tabledata.='</table>';
+    $r->print($ENV{'form.showcsv'}?'</pre>':'</table>');
 }
 
+#
+# ----------------------------------------------- Read list of available sheets
+# 
+sub othersheets {
+    my ($safeeval,$stype)=@_;
+    #
+    my $cnum  = &getcnum($safeeval);
+    my $cdom  = &getcdom($safeeval);
+    my $chome = &getchome($safeeval);
+    #
+    my @alternatives=();
+    my %results=&Apache::lonnet::dump($stype.'_spreadsheets',$cdom,$cnum);
+    my ($tmp) = keys(%results);
+    unless ($tmp =~ /^(con_lost|error|no_such_host)/i) {
+        @alternatives = sort (keys(%results));
+    }
+    return @alternatives; 
+}
 
 
-# ------------------------------------- Read spreadsheet formulas from a course
+#
+# -------------------------------------- Parse a spreadsheet
+# 
+sub parse_sheet {
+    # $sheetxml is a scalar reference or a scalar
+    my ($sheetxml) = @_;
+    if (! ref($sheetxml)) {
+        my $tmp = $sheetxml;
+        $sheetxml = \$tmp;
+    }
+    my %f;
+    my $parser=HTML::TokeParser->new($sheetxml);
+    my $token;
+    while ($token=$parser->get_token) {
+        if ($token->[0] eq 'S') {
+            if ($token->[1] eq 'field') {
+                $f{$token->[2]->{'col'}.$token->[2]->{'row'}}=
+                    $parser->get_text('/field');
+            }
+            if ($token->[1] eq 'template') {
+                $f{'template_'.$token->[2]->{'col'}}=
+                    $parser->get_text('/template');
+            }
+        }
+    }
+    return \%f;
+}
 
+#
+# -------------------------------------- Read spreadsheet formulas for a course
+#
 sub readsheet {
-    my ($safeeval,$fn,$r)=@_;
-    my %f=();
-    if (($fn eq '') || ($fn=~/^default\_/)) {
-	my $sheetxml='';
-       {
-         my $fh;
-         if ($fh=Apache::File->new($r->dir_config('lonIncludes').
-                         '/default.'.&gettype($safeeval))) {
-               $sheetxml=join('',<$fh>);
-          }
-       }
-       my $parser=HTML::TokeParser->new(\$sheetxml);
-       my $token;
-       while ($token=$parser->get_token) {
-          if ($token->[0] eq 'S') {
- 	     if ($token->[1] eq 'field') {
- 		 $f{$token->[2]->{'col'}.$token->[2]->{'row'}}=
- 		     $parser->get_text('/field');
- 	     }
-             if ($token->[1] eq 'template') {
-                 $f{'template_'.$token->[2]->{'col'}}=
-                     $parser->get_text('/template');
-             }
-          }
-       }
-       &setfilename($safeeval,'default_'.&gettype($safeeval));
+    my ($safeeval,$sheetdata,$fn)=@_;
+    #
+    my $stype = $sheetdata->{'sheettype'};
+    my $cnum  = $sheetdata->{'cnum'};
+    my $cdom  = $sheetdata->{'cdom'};
+    my $chome = $sheetdata->{'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
+    &setfilename($safeeval,$fn);
+    # see if sheet is cached
+    my $fstring='';
+    if ($fstring=$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}) {
+        &setformulas($safeeval,split(/\_\_\_\;\_\_\_/,$fstring));
     } else {
-       &setfilename($safeeval,$fn);
-       unless ($spreadsheets{$fn}) {
-          $spreadsheets{$fn}='';
-          my $reply=&Apache::lonnet::reply('dump:'.
-              $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'.
-              $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.':'.$fn,
-              $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
-          unless ($reply=~/^error\:/) {
-             $spreadsheets{$fn}=$reply;
-          }
-       }
-       map {
-           my ($name,$value)=split(/\=/,$_);
-           $f{&Apache::lonnet::unescape($name)}=
-	      &Apache::lonnet::unescape($value);
-       } split(/\&/,$spreadsheets{$fn});
+        # 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);
     }
+}
 
-    &setformulas($safeeval,%f);
+# -------------------------------------------------------- Make new spreadsheet
+sub makenewsheet {
+    my ($uname,$udom,$stype,$usymb)=@_;
+    my %sheetdata=();
+    $sheetdata{'uname'} = $uname;
+    $sheetdata{'udom'}  = $udom;
+    $sheetdata{'sheettype'} = $stype;
+    $sheetdata{'usymb'} = $usymb;
+    $sheetdata{'cid'}   = $ENV{'request.course.id'};
+    $sheetdata{'csec'}  = $Section{$uname.':'.$udom};
+    $sheetdata{'coursefilename'}   = $ENV{'request.course.fn'};
+    $sheetdata{'cnum'}  = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+    $sheetdata{'cdom'}  = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+    $sheetdata{'chome'} = $ENV{'course.'.$ENV{'request.course.id'}.'.home'};
+    $sheetdata{'uhome'} = &Apache::lonnet::homeserver($uname,$udom);
+    
+    my $safeeval=initsheet($stype);
+    my $initstring = '';
+    foreach (keys(%sheetdata)) {
+        $initstring.= qq{\$$_="$sheetdata{$_}";};
+    }
+    $safeeval->reval($initstring);
+    return $safeeval,\%sheetdata;
 }
 
 # ------------------------------------------------------------ Save spreadsheet
-
 sub writesheet {
-  my $safeeval=shift;
-  if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
-    my %f=&getformulas($safeeval);
-    my $sheetdata='';
-    map {
-       $sheetdata.=&Apache::lonnet::escape($_).'='.
-	   &Apache::lonnet::escape($f{$_}).'&';
-    } keys %f;
-    $sheetdata=~s/\&$//;
-    my $reply=&Apache::lonnet::reply('put:'.
-              $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'.
-              $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.':'.
-              &getfilename($safeeval).':'.
-              $sheetdata,
-              $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
-  }   
+    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);
+                } 
+                return $reply;
+            } 
+            return $reply;
+        } 
+        return $reply;
+    }
+    return 'unauthorized';
 }
 
 # ----------------------------------------------- Make a temp copy of the sheet
-
+# "Modified workcopy" - interactive only
+#
 sub tmpwrite {
-    my ($safeeval,$tmpdir,$symb)=@_;
-    my $fn=$uname.'_'.$udom.'_spreadsheet_'.$symb.'_'.&getfilename($safeeval);
+    my $safeeval=shift;
+    my $fn=$ENV{'user.name'}.'_'.
+        $ENV{'user.domain'}.'_spreadsheet_'.&getusymb($safeeval).'_'.
+           &getfilename($safeeval);
     $fn=~s/\W/\_/g;
     $fn=$tmpdir.$fn.'.tmp';
     my $fh;
@@ -667,14 +1554,16 @@ sub tmpwrite {
 }
 
 # ---------------------------------------------------------- Read the temp copy
-
 sub tmpread {
-    my ($safeeval,$tmpdir,$symb,$nfield,$nform)=@_;
-    my $fn=$uname.'_'.$udom.'_spreadsheet_'.$symb.'_'.&getfilename($safeeval);
+    my ($safeeval,$nfield,$nform)=@_;
+    my $fn=$ENV{'user.name'}.'_'.
+           $ENV{'user.domain'}.'_spreadsheet_'.&getusymb($safeeval).'_'.
+           &getfilename($safeeval);
     $fn=~s/\W/\_/g;
     $fn=$tmpdir.$fn.'.tmp';
     my $fh;
     my %fo=();
+    my $countrows=0;
     if ($fh=Apache::File->new($fn)) {
         my $name;
         while ($name=<$fh>) {
@@ -682,332 +1571,577 @@ sub tmpread {
             my $value=<$fh>;
             chomp($value);
             $fo{$name}=$value;
+            if ($name=~/^A(\d+)$/) {
+		if ($1>$countrows) {
+		    $countrows=$1;
+                }
+            }
         }
     }
-    $fo{$nfield}=$nform;
+    if ($nform eq 'changesheet') {
+        $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}='--- '.$newrow;
+        } else {
+            $fo{'A'.$countrows}='~~~ '.$newrow;
+        }
+    } else {
+       if ($nfield) { $fo{$nfield}=$nform; }
+    }
     &setformulas($safeeval,%fo);
 }
 
-# --------------------------------------------------------------- Read metadata
-
-sub readmeta {
-    my $fn=shift;
-    unless ($fn=~/\.meta$/) { $fn.='meta'; }
-    my $content;
-    my %returnhash=();
-    {
-      my $fh=Apache::File->new($fn);
-      $content=join('',<$fh>);
-    }
-   my $parser=HTML::TokeParser->new(\$content);
-   my $token;
-   while ($token=$parser->get_token) {
-      if ($token->[0] eq 'S') {
-         my $entry=$token->[1];
-         if (($entry eq 'stores') || ($entry eq 'parameter')) {
-             my $unikey=$entry;
-             $unikey.='_'.$token->[2]->{'part'}; 
-             $unikey.='_'.$token->[2]->{'name'}; 
-             $returnhash{$unikey}=$token->[2]->{'display'};
-         }
-     }
-  }
-    return %returnhash;
-}
-
-# ================================================================== Parameters
-# -------------------------------------------- Figure out a cascading parameter
-
-sub parmval {
-    my ($what,$symb)=@_;
-
-    unless ($symb) { return ''; }
-    my $result='';
-
-    my ($mapname,$id,$fn)=split(/\_\_\_/,$symb);
-# ----------------------------------------------------- Cascading lookup scheme
-       my $rwhat=$what;
-       $what=~s/^parameter\_//;
-       $what=~s/\_/\./;
-
-       my $symbparm=$symb.'.'.$what;
-       my $mapparm=$mapname.'___(all).'.$what;
+##################################################
+##################################################
 
-       my $seclevel=
-            $ENV{'request.course.id'}.'.['.
-		$csec.'].'.$what;
-       my $seclevelr=
-            $ENV{'request.course.id'}.'.['.
-		$csec.'].'.$symbparm;
-       my $seclevelm=
-            $ENV{'request.course.id'}.'.['.
-		$csec.'].'.$mapparm;
+=pod
 
-       my $courselevel=
-            $ENV{'request.course.id'}.'.'.$what;
-       my $courselevelr=
-            $ENV{'request.course.id'}.'.'.$symbparm;
-       my $courselevelm=
-            $ENV{'request.course.id'}.'.'.$mapparm;
+=item &parmval()
 
-# ---------------------------------------------------------- fourth, check user
-      
-      if ($uname) { 
+Determine the value of a parameter.
 
-       if ($useropt{$courselevelr}) { return $useropt{$courselevelr}; }
+Inputs: $what, the parameter needed, $safeeval, the safe space
 
-       if ($useropt{$courselevelm}) { return $useropt{$courselevelm}; }
+Returns: The value of a parameter, or '' if none.
 
-       if ($useropt{$courselevel}) { return $useropt{$courselevel}; }
+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.
 
-      }
+=cut
 
-# --------------------------------------------------------- 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
-
-       return &Apache::lonnet::metadata($fn,$rwhat.'.default');
-        
+##################################################
+##################################################
+sub parmval {
+    my ($what,$safeeval,$sheetdata)=@_;
+    my $symb  = $sheetdata->{'usymb'};
+    unless ($symb) { return ''; }
+    #
+    my $cid   = $sheetdata->{'cid'};
+    my $csec  = $sheetdata->{'csec'};
+    my $uname = $sheetdata->{'uname'};
+    my $udom  = $sheetdata->{'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 ($uname) { 
+        return $useropt{$courselevelr} if ($useropt{$courselevelr});
+        return $useropt{$courselevelm} if ($useropt{$courselevelm});
+        return $useropt{$courselevel}  if ($useropt{$courselevel});
+    }
+    # third, check course
+    if ($csec) {
+        return $courseopt{$seclevelr} if ($courseopt{$seclevelr});
+        return $courseopt{$seclevelm} if ($courseopt{$seclevelm});
+        return $courseopt{$seclevel}  if ($courseopt{$seclevel});
+    }
+    #
+    return $courseopt{$courselevelr} if ($courseopt{$courselevelr});
+    return $courseopt{$courselevelm} if ($courseopt{$courselevelm});
+    return $courseopt{$courselevel}  if ($courseopt{$courselevel});
+    # second, check map parms
+    my $thisparm = $parmhash{$symbparm};
+    return $thisparm if ($thisparm);
+    # first, check default
+    return &Apache::lonnet::metadata($fn,$rwhat.'.default');
+}
+
+# ---------------------------------------------- Update rows for course listing
+sub updateclasssheet {
+    my ($safeeval,$sheetdata) = @_;
+    my $cnum  =$sheetdata->{'cnum'};
+    my $cdom  =$sheetdata->{'cdom'};
+    my $cid   =$sheetdata->{'cid'};
+    my $chome =$sheetdata->{'chome'};
+    #
+    %Section = ();
+
+    #
+    # Read class list and row labels
+    my %classlist;
+    my @tmp = &Apache::lonnet::dump('classlist',$cdom,$cnum);
+    if ($tmp[0] !~ /^error/) {
+        %classlist = @tmp;
+    } else {
+        return 'Could not access course data';
+    }
+    undef @tmp;
+    #
+    my %currentlist=();
+    my $now=time;
+    foreach my $student (keys(%classlist)) {
+        my ($end,$start)=split(/\:/,$classlist{$student});
+        my $active=1;
+        $active = 0 if (($end) && ($now>$end));
+        $active = 1 if ($ENV{'form.Status'} eq 'Any');
+        $active = !$active if ($ENV{'form.Status'} eq 'Expired');
+        if ($active) {
+            my $rowlabel='';
+            my ($studentName,$studentDomain)=split(/\:/,$student);
+            my $studentSection=&Apache::lonnet::usection($studentDomain,
+                                                         $studentName,$cid);
+            $Section{$studentName.':'.$studentDomain} = $studentSection;
+#            if ($studentSection==-1) {
+#                unless ($ENV{'form.showcsv'}) {
+#                    $rowlabel='<font color=red>Data not available: '.
+#                        $studentName.'</font>';
+#                } else {
+#                    $rowlabel='ERROR","'.$studentName.
+#                        '","Data not available","","","';
+#                }
+#            } else {
+                my %reply=&Apache::lonnet::idrget($studentDomain,$studentName);
+                my %studentInformation=&Apache::lonnet::get
+                    ('environment',
+                     ['lastname','generation','firstname','middlename','id'],
+                     $studentDomain,$studentName);
+                if (! $ENV{'form.showcsv'}) {
+                    $rowlabel='<a href="/adm/studentcalc?uname='.$studentName.
+                        '&udom='.$studentDomain.'">'.
+                            $studentSection.'&nbsp;';
+                    foreach ('id','firstname','middlename',
+                             'lastname','generation'){
+                        $rowlabel.=$studentInformation{$_}."&nbsp;";
+                    }
+                    $rowlabel.='</a>';
+                } else {
+                    $rowlabel= '"'.join('","',
+                                        ($studentSection,
+                                         $studentInformation{'id'},
+                                         $studentInformation{'firstname'},
+                                         $studentInformation{'middlename'},
+                                         $studentInformation{'lastname'},
+                                         $studentInformation{'generation'})
+                                        ).'"';
+                }
+ #           }
+            $currentlist{$student}=$rowlabel;
+        } # end of if ($active)
+    } # end of foreach my $student (keys(%classlist))
+    #
+    # 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{$_}=~/^(\~\~\~|\-\-\-)/)) {
+                $f{$_}='!!! Obsolete';
+                $changed=1;
+            }
+        }
+    }
+    #
+    # New and unknown keys
+    foreach (sort keys(%currentlist)) {
+        unless ($existing{$_}) {
+            $changed=1;
+            $maxrow++;
+            $f{'A'.$maxrow}=$_;
+        }
+    }
+    if ($changed) { &setformulas($safeeval,%f); }
+    #
+    &setmaxrow($safeeval,$maxrow);
+    &setrowlabels($safeeval,%currentlist);
 }
 
-
-# ----------------------------------------------------------------- Update rows
-
-sub updaterows {
-    my $safeeval=shift;
+# ----------------------------------- Update rows for student and assess sheets
+sub updatestudentassesssheet {
+    my ($safeeval,$sheetdata) = @_;
     my %bighash;
-# -------------------------------------------------------------------- Tie hash
-      if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
-                       &GDBM_READER,0640)) {
-# --------------------------------------------------------- Get all assessments
-
-	my %allkeys=();
-        my %allassess=();
-
-        my $stype=&gettype($safeeval);
-
-        map {
-	    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}=$bighash{'title_'.$id};
-
-                 if ($stype eq 'assesscalc') {
-                   map {
-                       if (($_=~/^stores\_(.*)/) || ($_=~/^parameter\_(.*)/)) {
-			  my $key=$_;
-                          my $display=
-			      &Apache::lonnet::metadata($srcf,$key.'.display');
-                          unless ($display) {
-                              $display=
-			         &Apache::lonnet::metadata($srcf,$key.'.name');
-                          }
-                          $allkeys{$key}=$display;
-		       }
-                   } split(/\,/,&Apache::lonnet::metadata($srcf,'keys'));
-	         }
-	      }
-	   }
-        } keys %bighash;
+    my $stype=$sheetdata->{'sheettype'};
+    my $uname=$sheetdata->{'uname'};
+    my $udom =$sheetdata->{'udom'};
+    my %current=();
+    if  ($updatedata
+         {$ENV{'request.course.fn'}.'_'.$stype.'_'.$uname.'_'.$udom}) {
+        %current=split(/\_\_\_\;\_\_\_/,
+                       $updatedata{$ENV{'request.course.fn'}.
+                                       '_'.$stype.'_'.$uname.'_'.$udom});
+    } else {
+        # Tie hash
+        tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
+            &GDBM_READER(),0640);
+        if (! tied(%bighash)) {
+            return 'Could not access course data';
+        }
+        # 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 (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})){
+            $adduserstr='&uname='.$uname.'&udom='.$udom;
+        }
+        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>'
+             );
+        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);
+                $allassess{$symb}=
+                    '<a href="/adm/assesscalc?usymb='.$symb.$adduserstr.'">'.
+                        $bighash{'title_'.$id}.'</a>';
+                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;
+                    $allkeys{$key}=$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
-#
-# -------------------- Find discrepancies between the course row table and this
-#
-        my %f=&getformulas($safeeval);
-        my $changed=0;
-
-        my %current=();
+        #
+        # %allkeys has a list of storage and parameter displays by unikey
+        # %allassess has a list of all resource displays by symb
+        #
         if ($stype eq 'assesscalc') {
-	    %current=%allkeys;
+            %current=%allkeys;
         } elsif ($stype eq 'studentcalc') {
             %current=%allassess;
         }
+        $updatedata{$ENV{'request.course.fn'}.'_'.$stype.'_'.$uname.'_'.$udom}=
+            join('___;___',%current);
+        # Get current from cache
+    }
+    # 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)) {
+        next if ($_!~/^A(\d+)/);
+        $maxrow=($1>$maxrow)?$1:$maxrow;
+        my ($usy,$ufn)=split(/\_\_\&\&\&\_\_/,$f{$_});
+        $existing{$usy}=1;
+        unless ((defined($current{$usy})) || (!$1) ||
+                ($f{$_}=~/^(\~\~\~|\-\-\-)/)){
+            $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}=$_;
+        }
+    }
+    if ($changed) { &setformulas($safeeval,%f); }
+    &setmaxrow($safeeval,$maxrow);
+    &setrowlabels($safeeval,%current);
+    #
+    undef %current;
+    undef %existing;
+}
 
-        my $maxrow=0;
-        my %existing=();
+# ------------------------------------------------ Load data for one assessment
 
-# ----------------------------------------------------------- Now obsolete rows
-	map {
-	    if ($_=~/^A(\d+)/) {
-                $maxrow=($1>$maxrow)?$1:$maxrow;
-                $existing{$f{$_}}=1;
-		unless ((defined($current{$f{$_}})) || (!$1)) {
-		   $f{$_}='!!! Obsolete';
-                   $changed=1;
+sub loadstudent {
+    my ($safeeval,$sheetdata)=@_;
+    my %c=();
+    my %f=&getformulas($safeeval);
+    $cachedassess=$sheetdata->{'uname'}.':'.$sheetdata->{'udom'};
+    # Get ALL the student preformance data
+    my @tmp = &Apache::lonnet::dump($sheetdata->{'cid'},
+                                    $sheetdata->{'udom'},
+                                    $sheetdata->{'uname'},
+                                    undef);
+    if ($tmp[0] !~ /^error:/) {
+        %cachedstores = @tmp;
+    }
+    undef @tmp;
+    # 
+    my @assessdata=();
+    foreach (keys(%f)) {
+	next if ($_!~/^A(\d+)/);
+        my $row=$1;
+        next if (($f{$_}=~/^[\!\~\-]/) || ($row==0));
+        my ($usy,$ufn)=split(/__&&&\__/,$f{$_});
+        @assessdata=&exportsheet($sheetdata->{'uname'},
+                                 $sheetdata->{'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';
                 }
             }
-        } keys %f;
-
-# -------------------------------------------------------- New and unknown keys
-     
-        map {
-            unless ($existing{$_}) {
-		$changed=1;
-                $maxrow++;
-                $f{'A'.$maxrow}=$_;
-            }
-        } keys %current;        
-     
-        if ($changed) { &setformulas($safeeval,%f); }
-
-        &setmaxrow($safeeval,$maxrow);
-        &setrowlabels($safeeval,%current);
-
-    } else {
-        return 'Could not access course data';
+            $index++;
+        }
     }
+    $cachedassess='';
+    undef %cachedstores;
+    &setformulas($safeeval,%f);
+    &setconstants($safeeval,%c);
 }
 
 # --------------------------------------------------- Load data for one student
-
-sub rowazstudent {
-    my $safeeval=shift;
+#
+sub loadcourse {
+    my ($safeeval,$sheetdata,$r)=@_;
     my %c=();
     my %f=&getformulas($safeeval);
-    map {
+    my $total=0;
+    foreach (keys(%f)) {
 	if ($_=~/^A(\d+)/) {
-	   my $row=$1;
-           unless ($f{$_}=~/^\!/) {
-              my @assessdata=split(/\_\_\_\;\_\_\_/,
-                             &Apache::lonnet::ssi(
-        '/res/msu/korte/junk.assesscalc',('utarget' => 'export',
-                                          'uname'   => $uname,
-                                          'udom'    => $udom,
-			                  'usymb'   => $f{$_})));
-              my $index=0;
-              map {
-                  if ($assessdata[$index]) {
-		     $c{$_.$row}=$assessdata[$index];
-                     unless ($_ eq 'A') { 
-			 $f{$_.$row}='import';
-                     }
-		  }
-                  $index++;
-              } ('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');
-	   }
+	    unless ($f{$_}=~/^[\!\~\-]/) { $total++; }
+        }
+    }
+    my $now=0;
+    my $since=time;
+    $r->print(<<ENDPOP);
+<script>
+    popwin=open('','popwin','width=400,height=100');
+    popwin.document.writeln('<html><body bgcolor="#FFFFFF">'+
+      '<h3>Spreadsheet Calculation Progress</h3>'+
+      '<form name=popremain>'+
+      '<input type=text size=35 name=remaining value=Starting></form>'+
+      '</body></html>');
+    popwin.document.close();
+</script>
+ENDPOP
+    $r->rflush();
+    foreach (keys(%f)) {
+	next if ($_!~/^A(\d+)/);
+        my $row=$1;
+        next if (($f{$_}=~/^[\!\~\-]/)  || ($row==0));
+        my @studentdata=&exportsheet(split(/\:/,$f{$_}),
+                                     '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++;
+            }
         }
-    } keys %f;
+    }
     &setformulas($safeeval,%f);
     &setconstants($safeeval,%c);
+    $r->print('<script>popwin.close()</script>');
+    $r->rflush(); 
 }
 
 # ------------------------------------------------ Load data for one assessment
+#
+sub loadassessment {
+    my ($safeeval,$sheetdata)=@_;
 
-sub rowaassess {
-    my ($safeeval,$symb)=@_;
-    my $uhome=&Apache::lonnet::homeserver($uname,$udom);
-    my $namespace;
-    unless ($namespace=$ENV{'request.course.id'}) { return ''; }
+    my $uhome = $sheetdata->{'uhome'};
+    my $uname = $sheetdata->{'uname'};
+    my $udom  = $sheetdata->{'udom'};
+    my $symb  = $sheetdata->{'usymb'};
+    my $cid   = $sheetdata->{'cid'};
+    my $cnum  = $sheetdata->{'cnum'};
+    my $cdom  = $sheetdata->{'cdom'};
+    my $chome = $sheetdata->{'chome'};
 
-# ----------------------------------------------------------- Get stored values
-    my $answer=&Apache::lonnet::reply(
-       "restore:$udom:$uname:".
-       &Apache::lonnet::escape($namespace).":".
-       &Apache::lonnet::escape($symb),$uhome);
+    my $namespace;
+    unless ($namespace=$cid) { return ''; }
+    # Get stored values
     my %returnhash=();
-    map {
-	my ($name,$value)=split(/\=/,$_);
-        $returnhash{&Apache::lonnet::unescape($name)}=
-                    &Apache::lonnet::unescape($value);
-    } split(/\&/,$answer);
-    my $version;
-    for ($version=1;$version<=$returnhash{'version'};$version++) {
-       map {
-          $returnhash{$_}=$returnhash{$version.':'.$_};
-       } split(/\:/,$returnhash{$version.':keys'});
-    }
-# ----------------------------- returnhash now has all stores for this resource
-
-# ---------------------------- initialize coursedata and userdata for this user
-    %courseopt=();
-    %useropt=();
-    my $uhome=&Apache::lonnet::homeserver($uname,$udom);
-    unless ($uhome eq 'no_host') { 
-# -------------------------------------------------------------- Get coursedata
-      unless
-        ((time-$courserdatas{$ENV{'request.course.id'}.'.last_cache'})<120) {
-         my $reply=&Apache::lonnet::reply('dump:'.
-              $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'.
-              $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.':resourcedata',
-              $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
-         if ($reply!~/^error\:/) {
-            $courserdatas{$ENV{'request.course.id'}}=$reply;
-            $courserdatas{$ENV{'request.course.id'}.'.last_cache'}=time;
-         }
-      }
-      map {
-         my ($name,$value)=split(/\=/,$_);
-         $courseopt{&Apache::lonnet::unescape($name)}=
-                    &Apache::lonnet::unescape($value);  
-      } split(/\&/,$courserdatas{$ENV{'request.course.id'}});
-# --------------------------------------------------- Get userdata (if present)
-      unless
-        ((time-$userrdatas{$uname.'___'.$udom.'.last_cache'})<120) {
-         my $reply=
-       &Apache::lonnet::reply('dump:'.$udom.':'.$uname.':resourcedata',$uhome);
-         if ($reply!~/^error\:/) {
-	     $userrdatas{$uname.'___'.$udom}=$reply;
-	     $userrdatas{$uname.'___'.$udom.'.last_cache'}=time;
-         }
-      }
-      map {
-         my ($name,$value)=split(/\=/,$_);
-         $useropt{&Apache::lonnet::unescape($name)}=
-	          &Apache::lonnet::unescape($value);
-      } split(/\&/,$userrdatas{$uname.'___'.$udom});
-   }
-# -- now courseopt, useropt initialized for this user and course (used parmval)
+    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
+    #
+    # This is dumb.  It is also necessary :(
+    my @oldkeys=keys %returnhash;
+    #
+    foreach (@oldkeys) {
+        my $name=$_;
+        my $value=$returnhash{$_};
+        delete $returnhash{$_};
+        $name=~s/\_/\./g;
+        $returnhash{$name}=$value;
+    }
+    # 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;
+                $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);
+        }
+    }
+    # 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=();
-    my %f=&getformulas($safeeval);
-    map {
-	if ($_=~/^A/) {
-            unless ($f{$_}=~/^\!/) {
-  	       if ($f{$_}=~/^parameter/) {
-	          $c{$_}=&parmval($f{$_},$symb);
-	       } else {
-		  my $key=$f{$_};
-                  $key=~s/^stores\_/resource\./;
-                  $key=~s/\_/\./;
- 	          $c{$_}=$returnhash{$key};
-	       }
-	   }
+    if (tie(%parmhash,'GDBM_File',
+            &getcoursefilename($safeeval).'_parms.db',&GDBM_READER(),0640)) {
+        my %f=&getformulas($safeeval);
+        foreach (keys(%f))  {
+            next if ($_!~/^A/);
+            next if  ($f{$_}=~/^[\!\~\-]/);
+            if ($f{$_}=~/^parameter/) {
+                if ($thisassess{$f{$_}}) {
+                    my $val=&parmval($f{$_},$safeeval,$sheetdata);
+                    $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};
+            }
         }
-    } keys %f;
-
+        untie(%parmhash);
+    }
     &setconstants($safeeval,%c);
 }
 
@@ -1016,7 +2150,7 @@ sub rowaassess {
 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 {
@@ -1027,173 +2161,551 @@ sub hiddenfield {
 sub selectbox {
     my ($title,$name,$value,%options)=@_;
     my $selout="\n<p><b>$title:</b><br>".'<select name="'.$name.'">';
-    map {
+    foreach (sort keys(%options)) {
         $selout.='<option value="'.$_.'"';
         if ($_ eq $value) { $selout.=' selected'; }
         $selout.='>'.$options{$_}.'</option>';
-    } sort keys %options;
+    }
     return $selout.'</select>';
 }
 
-# ================================================================ Main handler
+# =============================================== Update information in a sheet
+#
+# Add new users or assessments, etc.
+#
 
-sub handler {
-    my $r=shift;
+sub updatesheet {
+    my ($safeeval,$sheetdata)=@_;
+    my $stype=$sheetdata->{'sheettype'};
+    if ($stype eq 'classcalc') {
+	return &updateclasssheet($safeeval,$sheetdata);
+    } else {
+        return &updatestudentassesssheet($safeeval,$sheetdata);
+    }
+}
 
-    $uname='';
-    $udom='';
-    $csec='';
-
-   if ($r->header_only) {
-      $r->content_type('text/html');
-      $r->send_http_header;
-      return OK;
-   }
-
-# ----------------------------------------------------- Needs to be in a course
-
-  if (($ENV{'request.course.fn'}) || 
-      ($ENV{'request.state'} eq 'construct')) { 
-
-# --------------------------- Get query string for limited number of parameters
-
-    map {
-       my ($name, $value) = split(/=/,$_);
-       $value =~ tr/+/ /;
-       $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
-       if (($name eq 'uname') || ($name eq 'udom') || 
-           ($name eq 'usymb') || ($name eq 'ufn')) {
-           unless ($ENV{'form.'.$name}) {
-              $ENV{'form.'.$name}=$value;
-	   }
-       }
-    } (split(/&/,$ENV{'QUERY_STRING'}));
+# =================================================== Load the rows for a sheet
+#
+# Import the data for rows
+#
 
-# ------------------------------------------- Nothing there? Must be login user
-    unless ($ENV{'form.uname'}) {
-	$uname=$ENV{'user.name'};
-        $udom=$ENV{'user.domain'};
+sub loadrows {
+    my ($safeeval,$sheetdata,$r)=@_;
+    my $stype=$sheetdata->{'sheettype'};
+    if ($stype eq 'classcalc') {
+	&loadcourse($safeeval,$sheetdata,$r);
+    } elsif ($stype eq 'studentcalc') {
+        &loadstudent($safeeval,$sheetdata);
     } else {
-        $uname=$ENV{'form.uname'};
-        $udom=$ENV{'form.udom'};
+        &loadassessment($safeeval,$sheetdata);
     }
-# ----------------------------------------------------------- Change of target?
+}
 
-    my $reroute=($ENV{'form.utarget'} eq 'export');
+# ======================================================= Forced recalculation?
 
-# ------------------------------------------------------------------- Open page
+sub checkthis {
+    my ($keyname,$time)=@_;
+    return ($time<$expiredates{$keyname});
+}
+
+sub forcedrecalc {
+    my ($uname,$udom,$stype,$usymb)=@_;
+    my $key=$uname.':'.$udom.':'.$stype.':'.$usymb;
+    my $time=$oldsheets{$key.'.time'};
+    if ($ENV{'form.forcerecalc'}) { return 1; }
+    unless ($time) { return 1; }
+    if ($stype eq 'assesscalc') {
+        my $map=(split(/\_\_\_/,$usymb))[0];
+        if (&checkthis('::assesscalc:',$time) ||
+            &checkthis('::assesscalc:'.$map,$time) ||
+            &checkthis('::assesscalc:'.$usymb,$time) ||
+            &checkthis($uname.':'.$udom.':assesscalc:',$time) ||
+            &checkthis($uname.':'.$udom.':assesscalc:'.$map,$time) ||
+            &checkthis($uname.':'.$udom.':assesscalc:'.$usymb,$time)) {
+            return 1;
+        } 
+    } else {
+        if (&checkthis('::studentcalc:',$time) || 
+            &checkthis($uname.':'.$udom.':studentcalc:',$time)) {
+	    return 1;
+        }
+    }
+    return 0; 
+}
 
+# ============================================================== Export handler
+#
+# 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(/\_\_\_\=\_\_\_/,$_);
+                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);
+    } else {
+        #
+        # Not cached
+        #        
+        my ($thissheet,$sheetdata)=&makenewsheet($uname,$udom,$stype,$usymb);
+        &readsheet($thissheet,$sheetdata,$fn);
+        &updatesheet($thissheet,$sheetdata);
+        &loadrows($thissheet,$sheetdata);
+        &calcsheet($thissheet,$sheetdata); 
+        @exportarr=&exportdata($thissheet,$sheetdata);
+        #
+        # Store now
+        #
+        my $cid=$ENV{'request.course.id'}; 
+        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:'.$sheetdata->{'udom'}.':'.
+                                            $sheetdata->{'uname'}.
+                                            ':nohist_calculatedsheets_'.
+                                            $ENV{'request.course.id'}.':'.
+                                            &Apache::lonnet::escape($key),
+                                            $sheetdata->{'uhome'});
+        }
+        my %currentlystored=();
+        unless ($current=~/^error\:/) {
+            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.='___&___'; }
+            $newstore.=$_.'___=___'.$currentlystored{$_};
+        }
+        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:'.
+                                   $sheetdata->{'udom'}.':'.
+                                   $sheetdata->{'uname'}.
+                                   ':nohist_calculatedsheets_'.
+                                   $ENV{'request.course.id'}.':'.
+                                   &Apache::lonnet::escape($key).'='.
+                                   &Apache::lonnet::escape($newstore).'&'.
+                                   &Apache::lonnet::escape($key).'.time='.$now,
+                                   $sheetdata->{'uhome'});
+        }
+    }
+    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);
+        }
+    }
+}
+
+# ===================================================== Calculated sheets cache
+#
+# Load previously cached student spreadsheets for this course
+#
+
+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);
+        }
+    }
+}
+
+# ===================================================== Calculated sheets cache
+#
+# Load previously cached assessment spreadsheets for this student
+#
+
+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);
+        }
+    }
+    $loadedcaches{$sname.'_'.$sdom}=1;
+  }
+}
+
+# ===================================================== Calculated sheets cache
+#
+# Load previously cached assessment spreadsheets for this student
+#
+
+# ================================================================ Main handler
+#
+# Interactive call to screen
+#
+#
+sub handler {
+    my $r=shift;
+
+    my $loaderror=&Apache::lonnet::overloaderror($r);
+    if ($loaderror) { return $loaderror; }
+    $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;
+    }
+    # 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; 
+    }
+    # 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;
+    }
+    # Interactive loading of specific sheet?
+    if (($ENV{'form.load'}) && ($ENV{'form.loadthissheet'} ne 'Default')) {
+        $ENV{'form.ufn'}=$ENV{'form.loadthissheet'};
+    }
+    #
+    # Determine the user name and domain for the sheet.
+    my $aname;
+    my $adom;
+    unless ($ENV{'form.uname'}) {
+        $aname=$ENV{'user.name'};
+        $adom=$ENV{'user.domain'};
+    } else {
+        $aname=$ENV{'form.uname'};
+        $adom=$ENV{'form.udom'};
+    }
+    #
+    # 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
-
-  unless ($reroute) {
+    # 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) {
         var cnf=prompt(cn,cf);
-	if (cnf!=null) {
-	    document.sheet.unewfield.value=cn;
+        if (cnf!=null) {
+            document.sheet.unewfield.value=cn;
             document.sheet.unewformula.value=cnf;
             document.sheet.submit();
         }
     }
 
-</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',''));
-  }
+    function changesheet(cn) {
+	document.sheet.unewfield.value=cn;
+        document.sheet.unewformula.value='changesheet';
+        document.sheet.submit();
+    }
 
-# ---------------------------------------- Read new sheet or modified worksheet
+    function insertrow(cn) {
+	document.sheet.unewfield.value='insertrow';
+        document.sheet.unewformula.value=cn;
+        document.sheet.submit();
+    }
 
-    my $sheetone=initsheet();
+</script>
+ENDSCRIPT
+    }
+    $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?
+    if ($ENV{'form.forcerecalc'}) {
+        $r->print('<h4>Completely Recalculating Sheet ...</h4>');
+        undef %spreadsheets;
+        undef %courserdatas;
+        undef %userrdatas;
+        undef %defaultsheets;
+        undef %updatedata;
+    }
+    # Read new sheet or modified worksheet
     $r->uri=~/\/(\w+)$/;
-    &settype($sheetone,$1);
+    my ($asheet,$asheetdata)=&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('New formula: '.$ENV{'form.unewfield'}.'='.
-                  $ENV{'form.unewformula'}.'<br>');
-        &setfilename($sheetone,$ENV{'form.ufn'});
-	&tmpread($sheetone,$r->dir_config('lonDaemons').'/tmp/',
-                 $ENV{'form.usymb'},
-                 $ENV{'form.unewfield'},$ENV{'form.unewformula'});
+        $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($sheetone,$ENV{'form.ufn'},$r);
-        $ENV{'form.ufn'}=&getfilename($sheetone);
+        &readsheet($asheet,$asheetdata,$ENV{'form.ufn'});
     }
-
-# --------------------------------------------- See if all import rows uptodate
-
-    if (tie(%parmhash,'GDBM_File',
-       $ENV{'request.course.fn'}.'_parms.db',&GDBM_READER,0640)) {
-       $csec=&Apache::lonnet::usection($udom,$uname,$ENV{'request.course.id'});
-       if ($csec eq '-1') {
-          $r->print('<h3><font color=red>'.
-   "User '$uname' at domain '$udom' not a student in this course</font></h3>");
-       }
-       &updaterows($sheetone);
-       untie(%parmhash);
-   } else {
-       $r->print('<h3><font color=red>'.
-	   'Could not initialize import fields (not in a course)</font></h3>');
-   }
-
-# ------------------------------------------------ Write the modified worksheet
-
-   &tmpwrite($sheetone,$r->dir_config('lonDaemons').'/tmp/',
-              $ENV{'form.usymb'});
-
-# ----------------------------------------------------- Print user, course, etc
-   unless ($reroute) {
-    $r->print(&hiddenfield('ufn',$ENV{'form.ufn'}).
-              "<b>User '$uname' at domain '$udom' for '".
-              $ENV{'course.'.$ENV{'request.course.id'}.'.description'}."'");
-    if ($csec) {
-       $r->print(", group/section '$csec'");
+    # Print out user information
+    unless ($asheetdata->{'sheettype'} eq 'classcalc') {
+        $r->print('<p><b>User:</b> '.$asheetdata->{'uname'}.
+                  '<br><b>Domain:</b> '.$asheetdata->{'udom'});
+#        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> '.$asheetdata->{'csec'});
+#        }
+        if ($ENV{'form.usymb'}) {
+            $r->print('<br><b>Assessment:</b> <tt>'.
+                      $ENV{'form.usymb'}.'</tt>');
+        }
     }
-    $r->print("</b>\n");
-   }
-# -------------------------------------------------------- Import and calculate
-
-    if (&gettype($sheetone) eq 'assesscalc') {
-	&rowaassess($sheetone,$ENV{'form.usymb'});
-    } elsif  (&gettype($sheetone) eq 'studentcalc') {
-	&rowazstudent($sheetone);
+    #
+    # Check user permissions
+    if (($asheetdata->{'sheettype'} eq 'classcalc'       ) || 
+        ($asheetdata->{'uname'}     ne $ENV{'user.name'} ) ||
+        ($asheetdata->{'udom'}      ne $ENV{'user.domain'})) {
+        unless (&Apache::lonnet::allowed('vgr',$asheetdata->{'cid'})) {
+            $r->print('<h1>Access Permission Denied</h1>'.
+                      '</form></body></html>');
+            return OK;
+        }
     }
-    my $calcoutput=&calcsheet($sheetone);
-    unless ($reroute) {
-       $r->print('<h3><font color=red>'.$calcoutput.'</h3></font>');
+    # Additional options
+    $r->print('<br />'.
+              '<input type="submit" name="forcerecalc" '.
+              'value="Completely Recalculate Sheet"><p>');
+    if ($asheetdata->{'sheettype'} eq 'assesscalc') {
+        $r->print('<p><font size=+2>'.
+                  '<a href="/adm/studentcalc?'.
+                  'uname='.$asheetdata->{'uname'}.
+                  '&udom='.$asheetdata->{'udom'}.'">'.
+                  'Level up: Student Sheet</a></font><p>');
+    }
+    if (($asheetdata->{'sheettype'} eq 'studentcalc') && 
+        (&Apache::lonnet::allowed('vgr',$asheetdata->{'cid'}))) {
+        $r->print ('<p><font size=+2><a href="/adm/classcalc">'.
+                   'Level up: Course Sheet</a></font><p>');
+    }
+    # 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>');
+    }
+    $r->print(&hiddenfield('ufn',&getfilename($asheet)));
+    # Load dialog
+    if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
+        $r->print('<p><input type=submit name=load value="Load ...">'.
+                  '<select name="loadthissheet">'.
+                  '<option name="default">Default</option>');
+        foreach (&othersheets($asheet,$asheetdata->{'sheettype'})) {
+            $r->print('<option name="'.$_.'"');
+            if ($ENV{'form.ufn'} eq $_) {
+                $r->print(' selected');
+            }
+            $r->print('>'.$_.'</option>');
+        } 
+        $r->print('</select><p>');
+        if ($asheetdata->{'sheettype'} eq 'studentcalc') {
+            &setothersheets($asheet,&othersheets($asheet,'assesscalc'));
+        }
     }
-
-# ------------------------------------------------------- Print or export sheet
-   unless ($reroute) {   
-    $r->print(&outsheet($sheetone));
-
+    # Cached sheets
+    &expirationdates();
+    undef %oldsheets;
+    undef %loadedcaches;
+    if ($asheetdata->{'sheettype'} eq 'classcalc') {
+        $r->print("Loading previously calculated student sheets ...\n");
+        $r->rflush();
+        &cachedcsheets();
+    } elsif ($asheetdata->{'sheettype'} eq 'studentcalc') {
+        $r->print("Loading previously calculated assessment sheets ...\n");
+        $r->rflush();
+        &cachedssheets($asheetdata->{'uname'},$asheetdata->{'udom'},
+                       $asheetdata->{'uhome'});
+    }
+    # Update sheet, load rows
+    $r->print("Loaded sheet(s), updating rows ...<br>\n");
+    $r->rflush();
+    #
+    &updatesheet($asheet,$asheetdata);
+    $r->print("Updated rows, loading row data ...\n");
+    $r->rflush();
+    #
+    &loadrows($asheet,$asheetdata,$r);
+    $r->print("Loaded row data, calculating sheet ...<br>\n");
+    $r->rflush();
+    #
+    my $calcoutput=&calcsheet($asheet);
+    $r->print('<h3><font color=red>'.$calcoutput.'</h3></font>');
+    # See if something to save
+    if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
+        my $fname='';
+        if ($ENV{'form.saveas'} && ($fname=$ENV{'form.newfn'})) {
+            $fname=~s/\W/\_/g;
+            if ($fname eq 'default') { $fname='course_default'; }
+            $fname.='_'.$asheetdata->{'sheettype'};
+            &setfilename($asheet,$fname);
+            $ENV{'form.ufn'}=$fname;
+            $r->print('<p>Saving spreadsheet: '.
+                      &writesheet($asheet,$ENV{'form.makedefufn'}).'<p>');
+        }
+    }
+    #
+    #Write the modified worksheet
+    $r->print('<b>Current sheet:</b> '.&getfilename($asheet).'<p>');
+    &tmpwrite($asheet);
+    if ($asheetdata->{'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()"');
+    #
+    if ($ENV{'form.showall'}) { 
+        $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;
+                }
+        }
+    }
+    $r->print('>');
+    #
+    # CSV format checkbox (classcalc sheets only)
+    if ($asheetdata->{'sheettype'} eq 'classcalc') {
+        $r->print(' Output CSV format: <input type="checkbox" '.
+                  'name="showcsv" onClick="submit()"');
+        if ($ENV{'form.showcsv'}) { $r->print(' checked'); }
+        $r->print('>');
+    }
+    #
+    # Buttons to insert rows
+    $r->print('&nbsp;Student Status: '.
+              &Apache::lonhtmlcommon::StatusOptions
+              ($ENV{'form.Status'},'sheet'));
+    $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,$asheetdata);
     $r->print('</form></body></html>');
-  } else {
-     $r->print(&exportrow($sheetone));
-  }
-# ------------------------------------------------------------------------ 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;
 }
 
@@ -1202,16 +2714,4 @@ __END__
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-