--- loncom/interface/Attic/lonspreadsheet.pm	2002/04/08 18:28:03	1.81
+++ loncom/interface/Attic/lonspreadsheet.pm	2002/09/01 18:06:52	1.106
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.81 2002/04/08 18:28:03 matthew Exp $
+# $Id: lonspreadsheet.pm,v 1.106 2002/09/01 18:06:52 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -71,7 +71,7 @@ use Apache::lonnet;
 use Apache::Constants qw(:common :http);
 use GDBM_File;
 use HTML::TokeParser;
-
+use Apache::lonhtmlcommon;
 #
 # Caches for previously calculated spreadsheets
 #
@@ -106,6 +106,14 @@ my %courseopt;
 my %useropt;
 my %parmhash;
 
+#
+# Some hashes for stats on timing and performance
+#
+
+my %starttimes;
+my %usedtimes;
+my %numbertimes;
+
 # Stuff that only the screen handler can know
 
 my $includedir;
@@ -122,6 +130,7 @@ sub initsheet {
     $safeeval->permit("sort");
     $safeeval->deny(":base_io");
     $safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT');
+    $safeeval->share('$@');
     my $code=<<'ENDDEFS';
 # ---------------------------------------------------- Inside of the safe space
 
@@ -133,37 +142,39 @@ sub initsheet {
 # rl: row label
 # os: other spreadsheets (for student spreadsheet only)
 
-undef %v; 
+undef %sheet_values; 
 undef %t;
 undef %f;
 undef %c;
-undef %rl;
+undef %rowlabel;
 undef @os;
 
-$maxrow=0;
-$sheettype='';
+$maxrow = 0;
+$sheettype = '';
 
 # filename/reference of the sheet
-
-$filename='';
+$filename = '';
 
 # user data
-$uname='';
-$uhome='';
-$udom='';
+$uname = '';
+$uhome = '';
+$udom  = '';
 
 # course data
 
-$csec='';
-$chome='';
-$cnum='';
-$cdom='';
-$cid='';
-$cfn='';
+$csec = '';
+$chome= '';
+$cnum = '';
+$cdom = '';
+$cid  = '';
+$cfn  = '';
 
 # symb
 
-$usymb='';
+$usymb = '';
+
+# error messages
+$errormsg = '';
 
 sub mask {
     my ($lower,$upper)=@_;
@@ -372,8 +383,8 @@ sub CDLHASH {
     if ($key =~ /[A-z](\-[A-z])?\d+(\-\d+)?/) {
 	my $keymask = &mask($key);
 	# Assume the keys are addresses
-	my @Temp = grep /$keymask/,keys(%v);
-	@Keys = $v{@Temp};
+	my @Temp = grep /$keymask/,keys(%sheet_values);
+	@Keys = $sheet_values{@Temp};
     } else {
 	$Keys[0]= $key;
     }
@@ -384,8 +395,8 @@ sub CDLHASH {
     @Keys = @Temp;
     if ($value =~ /[A-z](\-[A-z])?\d+(\-\d+)?/) {
 	my $valmask = &mask($value);
-	my @Temp = grep /$valmask/,keys(%v);
-	@Values =$v{@Temp};
+	my @Temp = grep /$valmask/,keys(%sheet_values);
+	@Values =$sheet_values{@Temp};
     } else {
 	$Values[0]= $value;
     }
@@ -419,7 +430,7 @@ sub GETHASH {
 	$index = 0;
     }
     if ($key =~ /^[A-z]\d+$/) {
-	$key = $v{$key};
+	$key = $sheet_values{$key};
     }
     return $hashes{$name}->{$key}->[$index];
 }
@@ -476,8 +487,8 @@ sub HASH {
     if ($key =~ /[A-z](\-[A-z])?\d+(\-\d+)?/) {
 	my $keymask = &mask($key);
 	# Assume the keys are addresses
-	my @Temp = grep /$keymask/,keys(%v);
-	@Keys = $v{@Temp};
+	my @Temp = grep /$keymask/,keys(%sheet_values);
+	@Keys = $sheet_values{@Temp};
     } else {
 	$Keys[0]= $key;
     }
@@ -489,8 +500,8 @@ sub HASH {
     # Check to see if we have multiple $value(s) 
     if ($value =~ /[A-z](\-[A-z])?\d+(\-\d+)?/) {
 	my $valmask = &mask($value);
-	my @Temp = grep /$valmask/,keys(%v);
-	@Values =$v{@Temp};
+	my @Temp = grep /$valmask/,keys(%sheet_values);
+	@Values =$sheet_values{@Temp};
     } else {
 	$Values[0]= $value;
     }
@@ -508,9 +519,18 @@ sub HASH {
     return $Values[-1];
 }
 
+#-------------------------------------------------------
+
+=item NUM(range)
+
+returns the number of items in the range.
+
+=cut
+
+#-------------------------------------------------------
 sub NUM {
     my $mask=mask(@_);
-    my $num= $#{@{grep(/$mask/,keys(%v))}}+1;
+    my $num= $#{@{grep(/$mask/,keys(%sheet_values))}}+1;
     return $num;   
 }
 
@@ -518,8 +538,8 @@ sub BIN {
     my ($low,$high,$lower,$upper)=@_;
     my $mask=mask($lower,$upper);
     my $num=0;
-    foreach (grep /$mask/,keys(%v)) {
-        if (($v{$_}>=$low) && ($v{$_}<=$high)) {
+    foreach (grep /$mask/,keys(%sheet_values)) {
+        if (($sheet_values{$_}>=$low) && ($sheet_values{$_}<=$high)) {
             $num++;
         }
     }
@@ -527,20 +547,38 @@ sub BIN {
 }
 
 
+#-------------------------------------------------------
+
+=item SUM(range)
+
+returns the sum of items in the range.
+
+=cut
+
+#-------------------------------------------------------
 sub SUM {
     my $mask=mask(@_);
     my $sum=0;
-    foreach (grep /$mask/,keys(%v)) {
-        $sum+=$v{$_};
+    foreach (grep /$mask/,keys(%sheet_values)) {
+        $sum+=$sheet_values{$_};
     }
     return $sum;   
 }
 
+#-------------------------------------------------------
+
+=item MEAN(range)
+
+compute the average of the items in the range.
+
+=cut
+
+#-------------------------------------------------------
 sub MEAN {
     my $mask=mask(@_);
     my $sum=0; my $num=0;
-    foreach (grep /$mask/,keys(%v)) {
-        $sum+=$v{$_};
+    foreach (grep /$mask/,keys(%sheet_values)) {
+        $sum+=$sheet_values{$_};
         $num++;
     }
     if ($num) {
@@ -550,57 +588,105 @@ 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;
-    foreach (grep /$mask/,keys(%v)) {
-        $sum+=$v{$_};
+    foreach (grep /$mask/,keys(%sheet_values)) {
+        $sum+=$sheet_values{$_};
         $num++;
     }
     unless ($num>1) { return undef; }
     my $mean=$sum/$num;
     $sum=0;
-    foreach (grep /$mask/,keys(%v)) {
-        $sum+=($v{$_}-$mean)**2;
+    foreach (grep /$mask/,keys(%sheet_values)) {
+        $sum+=($sheet_values{$_}-$mean)**2;
     }
     return sqrt($sum/($num-1));    
 }
 
+#-------------------------------------------------------
+
+=item PROD(range)
+
+compute the product of the items in the range.
+
+=cut
+
+#-------------------------------------------------------
 sub PROD {
     my $mask=mask(@_);
     my $prod=1;
-    foreach (grep /$mask/,keys(%v)) {
-        $prod*=$v{$_};
+    foreach (grep /$mask/,keys(%sheet_values)) {
+        $prod*=$sheet_values{$_};
     }
     return $prod;   
 }
 
+#-------------------------------------------------------
+
+=item MAX(range)
+
+compute the maximum of the items in the range.
+
+=cut
+
+#-------------------------------------------------------
 sub MAX {
     my $mask=mask(@_);
     my $max='-';
-    foreach (grep /$mask/,keys(%v)) {
-        unless ($max) { $max=$v{$_}; }
-        if (($v{$_}>$max) || ($max eq '-')) { $max=$v{$_}; }
+    foreach (grep /$mask/,keys(%sheet_values)) {
+        unless ($max) { $max=$sheet_values{$_}; }
+        if (($sheet_values{$_}>$max) || ($max eq '-')) { $max=$sheet_values{$_}; }
     } 
     return $max;   
 }
 
+#-------------------------------------------------------
+
+=item MIN(range)
+
+compute the minimum of the items in the range.
+
+=cut
+
+#-------------------------------------------------------
 sub MIN {
     my $mask=mask(@_);
     my $min='-';
-    foreach (grep /$mask/,keys(%v)) {
-        unless ($max) { $max=$v{$_}; }
-        if (($v{$_}<$min) || ($min eq '-')) { $min=$v{$_}; }
+    foreach (grep /$mask/,keys(%sheet_values)) {
+        unless ($max) { $max=$sheet_values{$_}; }
+        if (($sheet_values{$_}<$min) || ($min eq '-')) { 
+            $min=$sheet_values{$_}; 
+        }
     }
     return $min;   
 }
 
+#-------------------------------------------------------
+
+=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=();
-    foreach (grep /$mask/,keys(%v)) {
-	$inside[$#inside+1]=$v{$_};
+    foreach (grep /$mask/,keys(%sheet_values)) {
+	push (@inside,$sheet_values{$_});
     }
     @inside=sort(@inside);
     my $sum=0; my $i;
@@ -610,12 +696,22 @@ 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=();
-    foreach (grep /$mask/,keys(%v)) {
-	$inside[$#inside+1]=$v{$_};
+    foreach (grep /$mask/,keys(%sheet_values)) {
+	$inside[$#inside+1]=$sheet_values{$_};
     }
     @inside=sort(@inside);
     my $sum=0; my $i;
@@ -625,6 +721,53 @@ sub SUMMIN {
     return $sum;   
 }
 
+#-------------------------------------------------------
+
+=item MINPARM(parametername)
+
+Returns the minimum value of the parameters matching the parametername.
+parametername should be a string such as 'duedate'.
+
+=cut
+
+#-------------------------------------------------------
+sub MINPARM {
+    my ($expression) = @_;
+    my $min = undef;
+    study($expression);
+    foreach $parameter (keys(%c)) {
+        next if ($parameter !~ /$expression/);
+        if ((! defined($min)) || ($min > $c{$parameter})) {
+            $min = $c{$parameter} 
+        }
+    }
+    return $min;
+}
+
+#-------------------------------------------------------
+
+=item MAXPARM(parametername)
+
+Returns the maximum value of the parameters matching the input parameter name.
+parametername should be a string such as 'duedate'.
+
+=cut
+
+#-------------------------------------------------------
+sub MAXPARM {
+    my ($expression) = @_;
+    my $max = undef;
+    study($expression);
+    foreach $parameter (keys(%c)) {
+        next if ($parameter !~ /$expression/);
+        if ((! defined($min)) || ($max < $c{$parameter})) {
+            $max = $c{$parameter} 
+        }
+    }
+    return $max;
+}
+
+#--------------------------------------------------------
 sub expandnamed {
     my $expression=shift;
     if ($expression=~/^\&/) {
@@ -657,7 +800,33 @@ sub expandnamed {
 	    return 0;
         }
     } else {
-        return '$c{\''.$expression.'\'}';
+        # 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;
     }
 }
 
@@ -669,26 +838,30 @@ sub sett {
     } else {
         $pattern='[A-Z]';
     }
+    # Deal with the template row
     foreach (keys(%f)) {
-	if ($_=~/template\_(\w)/) {
-	  my $col=$1;
-          unless ($col=~/^$pattern/) {
-	    foreach (keys(%f)) {
-	      if ($_=~/A(\d+)/) {
-		my $trow=$1;
-                if ($trow) {
-		    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;
-                    $t{$lb}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.&expandnamed($2)/ge;
-                }
-	      }
-	    }
-	  }
-      }
+	next if ($_!~/template\_(\w)/);
+        my $col=$1;
+        next if ($col=~/^$pattern/);
+        foreach (keys(%f)) {
+            next if ($_!~/A(\d+)/);
+            my $trow=$1;
+            next if (! $trow);
+            # Get the name of this cell
+            my $lb=$col.$trow;
+            # Grab the template declaration
+            $t{$lb}=$f{'template_'.$col};
+            # Replace '#' with the row number
+            $t{$lb}=~s/\#/$trow/g;
+            # Replace '....' with ','
+            $t{$lb}=~s/\.\.+/\,/g;
+            # Replace 'A0' with the value from 'A0'
+            $t{$lb}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$sheet_values\{\'$2\'\}/g;
+            # Replace parameters
+            $t{$lb}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.&expandnamed($2)/ge;
+        }
     }
+    # Deal with the normal cells
     foreach (keys(%f)) {
 	if (($f{$_}) && ($_!~/template\_/)) {
             my $matches=($_=~/^$pattern(\d+)/);
@@ -699,37 +872,53 @@ sub sett {
             } else {
 	       $t{$_}=$f{$_};
                $t{$_}=~s/\.\.+/\,/g;
-               $t{$_}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g;
+               $t{$_}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$sheet_values\{\'$2\'\}/g;
                $t{$_}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.&expandnamed($2)/ge;
             }
         }
     }
+    # For inserted lines, [B-Z] is also valid
+    unless ($sheettype eq 'assesscalc') {
+       foreach (keys(%f)) {
+	   if ($_=~/[B-Z](\d+)/) {
+	       if ($f{'A'.$1}=~/^[\~\-]/) {
+  	          $t{$_}=$f{$_};
+                  $t{$_}=~s/\.\.+/\,/g;
+                  $t{$_}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$sheet_values\{\'$2\'\}/g;
+                  $t{$_}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.&expandnamed($2)/ge;
+               }
+           }
+       }
+    }
+    # For some reason 'A0' gets special treatment...  This seems superfluous
+    # but I imagine it is here for a reason.
     $t{'A0'}=$f{'A0'};
     $t{'A0'}=~s/\.\.+/\,/g;
-    $t{'A0'}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g;
+    $t{'A0'}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$sheet_values\{\'$2\'\}/g;
     $t{'A0'}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.&expandnamed($2)/ge;
 }
 
 sub calc {
-    %v=();
+    undef %sheet_values;
     &sett();
     my $notfinished=1;
+    my $lastcalc='';
     my $depth=0;
     while ($notfinished) {
 	$notfinished=0;
         foreach (keys(%t)) {
-            my $old=$v{$_};
-            $v{$_}=eval($t{$_});
+            my $old=$sheet_values{$_};
+            $sheet_values{$_}=eval $t{$_};
 	    if ($@) {
-		%v=();
-                return $@;
+		undef %sheet_values;
+                return $_.': '.$@;
             }
-	    if ($v{$_} ne $old) { $notfinished=1; }
+	    if ($sheet_values{$_} ne $old) { $notfinished=1; $lastcalc=$_; }
         }
         $depth++;
         if ($depth>100) {
-	    %v=();
-            return 'Maximum calculation depth exceeded';
+	    undef %sheet_values;
+            return $lastcalc.': Maximum calculation depth exceeded';
         }
     }
     return '';
@@ -744,29 +933,38 @@ sub templaterow {
 	     '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;
+        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) {
-       my ($usy,$ufn)=split(/\_\_\&\&\&\_\_/,$f{'A'.$n});
-       $cols[0]=$rl{$usy}.'<br>'.
-                '<select name="sel_'.$n.'" onChange="changesheet('.$n.
-                ')"><option name="default">Default</option>';
-       foreach (@os) {
-           $cols[0].='<option name="'.$_.'"';
+        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].=' selected';
             }
             $cols[0].='>'.$_.'</option>';
-       }
-       $cols[0].='</select>';
+        }
+        $cols[0].='</select>';
     } else {
-       $cols[0]='<b><font size=+1>Export</font></b>';
+        $cols[0]='<b><font size=+1>Export</font></b>';
     }
     foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M',
 	     'N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
@@ -774,7 +972,7 @@ sub outrowassess {
 	     '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};
+        push(@cols,"'$_$n','$fm'".'___eq___'.$sheet_values{$_.$n});
     }
     return @cols;
 }
@@ -783,7 +981,7 @@ 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>';
     }
@@ -793,7 +991,7 @@ sub outrow {
 	     '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};
+        push(@cols,"'$_$n','$fm'".'___eq___'.$sheet_values{$_.$n});
     }
     return @cols;
 }
@@ -802,7 +1000,7 @@ sub exportrowa {
     my @exportarray=();
     foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M',
 	     'N','O','P','Q','R','S','T','U','V','W','X','Y','Z') {
-	$exportarray[$#exportarray+1]=$v{$_.'0'};
+	push(@exportarray,$sheet_values{$_.'0'});
     } 
     return @exportarray;
 }
@@ -837,22 +1035,22 @@ sub setothersheets {
 # ------------------------------------------------ Add or change formula values
 
 sub setrowlabels {
-    my ($safeeval,%rl)=@_;
-    %{$safeeval->varglob('rl')}=%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
@@ -862,6 +1060,13 @@ sub getformulas {
     return %{$safeeval->varglob('f')};
 }
 
+# ----------------------------------------------------- Get value of $f{'A'.$n}
+
+sub getfa {
+    my ($safeeval,$n)=@_;
+    return $safeeval->reval('$f{"A'.$n.'"}');
+}
+
 # -------------------------------------------------------------------- Get type
 
 sub gettype {
@@ -989,18 +1194,18 @@ sub rown {
     my $rowdata='';
     my $dataflag=0;
     unless ($n eq '-') {
-       $defaultbg=((($n-1)/5)==int(($n-1)/5))?'#E0E0':'#FFFF';
+        $defaultbg=((($n-1)/5)==int(($n-1)/5))?'#E0E0':'#FFFF';
     } else {
-       $defaultbg='#E0FF';
+        $defaultbg='#E0FF';
     }
     unless ($ENV{'form.showcsv'}) {
-       $rowdata.="\n<tr><td><b><font size=+1>$n</font></b></td>";
+        $rowdata.="\n<tr><td><b><font size=+1>$n</font></b></td>";
     } else {
-       $rowdata.="\n".'"'.$n.'"';
+        $rowdata.="\n".'"'.$n.'"';
     }
     my $showf=0;
     my $proc;
-    my $maxred;
+    my $maxred=1;
     my $sheettype=&gettype($safeeval);
     if ($sheettype eq 'studentcalc') {
         $proc='&outrowassess';
@@ -1013,119 +1218,126 @@ sub rown {
     } else {
         $maxred=26;
     }
-    if ($n eq '-') { $proc='&templaterow'; $n=-1; $dataflag=1; }
+    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.'><a href="javascript:celledit('.$fm.');">'.$vl.
-	       '</a></td>';
-       } else {
-           $rowdata.='<td bgcolor='.$bgcolor.'>&nbsp;'.$vl.'&nbsp;</td>';
-       }
-      } else {
-	  $rowdata.=',"'.$vl.'"';
-      }
-       $showf++;
+        my $bgcolor=$defaultbg.((($showf-1)/5==int(($showf-1)/5))?'99':'DD');
+        my ($fm,$vl)=split(/\_\_\_eq\_\_\_/,$_);
+        if ((($vl ne '') || ($vl eq '0')) &&
+            (($showf==1) || ($sheettype ne 'studentcalc'))) { $dataflag=1; }
+        if ($showf==0) { $vl=$_; }
+        unless ($ENV{'form.showcsv'}) {
+            if ($showf<=$maxred) { $bgcolor='#FFDDDD'; }
+            if (($n==0) && ($showf<=26)) { $bgcolor='#CCCCFF'; } 
+            if (($showf>$maxred) || ((!$n) && ($showf>0))) {
+                if ($vl eq '') {
+                    $vl='<font size=+2 color='.$bgcolor.'>&#35;</font>';
+                }
+                $rowdata.='<td bgcolor='.$bgcolor.'>'.
+                    '<a href="javascript:celledit('.$fm.');">'.$vl.'</a></td>';
+            } else {
+                $rowdata.='<td bgcolor='.$bgcolor.'>&nbsp;'.$vl.'&nbsp;</td>';
+            }
+        } else {
+            $rowdata.=',"'.$vl.'"';
+        }
+        $showf++;
     }  # End of foreach($safeval...)
     if ($ENV{'form.showall'} || ($dataflag)) {
-       return $rowdata.($ENV{'form.showcsv'}?'':'</tr>');
+        return $rowdata.($ENV{'form.showcsv'}?'':'</tr>');
     } else {
-       return '';
+        return '';
     }
 }
 
 # ------------------------------------------------------------- Print out sheet
 
 sub outsheet {
-    my ($r,$safeeval)=@_;
-    my $maxred;
-    my $realm;
-    if (&gettype($safeeval) eq 'assesscalc') {
+    my ($r,$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;
+    #
+    # Column label
     my $tabledata;
-    unless ($ENV{'form.showcsv'}) {
-       $tabledata=
-        '<table border=2><tr><th colspan=2 rowspan=2><font size=+2>'.
-                  $realm.'</font></th>'.
+    if ($ENV{'form.showcsv'}) {
+        $tabledata='<pre>';
+    } else { 
+        $tabledata='<table border=2><tr><th colspan=2 rowspan=2>'.
+            '<font size=+2>'.$realm.'</font></th>'.
                   '<td bgcolor=#FFDDDD colspan='.$maxred.
                   '><b><font size=+1>Import</font></b></td>'.
-                  '<td colspan='.$maxyellow.
+                  '<td colspan='.(52-$maxred).
 		  '><b><font size=+1>Calculations</font></b></td></tr><tr>';
-    my $showf=0;
-    foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M',
-	     'N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
-	     'a','b','c','d','e','f','g','h','i','j','k','l','m',
-	     'n','o','p','q','r','s','t','u','v','w','x','y','z') {
-        $showf++;
-        if ($showf<=$maxred) { 
-           $tabledata.='<td bgcolor="#FFDDDD">'; 
-        } else {
-           $tabledata.='<td>';
+        my $showf=0;
+        foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M',
+                 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
+                 'a','b','c','d','e','f','g','h','i','j','k','l','m',
+                 'n','o','p','q','r','s','t','u','v','w','x','y','z') {
+            $showf++;
+            if ($showf<=$maxred) { 
+                $tabledata.='<td bgcolor="#FFDDDD">'; 
+            } else {
+                $tabledata.='<td>';
+            }
+            $tabledata.="<b><font size=+1>$_</font></b></td>";
         }
-        $tabledata.="<b><font size=+1>$_</font></b></td>";
+        $tabledata.='</tr>'.&rown($safeeval,'-').&rown($safeeval,0);
     }
-    $tabledata.='</tr>'.&rown($safeeval,'-').&rown($safeeval,0);
-   } else { $tabledata='<pre>'; }
-
     $r->print($tabledata);
-
+    #
+    # Prepare to output rows
     my $row;
     my $maxrow=&getmaxrow($safeeval);
-
+    #
     my @sortby=();
     my @sortidx=();
     for ($row=1;$row<=$maxrow;$row++) {
-       $sortby[$row-1]=$safeeval->reval('$f{"A'.$row.'"}');
-       $sortidx[$row-1]=$row-1;
+        push (@sortby, $safeeval->reval('$f{"A'.$row.'"}'));
+        push (@sortidx, $row-1);
     }
     @sortidx=sort { $sortby[$a] cmp $sortby[$b]; } @sortidx;
-
-        my $what='Student';
-        if (&gettype($safeeval) eq 'assesscalc') {
-	    $what='Item';
-	} elsif (&gettype($safeeval) eq 'studentcalc') {
-            $what='Assessment';
-        }
-
+    #
+    # 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>');
-        foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M',
-		 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
-		 'a','b','c','d','e','f','g','h','i','j','k','l','m',
-		 'n','o','p','q','r','s','t','u','v','w','x','y','z') {
-           $r->print('<td>'.$_.'</td>');
+        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);
         }
-        $r->print('</tr>');
-       }
-       $n++;
-       $r->print($thisrow);
-      }
     }
     $r->print($ENV{'form.showcsv'}?'</pre>':'</table>');
 }
@@ -1136,9 +1348,9 @@ sub outsheet {
 sub othersheets {
     my ($safeeval,$stype)=@_;
     #
-    my $cnum=&getcnum($safeeval);
-    my $cdom=&getcdom($safeeval);
-    my $chome=&getchome($safeeval);
+    my $cnum  = &getcnum($safeeval);
+    my $cdom  = &getcdom($safeeval);
+    my $chome = &getchome($safeeval);
     #
     my @alternatives=();
     my %results=&Apache::lonnet::dump($stype.'_spreadsheets',$cdom,$cnum);
@@ -1149,84 +1361,105 @@ sub othersheets {
     return @alternatives; 
 }
 
+
+#
+# -------------------------------------- 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)=@_;
-  my $stype=&gettype($safeeval);
-  my $cnum=&getcnum($safeeval);
-  my $cdom=&getcdom($safeeval);
-  my $chome=&getchome($safeeval);
-
-# --------- There is no filename. Look for defaults in course and global, cache
-
-  unless($fn) {
-      unless ($fn=$defaultsheets{$cnum.'_'.$cdom.'_'.$stype}) {
-         $fn=&Apache::lonnet::reply('get:'.$cdom.':'.$cnum.
-                                    ':environment:spreadsheet_default_'.$stype,
-                                    $chome);
-         unless (($fn) && ($fn!~/^error\:/)) {
-	     $fn='default_'.$stype;
-         }
-         $defaultsheets{$cnum.'_'.$cdom.'_'.$stype}=$fn; 
-      }
-  }
-
-# ---------------------------------------------------------- fn now has a value
-
-  &setfilename($safeeval,$fn);
-
-# ------------------------------------------------------ see if sheet is cached
-  my $fstring='';
-  if ($fstring=$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}) {
-      &setformulas($safeeval,split(/\_\_\_\;\_\_\_/,$fstring));
-  } else {
-
-# ---------------------------------------------------- Not cached, need to read
-
-     my %f=();
-
-     if ($fn=~/^default\_/) {
-	my $sheetxml='';
-       {
-         my $fh;
-         my $dfn=$fn;
-         $dfn=~s/\_/\./g;
-         if ($fh=Apache::File->new($includedir.'/'.$dfn)) {
-               $sheetxml=join('',<$fh>);
-	 } else {
-             $sheetxml='<field row="0" col="A">"Error"</field>';
-	 }
-       }
-        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');
-             }
-          }
-        }
-      } else {
-          my $sheet='';
-          my %tmphash = &Apache::lonnet::dump($fn,$cdom,$cnum);
-          my ($tmp) = keys(%tmphash);
-          unless ($tmp =~ /^(con_lost|error|no_such_host)/i) {
-              foreach (keys(%tmphash)) {
-                  $f{$_}=$tmphash{$_};
-              }
-          }
-      }
-# --------------------------------------------------------------- Cache and set
-       $spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f);  
-       &setformulas($safeeval,%f);
+    my ($safeeval,$fn)=@_;
+    my $stype = &gettype($safeeval);
+    my $cnum  = &getcnum($safeeval);
+    my $cdom  = &getcdom($safeeval);
+    my $chome = &getchome($safeeval);
+
+    if (! defined($fn)) {
+        # There is no filename. Look for defaults in course and global, cache
+        unless ($fn=$defaultsheets{$cnum.'_'.$cdom.'_'.$stype}) {
+            my %tmphash = &Apache::lonnet::get('environment',
+                                               ['spreadsheet_default_'.$stype],
+                                               $cdom,$cnum);
+            my ($tmp) = keys(%tmphash);
+            if ($tmp =~ /^(con_lost|error|no_such_host)/i) {
+                $fn = 'default_'.$stype;
+            } else {
+                $fn = $tmphash{'spreadsheet_default_'.$stype};
+            } 
+            unless (($fn) && ($fn!~/^error\:/)) {
+                $fn='default_'.$stype;
+            }
+            $defaultsheets{$cnum.'_'.$cdom.'_'.$stype}=$fn; 
+        }
+    }
+    # $fn now has a value
+    &setfilename($safeeval,$fn);
+    # see if sheet is cached
+    my $fstring='';
+    if ($fstring=$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}) {
+        &setformulas($safeeval,split(/\_\_\_\;\_\_\_/,$fstring));
+    } else {
+        # Not cached, need to read
+        my %f=();
+        if ($fn=~/^default\_/) {
+            my $sheetxml='';
+            my $fh;
+            my $dfn=$fn;
+            $dfn=~s/\_/\./g;
+            if ($fh=Apache::File->new($includedir.'/'.$dfn)) {
+                $sheetxml=join('',<$fh>);
+            } else {
+                $sheetxml='<field row="0" col="A">"Error"</field>';
+            }
+            %f=%{&parse_sheet(\$sheetxml)};
+        } elsif($fn=~/\/*\.spreadsheet$/) {
+            my $sheetxml=&Apache::lonnet::getfile
+                (&Apache::lonnet::filelocation('',$fn));
+            if ($sheetxml == -1) {
+                $sheetxml='<field row="0" col="A">"Error loading spreadsheet '
+                    .$fn.'"</field>';
+            }
+            %f=%{&parse_sheet(\$sheetxml)};
+        } else {
+            my $sheet='';
+            my %tmphash = &Apache::lonnet::dump($fn,$cdom,$cnum);
+            my ($tmp) = keys(%tmphash);
+            unless ($tmp =~ /^(con_lost|error|no_such_host)/i) {
+                foreach (keys(%tmphash)) {
+                    $f{$_}=$tmphash{$_};
+                }
+            }
+        }
+        # Cache and set
+        $spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f);  
+        &setformulas($safeeval,%f);
     }
 }
 
@@ -1234,72 +1467,77 @@ sub readsheet {
 
 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'}  = &Apache::lonnet::usection
+                               ($udom,$uname,$ENV{'request.course.id'});
+    $sheetdata{'cfn'}   = $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);
-    $safeeval->reval(
-       '$uname="'.$uname.
-      '";$udom="'.$udom.
-      '";$uhome="'.&Apache::lonnet::homeserver($uname,$udom).
-      '";$sheettype="'.$stype.
-      '";$usymb="'.$usymb.
-      '";$csec="'.&Apache::lonnet::usection($udom,$uname,
-                                            $ENV{'request.course.id'}).
-      '";$cid="'.$ENV{'request.course.id'}.
-      '";$cfn="'.$ENV{'request.course.fn'}.
-      '";$cnum="'.$ENV{'course.'.$ENV{'request.course.id'}.'.num'}.
-      '";$cdom="'.$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.
-      '";$chome="'.$ENV{'course.'.$ENV{'request.course.id'}.'.home'}.'";');
-    return $safeeval;
+    my $initstring = '';
+    foreach (keys(%sheetdata)) {
+        $initstring.= qq{\$$_="$sheetdata{$_}";};
+    }
+    $safeeval->reval($initstring);
+    return $safeeval,\%sheetdata;
 }
 
 # ------------------------------------------------------------ Save spreadsheet
 
 sub writesheet {
-  my ($safeeval,$makedef)=@_;
-  my $cid=&getcid($safeeval);
-  if (&Apache::lonnet::allowed('opa',$cid)) {
-    my %f=&getformulas($safeeval);
-    my $stype=&gettype($safeeval);
-    my $cnum=&getcnum($safeeval);
-    my $cdom=&getcdom($safeeval);
-    my $chome=&getchome($safeeval);
-    my $fn=&getfilename($safeeval);
-
-# ------------------------------------------------------------- Cache new sheet
-    $spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f);    
-# ----------------------------------------------------------------- Write sheet
-    my $sheetdata='';
-    foreach (keys(%f)) {
-     unless ($f{$_} eq 'import') {
-       $sheetdata.=&Apache::lonnet::escape($_).'='.
-	   &Apache::lonnet::escape($f{$_}).'&';
-     }
-    }
-    $sheetdata=~s/\&$//;
-    my $reply=&Apache::lonnet::reply('put:'.$cdom.':'.$cnum.':'.$fn.':'.
-              $sheetdata,$chome);
-    if ($reply eq 'ok') {
-          $reply=&Apache::lonnet::reply('put:'.$cdom.':'.$cnum.':'.
-              $stype.'_spreadsheets:'.
-              &Apache::lonnet::escape($fn).'='.$ENV{'user.name'}.'@'.
-                                               $ENV{'user.domain'},
-              $chome);
-          if ($reply eq 'ok') {
-              if ($makedef) { 
-                return &Apache::lonnet::reply('put:'.$cdom.':'.$cnum.
-                                ':environment:spreadsheet_default_'.$stype.'='.
-                                &Apache::lonnet::escape($fn),
-                                $chome);
-	      } else {
-		  return $reply;
-    	      }
-	   } else {
-	       return $reply;
-           }
-      } else {
-	  return $reply;
-      }
-  }
-  return 'unauthorized';
+    my ($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
@@ -1309,7 +1547,7 @@ sub writesheet {
 sub tmpwrite {
     my $safeeval=shift;
     my $fn=$ENV{'user.name'}.'_'.
-           $ENV{'user.domain'}.'_spreadsheet_'.&getusymb($safeeval).'_'.
+        $ENV{'user.domain'}.'_spreadsheet_'.&getusymb($safeeval).'_'.
            &getfilename($safeeval);
     $fn=~s/\W/\_/g;
     $fn=$tmpdir.$fn.'.tmp';
@@ -1330,6 +1568,7 @@ sub tmpread {
     $fn=$tmpdir.$fn.'.tmp';
     my $fh;
     my %fo=();
+    my $countrows=0;
     if ($fh=Apache::File->new($fn)) {
         my $name;
         while ($name=<$fh>) {
@@ -1337,6 +1576,11 @@ sub tmpread {
             my $value=<$fh>;
             chomp($value);
             $fo{$name}=$value;
+            if ($name=~/^A(\d+)$/) {
+		if ($1>$countrows) {
+		    $countrows=$1;
+                }
+            }
         }
     }
     if ($nform eq 'changesheet') {
@@ -1344,216 +1588,217 @@ sub tmpread {
         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);
 }
 
-# ================================================================== Parameters
-# -------------------------------------------- Figure out a cascading parameter
-#
-# For this function to work
-#
-# * parmhash needs to be tied
-# * courseopt and useropt need to be initialized for this user and course
-#
-
-sub parmval {
-    my ($what,$safeeval)=@_;
-    my $cid=&getcid($safeeval);
-    my $csec=&getcsec($safeeval);
-    my $uname=&getuname($safeeval);
-    my $udom=&getudom($safeeval);
-    my $symb=&getusymb($safeeval);
-
-    unless ($symb) { return ''; }
-    my $result='';
-
-    my ($mapname,$id,$fn)=split(/\_\_\_/,$symb);
-# ----------------------------------------------------- Cascading lookup scheme
-       my $rwhat=$what;
-       $what=~s/^parameter\_//;
-       $what=~s/\_([^\_]+)$/\.$1/;
-
-       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) { 
-
-       if ($useropt{$courselevelr}) { return $useropt{$courselevelr}; }
-
-       if ($useropt{$courselevelm}) { return $useropt{$courselevelm}; }
-
-       if ($useropt{$courselevel}) { return $useropt{$courselevel}; }
-
-      }
+##################################################
+##################################################
 
-# --------------------------------------------------------- third, check course
-     
-       if ($csec) {
- 
-        if ($courseopt{$seclevelr}) { return $courseopt{$seclevelr}; }
+=pod
 
-        if ($courseopt{$seclevelm}) { return $courseopt{$seclevelm}; }  
+=item &parmval()
 
-        if ($courseopt{$seclevel}) { return $courseopt{$seclevel}; }
-  
-      }
+Determine the value of a parameter.
 
-       if ($courseopt{$courselevelr}) { return $courseopt{$courselevelr}; }
+Inputs: $what, the parameter needed, $safeeval, the safe space
 
-       if ($courseopt{$courselevelm}) { return $courseopt{$courselevelm}; }
+Returns: The value of a parameter, or '' if none.
 
-       if ($courseopt{$courselevel}) { return $courseopt{$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.
 
-# ----------------------------------------------------- second, check map parms
-
-       my $thisparm=$parmhash{$symbparm};
-       if ($thisparm) { return $thisparm; }
-
-# -------------------------------------------------------- first, check default
+=cut
 
-       return &Apache::lonnet::metadata($fn,$rwhat.'.default');
-        
+##################################################
+##################################################
+sub parmval {
+    my ($what,$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=shift;
     my $cnum=&getcnum($safeeval);
     my $cdom=&getcdom($safeeval);
     my $cid=&getcid($safeeval);
     my $chome=&getchome($safeeval);
-
-# ---------------------------------------------- Read class list and row labels
-
-    my $classlst=&Apache::lonnet::reply
-                                 ('dump:'.$cdom.':'.$cnum.':classlist',$chome);
+    #
+    # 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;
-    unless ($classlst=~/^error\:/) {
-        foreach (split(/\&/,$classlst)) {
-            my ($name,$value)=split(/\=/,$_);
-            my ($end,$start)=split(/\:/,&Apache::lonnet::unescape($value));
-            my $active=1;
-            if (($end) && ($now>$end)) { $active=0; }
-            if ($active) {
-                my $rowlabel='';
-                $name=&Apache::lonnet::unescape($name);
-                my ($sname,$sdom)=split(/\:/,$name);
-                my $ssec=&Apache::lonnet::usection($sdom,$sname,$cid);
-                if ($ssec==-1) {
-		   unless ($ENV{'form.showcsv'}) {
-                    $rowlabel='<font color=red>Data not available: '.$name.
-			      '</font>';
-		   } else {
-		       $rowlabel='ERROR","'.$name.
-                                 '","Data not available","","","';
-                   }
+    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);
+            if ($studentSection==-1) {
+                unless ($ENV{'form.showcsv'}) {
+                    $rowlabel='<font color=red>Data not available: '.
+                        $studentName.'</font>';
                 } else {
-                    my %reply=&Apache::lonnet::idrget($sdom,$sname);
-                    my $reply=&Apache::lonnet::reply('get:'.$sdom.':'.$sname.
-		      ':environment:firstname&middlename&lastname&generation',
-                      &Apache::lonnet::homeserver($sname,$sdom));
-		   unless ($ENV{'form.showcsv'}) {
-                    $rowlabel='<a href="/adm/studentcalc?uname='.$sname.
-                              '&udom='.$sdom.'">'.
-                              $ssec.'&nbsp;'.$reply{$sname}.'<br>';
-                    foreach ( split(/\&/,$reply)) {
-                        $rowlabel.=&Apache::lonnet::unescape($_).' ';
+                    $rowlabel='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=$ssec.'","'.$reply{$sname}.'"';
-                    my $ncount=0;
-                    foreach (split(/\&/,$reply)) {
-                        $rowlabel.=',"'.&Apache::lonnet::unescape($_).'"';
-                        $ncount++;
-                    }
-                    unless ($ncount==4) { $rowlabel.=',""'; }
-                    $rowlabel=~s/\"$//;
-		   }
+                } else {
+                    $rowlabel= '"'.join('","',
+                                        ($studentSection,
+                                         $studentInformation{'id'},
+                                         $studentInformation{'firstname'},
+                                         $studentInformation{'middlename'},
+                                         $studentInformation{'lastname'},
+                                         $studentInformation{'generation'})
+                                        ).'"';
                 }
-		$currentlist{&Apache::lonnet::unescape($name)}=$rowlabel;
             }
-        } # end of foreach (split(/\&/,$classlst))
-#
-# -------------------- Find discrepancies between the course row table and this
-#
-        my %f=&getformulas($safeeval);
-        my $changed=0;
-
-        my $maxrow=0;
-        my %existing=();
-
-# ----------------------------------------------------------- Now obsolete rows
-	foreach (keys(%f)) {
-	    if ($_=~/^A(\d+)/) {
-                $maxrow=($1>$maxrow)?$1:$maxrow;
-                $existing{$f{$_}}=1;
-		unless ((defined($currentlist{$f{$_}})) || (!$1)) {
-		   $f{$_}='!!! Obsolete';
-                   $changed=1;
-                }
+            $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}=$_;
-            }
+    }
+    #
+    # 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);
-
-    } else {
-        return 'Could not access course data';
     }
+    if ($changed) { &setformulas($safeeval,%f); }
+    #
+    &setmaxrow($safeeval,$maxrow);
+    &setrowlabels($safeeval,%currentlist);
 }
 
 # ----------------------------------- Update rows for student and assess sheets
-
 sub updatestudentassesssheet {
     my $safeeval=shift;
     my %bighash;
     my $stype=&gettype($safeeval);
     my %current=();
-    unless ($updatedata{$ENV{'request.course.fn'}.'_'.$stype}) {
-# -------------------------------------------------------------------- Tie hash
-      if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
-                       &GDBM_READER,0640)) {
-# --------------------------------------------------------- Get all assessments
-
-	my %allkeys=('timestamp' => 
+    if  ($updatedata{$ENV{'request.course.fn'}.'_'.$stype}) {
+        %current=split(/\_\_\_\;\_\_\_/,
+		       $updatedata{$ENV{'request.course.fn'}.'_'.$stype});
+    } 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',
@@ -1561,173 +1806,144 @@ sub updatestudentassesssheet {
                      'Number of Tutor Responses<br>tutornumber',
                      'totalpoints' =>
                      'Total Points Granted<br>totalpoints');
-
         my $adduserstr='';
         if ((&getuname($safeeval) ne $ENV{'user.name'}) ||
             (&getudom($safeeval) ne $ENV{'user.domain'})) {
             $adduserstr='&uname='.&getuname($safeeval).
-		'&udom='.&getudom($safeeval);
+                '&udom='.&getudom($safeeval);
         }
-
-        my %allassess=('_feedback' =>
-	              '<a href="/adm/assesscalc?usymb=_feedback'.$adduserstr.
-                       '">Feedback</a>',
-                       '_evaluation' =>
-	              '<a href="/adm/assesscalc?usymb=_evaluation'.$adduserstr.
-                       '">Evaluation</a>',
-                       '_tutoring' =>
-	              '<a href="/adm/assesscalc?usymb=_tutoring'.$adduserstr.
-                       '">Tutoring</a>',
-                       '_discussion' =>
-	              '<a href="/adm/assesscalc?usymb=_discussion'.$adduserstr.
-                       '">Discussion</a>'
-        );
-
+        my %allassess =
+            ('_feedback' =>'<a href="/adm/assesscalc?usymb=_feedback'.
+             $adduserstr.'">Feedback</a>',
+             '_evaluation' =>'<a href="/adm/assesscalc?usymb=_evaluation'.
+             $adduserstr.'">Evaluation</a>',
+             '_tutoring' =>'<a href="/adm/assesscalc?usymb=_tutoring'.
+             $adduserstr.'">Tutoring</a>',
+             '_discussion' =>'<a href="/adm/assesscalc?usymb=_discussion'.
+             $adduserstr.'">Discussion</a>'
+             );
         foreach (keys(%bighash)) {
-	    if ($_=~/^src\_(\d+)\.(\d+)$/) {
-	       my $mapid=$1;
-               my $resid=$2;
-               my $id=$mapid.'.'.$resid;
-               my $srcf=$bighash{$_};
-               if ($srcf=~/\.(problem|exam|quiz|assess|survey|form)$/) {
-                 my $symb=
-                     &Apache::lonnet::declutter($bighash{'map_id_'.$mapid}).
-			    '___'.$resid.'___'.
-			    &Apache::lonnet::declutter($srcf);
-		 $allassess{$symb}=
-	            '<a href="/adm/assesscalc?usymb='.$symb.$adduserstr.'">'.
-                     $bighash{'title_'.$id}.'</a>';
-                 if ($stype eq 'assesscalc') {
-		     foreach (split(/\,/,
-				    &Apache::lonnet::metadata($srcf,'keys'))) {
-                       if (($_=~/^stores\_(.*)/) || ($_=~/^parameter\_(.*)/)) {
-			  my $key=$_;
-                          my $display=
-			      &Apache::lonnet::metadata($srcf,$key.'.display');
-                          unless ($display) {
-                              $display.=
-			         &Apache::lonnet::metadata($srcf,$key.'.name');
-                          }
-                          $display.='<br>'.$key;
-                          $allkeys{$key}=$display;
-		       }
-                   } # end of foreach
-	         }
-	      }
-	   }
+            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
-#
-
+        #
+        # %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}=
-	    join('___;___',%current);
-    } else {
-        return 'Could not access course data';
-    }
-# ------------------------------------------------------ Get current from cache
-    } else {
-        %current=split(/\_\_\_\;\_\_\_/,
-		       $updatedata{$ENV{'request.course.fn'}.'_'.$stype});
+            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)) {
-	    if ($_=~/^A(\d+)/) {
-                $maxrow=($1>$maxrow)?$1:$maxrow;
-                my ($usy,$ufn)=split(/\_\_\&\&\&\_\_/,$f{$_});
-                $existing{$usy}=1;
-		unless ((defined($current{$usy})) || (!$1)) {
-		   $f{$_}='!!! Obsolete';
-                   $changed=1;
-	        } elsif ($ufn) {
-		    $current{$usy}
-                       =~s/assesscalc\?usymb\=/assesscalc\?ufn\=$ufn\&usymb\=/;
-                }
-            }
-        }
-
-# -------------------------------------------------------- New and unknown keys
-     
-        foreach (keys(%current)) {
-            unless ($existing{$_}) {
-		$changed=1;
-                $maxrow++;
-                $f{'A'.$maxrow}=$_;
-            }
-        }
+    # Find discrepancies between the course row table and this
+    #
+    my %f=&getformulas($safeeval);
+    my $changed=0;
     
-        if ($changed) { &setformulas($safeeval,%f); }
-
-        &setmaxrow($safeeval,$maxrow);
-        &setrowlabels($safeeval,%current);
- 
-        undef %current;
-        undef %existing;
+    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;
 }
 
 # ------------------------------------------------ Load data for one assessment
 
 sub loadstudent {
-    my $safeeval=shift;
+    my ($safeeval,$sheetdata)=@_;
     my %c=();
     my %f=&getformulas($safeeval);
-    $cachedassess=&getuname($safeeval).':'.&getudom($safeeval);
-    %cachedstores=();
-    {
-      my $reply=&Apache::lonnet::reply('dump:'.&getudom($safeeval).':'.
-                                               &getuname($safeeval).':'.
-                                               &getcid($safeeval),
-                                               &getuhome($safeeval));
-      unless ($reply=~/^error\:/) {
-	 foreach ( split(/\&/,$reply)) {
-            my ($name,$value)=split(/\=/,$_);
-            $cachedstores{&Apache::lonnet::unescape($name)}=
-	                  &Apache::lonnet::unescape($value);
-	}
-      }
+    $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)) {
-	if ($_=~/^A(\d+)/) {
-	   my $row=$1;
-           unless (($f{$_}=~/^\!/) || ($row==0)) {
-	      my ($usy,$ufn)=split(/\_\_\&\&\&\_\_/,$f{$_});
-	      @assessdata=&exportsheet(&getuname($safeeval),
-                                       &getudom($safeeval),
-                                       'assesscalc',$usy,$ufn);
-              my $index=0;
-              foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M',
-	               'N','O','P','Q','R','S','T','U','V','W','X','Y','Z') {
-                  if ($assessdata[$index]) {
-		     my $col=$_;
-		     if ($assessdata[$index]=~/\D/) {
-                         $c{$col.$row}="'".$assessdata[$index]."'";
- 		     } else {
-		         $c{$col.$row}=$assessdata[$index];
-		     }
-                     unless ($col eq 'A') { 
-			 $f{$col.$row}='import';
-                     }
-		  }
-                  $index++;
-              }
-	   }
+	next if ($_!~/^A(\d+)/);
+        my $row=$1;
+        next if (($f{$_}=~/^[\!\~\-]/) || ($row==0));
+        my ($usy,$ufn)=split(/__&&&\__/,$f{$_});
+        @assessdata=&exportsheet($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';
+                }
+            }
+            $index++;
         }
     }
     $cachedassess='';
@@ -1739,13 +1955,13 @@ sub loadstudent {
 # --------------------------------------------------- Load data for one student
 
 sub loadcourse {
-    my ($safeeval,$r)=@_;
+    my ($safeeval,$sheetdata,$r)=@_;
     my %c=();
     my %f=&getformulas($safeeval);
     my $total=0;
     foreach (keys(%f)) {
 	if ($_=~/^A(\d+)/) {
-	    unless ($f{$_}=~/^\!/) { $total++; }
+	    unless ($f{$_}=~/^[\!\~\-]/) { $total++; }
         }
     }
     my $now=0;
@@ -1763,35 +1979,33 @@ sub loadcourse {
 ENDPOP
     $r->rflush();
     foreach (keys(%f)) {
-	if ($_=~/^A(\d+)/) {
-	   my $row=$1;
-           unless (($f{$_}=~/^\!/)  || ($row==0)) {
-	      my @studentdata=&exportsheet(split(/\:/,$f{$_}),
-                                           'studentcalc');
-              undef %userrdatas;
-              $now++;
-              $r->print('<script>popwin.document.popremain.remaining.value="'.
+	next if ($_!~/^A(\d+)/);
+        my $row=$1;
+        next if (($f{$_}=~/^[\!\~\-]/)  || ($row==0));
+        my @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++;
-              }
-	   }
+                  ' 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++;
+            }
         }
     }
     &setformulas($safeeval,%f);
@@ -1803,62 +2017,54 @@ ENDPOP
 # ------------------------------------------------ Load data for one assessment
 
 sub loadassessment {
-    my $safeeval=shift;
+    my ($safeeval,$sheetdata)=@_;
 
-    my $uhome=&getuhome($safeeval);
-    my $uname=&getuname($safeeval);
-    my $udom=&getudom($safeeval);
-    my $symb=&getusymb($safeeval);
-    my $cid=&getcid($safeeval);
-    my $cnum=&getcnum($safeeval);
-    my $cdom=&getcdom($safeeval);
-    my $chome=&getchome($safeeval);
+    my $uhome = $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'};
 
     my $namespace;
     unless ($namespace=$cid) { return ''; }
-
-# ----------------------------------------------------------- Get stored values
-
-   my %returnhash=();
-
-   if ($cachedassess eq $uname.':'.$udom) {
-#
-# get data out of the dumped stores
-# 
-
-       my $version=$cachedstores{'version:'.$symb};
-       my $scope;
-       for ($scope=1;$scope<=$version;$scope++) {
-           foreach (split(/\:/,$cachedstores{$scope.':keys:'.$symb})) {
-               $returnhash{$_}=$cachedstores{$scope.':'.$symb.':'.$_};
-           } 
-       }
-
-   } else {
-#
-# restore individual
-#
-
-    my $answer=&Apache::lonnet::reply(
-       "restore:$udom:$uname:".
-       &Apache::lonnet::escape($namespace).":".
-       &Apache::lonnet::escape($symb),$uhome);
-    foreach (split(/\&/,$answer)) {
-	my ($name,$value)=split(/\=/,$_);
-        $returnhash{&Apache::lonnet::unescape($name)}=
-                    &Apache::lonnet::unescape($value);
-    }
-    my $version;
-    for ($version=1;$version<=$returnhash{'version'};$version++) {
-       foreach (split(/\:/,$returnhash{$version.':keys'})) {
-          $returnhash{$_}=$returnhash{$version.':'.$_};
-       } 
+    # Get stored values
+    my %returnhash=();
+    if ($cachedassess eq $uname.':'.$udom) {
+        #
+        # get data out of the dumped stores
+        # 
+        my $version=$cachedstores{'version:'.$symb};
+        my $scope;
+        for ($scope=1;$scope<=$version;$scope++) {
+            foreach (split(/\:/,$cachedstores{$scope.':keys:'.$symb})) {
+                $returnhash{$_}=$cachedstores{$scope.':'.$symb.':'.$_};
+            } 
+        }
+    } else {
+        #
+        # restore individual
+        #
+        my $answer=&Apache::lonnet::reply(
+                                          "restore:$udom:$uname:".
+                                          &Apache::lonnet::escape($namespace).":".
+                                          &Apache::lonnet::escape($symb),$uhome);
+        foreach (split(/\&/,$answer)) {
+            my ($name,$value)=split(/\=/,$_);
+            $returnhash{&Apache::lonnet::unescape($name)}=
+                &Apache::lonnet::unescape($value);
+        }
+        my $version;
+        for ($version=1;$version<=$returnhash{'version'};$version++) {
+            foreach (split(/\:/,$returnhash{$version.':keys'})) {
+                $returnhash{$_}=$returnhash{$version.':'.$_};
+            } 
+        }
     }
-   }
-# ----------------------------- returnhash now has all stores for this resource
-
-# --------- convert all "_" to "." to be able to use libraries, multiparts, etc
-
+    # returnhash now has all stores for this resource
+    # convert all "_" to "." to be able to use libraries, multiparts, etc
     my @oldkeys=keys %returnhash;
 
     foreach (@oldkeys) {
@@ -1868,88 +2074,81 @@ sub loadassessment {
         $name=~s/\_/\./g;
         $returnhash{$name}=$value;
     }
-
-# ---------------------------- initialize coursedata and userdata for this user
+    # initialize coursedata and userdata for this user
     undef %courseopt;
     undef %useropt;
 
     my $userprefix=$uname.'_'.$udom.'_';
-
+    
     unless ($uhome eq 'no_host') { 
-# -------------------------------------------------------------- Get coursedata
-      unless
-        ((time-$courserdatas{$cid.'.last_cache'})<240) {
-         my $reply=&Apache::lonnet::reply('dump:'.$cdom.':'.$cnum.
-              ':resourcedata',$chome);
-         if ($reply!~/^error\:/) {
-            $courserdatas{$cid}=$reply;
-            $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);
-      }
+        # 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
-#
+    # now courseopt, useropt initialized for this user and course
+    # (used by parmval)
+    #
+    # Load keys for this assessment only
+    #
     my %thisassess=();
     my ($symap,$syid,$srcf)=split(/\_\_\_/,$symb);
-    
     foreach (split(/\,/,&Apache::lonnet::metadata($srcf,'keys'))) {
         $thisassess{$_}=1;
     } 
-#
-# Load parameters
-#
-   my %c=();
-
-   if (tie(%parmhash,'GDBM_File',
-           &getcfn($safeeval).'_parms.db',&GDBM_READER,0640)) {
-    my %f=&getformulas($safeeval);
-    foreach (keys(%f))  {
-	if ($_=~/^A/) {
-            unless ($f{$_}=~/^\!/) {
-  	       if ($f{$_}=~/^parameter/) {
-		if ($thisassess{$f{$_}}) {
-                  my $val=&parmval($f{$_},$safeeval);
-                  $c{$_}=$val;
-                  $c{$f{$_}}=$val;
-	        }
-	       } else {
-		  my $key=$f{$_};
-                  my $ckey=$key;
-                  $key=~s/^stores\_/resource\./;
-                  $key=~s/\_/\./g;
- 	          $c{$_}=$returnhash{$key};
-                  $c{$ckey}=$returnhash{$key};
-	       }
-	   }
+    #
+    # Load parameters
+    #
+    my %c=();
+    if (tie(%parmhash,'GDBM_File',
+            &getcfn($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};
+            }
         }
+        untie(%parmhash);
     }
-    untie(%parmhash);
-   }
-   &setconstants($safeeval,%c);
+    &setconstants($safeeval,%c);
 }
 
 # --------------------------------------------------------- Various form fields
@@ -1957,7 +2156,7 @@ sub loadassessment {
 sub textfield {
     my ($title,$name,$value)=@_;
     return "\n<p><b>$title:</b><br>".
-           '<input type=text name="'.$name.'" size=80 value="'.$value.'">';
+        '<input type=text name="'.$name.'" size=80 value="'.$value.'">';
 }
 
 sub hiddenfield {
@@ -1982,8 +2181,8 @@ sub selectbox {
 #
 
 sub updatesheet {
-    my $safeeval=shift;
-    my $stype=&gettype($safeeval);
+    my ($safeeval,$sheetdata)=@_;
+    my $stype=$sheetdata->{'sheettype'};
     if ($stype eq 'classcalc') {
 	return &updateclasssheet($safeeval);
     } else {
@@ -1997,14 +2196,14 @@ sub updatesheet {
 #
 
 sub loadrows {
-    my ($safeeval,$r)=@_;
-    my $stype=&gettype($safeeval);
+    my ($safeeval,$sheetdata,$r)=@_;
+    my $stype=$sheetdata->{'sheettype'};
     if ($stype eq 'classcalc') {
-	&loadcourse($safeeval,$r);
+	&loadcourse($safeeval,$sheetdata,$r);
     } elsif ($stype eq 'studentcalc') {
-        &loadstudent($safeeval);
+        &loadstudent($safeeval,$sheetdata);
     } else {
-        &loadassessment($safeeval);
+        &loadassessment($safeeval,$sheetdata);
     }
 }
 
@@ -2014,6 +2213,7 @@ sub checkthis {
     my ($keyname,$time)=@_;
     return ($time<$expiredates{$keyname});
 }
+
 sub forcedrecalc {
     my ($uname,$udom,$stype,$usymb)=@_;
     my $key=$uname.':'.$udom.':'.$stype.':'.$usymb;
@@ -2045,131 +2245,121 @@ sub forcedrecalc {
 #
 
 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 ($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;
+                $found=$value;
             }
-        } 
-     }
- }
-#
-# Check if still valid
-#
- if ($found) {
-     if (&forcedrecalc($uname,$udom,$stype,$usymb)) {
-	 $found='';
-     }
- }
- 
- if ($found) {
-#
-# Return what was cached
-#
-     @exportarr=split(/\_\_\_\;\_\_\_/,$found);
-
- } else {
-#
-# Not cached
-#        
-
-    my $thissheet=&makenewsheet($uname,$udom,$stype,$usymb);
-    &readsheet($thissheet,$fn);
-    &updatesheet($thissheet);
-    &loadrows($thissheet);
-    &calcsheet($thissheet); 
-    @exportarr=&exportdata($thissheet);
-#
-# Store now
-#
-    my $cid=$ENV{'request.course.id'}; 
-    my $current='';
-    if ($stype eq 'studentcalc') {
-       $current=&Apache::lonnet::reply('get:'.
-                                     $ENV{'course.'.$cid.'.domain'}.':'.
-                                     $ENV{'course.'.$cid.'.num'}.
-				     ':nohist_calculatedsheets:'.
-                                     &Apache::lonnet::escape($key),
-                                     $ENV{'course.'.$cid.'.home'});
-    } else {
-       $current=&Apache::lonnet::reply('get:'.
-                                     &getudom($thissheet).':'.
-                                     &getuname($thissheet).
-				     ':nohist_calculatedsheets_'.
-                                     $ENV{'request.course.id'}.':'.
-                                     &Apache::lonnet::escape($key),
-                                     &getuhome($thissheet));
-
+        }
     }
-    my %currentlystored=();
-    unless ($current=~/^error\:/) {
-       foreach (split(/\_\_\_\&\_\_\_/,&Apache::lonnet::unescape($current))) {
-           my ($name,$value)=split(/\_\_\_\=\_\_\_/,$_);
-           $currentlystored{$name}=$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;
+                }
+            } 
+        }
     }
-    $currentlystored{$fn}=join('___;___',@exportarr);
-
-    my $newstore='';
-    foreach (keys(%currentlystored)) {
-        if ($newstore) { $newstore.='___&___'; }
-        $newstore.=$_.'___=___'.$currentlystored{$_};
+    #
+    # 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,$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'});
+        }
     }
-    my $now=time;
-    if ($stype eq 'studentcalc') {
-       &Apache::lonnet::reply('put:'.
-                         $ENV{'course.'.$cid.'.domain'}.':'.
-                         $ENV{'course.'.$cid.'.num'}.
-			 ':nohist_calculatedsheets:'.
-                         &Apache::lonnet::escape($key).'='.
-			 &Apache::lonnet::escape($newstore).'&'.
-                         &Apache::lonnet::escape($key).'.time='.$now,
-                         $ENV{'course.'.$cid.'.home'});
-   } else {
-       &Apache::lonnet::reply('put:'.
-                         &getudom($thissheet).':'.
-                         &getuname($thissheet).
-			 ':nohist_calculatedsheets_'.
-                         $ENV{'request.course.id'}.':'.
-                         &Apache::lonnet::escape($key).'='.
-			 &Apache::lonnet::escape($newstore).'&'.
-                         &Apache::lonnet::escape($key).'.time='.$now,
-                         &getuhome($thissheet));
-   }
- }
- return @exportarr;
+    return @exportarr;
 }
+
 # ============================================================ Expiration Dates
 #
 # Load previously cached student spreadsheets for this course
 #
-
 sub expirationdates {
     undef %expiredates;
     my $cid=$ENV{'request.course.id'};
@@ -2246,74 +2436,57 @@ sub cachedssheets {
 
 sub handler {
     my $r=shift;
-
     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'}) { 
-
-# --------------------------- Get query string for limited number of parameters
-
-    foreach (split(/&/,$ENV{'QUERY_STRING'})) {
-       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;
-	   }
-       }
-    }
-
+        $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{'form.usymb'}=~/^\_(\w+)/) && (!$ENV{'form.ufn'})) {
-	$ENV{'form.ufn'}='default_'.$1;
+        $ENV{'form.ufn'}='default_'.$1;
     }
-
-# -------------------------------------- Interactive loading of specific sheet?
+    # Interactive loading of specific sheet?
     if (($ENV{'form.load'}) && ($ENV{'form.loadthissheet'} ne 'Default')) {
-	$ENV{'form.ufn'}=$ENV{'form.loadthissheet'};
+        $ENV{'form.ufn'}=$ENV{'form.loadthissheet'};
     }
-# ------------------------------------------- Nothing there? Must be login user
-
+    #
+    # Determine the user name and domain for the sheet.
     my $aname;
     my $adom;
-
     unless ($ENV{'form.uname'}) {
-	$aname=$ENV{'user.name'};
+        $aname=$ENV{'user.name'};
         $adom=$ENV{'user.domain'};
     } else {
         $aname=$ENV{'form.uname'};
         $adom=$ENV{'form.udom'};
     }
-
-# ------------------------------------------------------------------- Open page
-
+    #
+    # Open page
     $r->content_type('text/html');
     $r->header_out('Cache-control','no-cache');
     $r->header_out('Pragma','no-cache');
     $r->send_http_header;
-
-# --------------------------------------------------------------- Screen output
-
+    # Screen output
     $r->print('<html><head><title>LON-CAPA Spreadsheet</title>');
     $r->print(<<ENDSCRIPT);
 <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();
         }
@@ -2325,242 +2498,210 @@ $tmpdir=$r->dir_config('lonDaemons').'/t
         document.sheet.submit();
     }
 
+    function insertrow(cn) {
+	document.sheet.unewfield.value='insertrow';
+        document.sheet.unewformula.value=cn;
+        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',''));
-
-# ---------------------- Make sure that this gets out, even if user hits "stop"
-
+    $r->print('</head>'.&Apache::loncommon::bodytag('Grades Spreadsheet').
+              '<form action="'.$r->uri.'" name=sheet method=post>');
+    $r->print(&hiddenfield('uname',$ENV{'form.uname'}).
+              &hiddenfield('udom',$ENV{'form.udom'}).
+              &hiddenfield('usymb',$ENV{'form.usymb'}).
+              &hiddenfield('unewfield','').
+              &hiddenfield('unewformula',''));
     $r->rflush();
-
-# ---------------------------------------------------------------- Full recalc?
-
-
+    #
+    # Full recalc?
     if ($ENV{'form.forcerecalc'}) {
-	$r->print('<h4>Completely Recalculating Sheet ...</h4>');
+        $r->print('<h4>Completely Recalculating Sheet ...</h4>');
         undef %spreadsheets;
         undef %courserdatas;
         undef %userrdatas;
         undef %defaultsheets;
         undef %updatedata;
-   }
- 
-# ---------------------------------------- Read new sheet or modified worksheet
-
+    }
+    # Read new sheet or modified worksheet
     $r->uri=~/\/(\w+)$/;
-
-    my $asheet=&makenewsheet($aname,$adom,$1,$ENV{'form.usymb'});
-
-# ------------------------ If a new formula had been entered, go from work copy
-
+    my ($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('<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'}) {
+        &tmpread($asheet,$ENV{'form.unewfield'},$ENV{'form.unewformula'});
+    } elsif ($ENV{'form.saveas'}) {
         &setfilename($asheet,$ENV{'form.ufn'});
-	&tmpread($asheet);
+        &tmpread($asheet);
     } else {
         &readsheet($asheet,$ENV{'form.ufn'});
     }
-
-# -------------------------------------------------- Print out user information
-
-    unless (&gettype($asheet) eq 'classcalc') {
-        $r->print('<p><b>User:</b> '.&getuname($asheet).
-                  '<br><b>Domain:</b> '.&getudom($asheet));
+    # 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>');
+            $r->print('<h3><font color=red>'.
+                      'Not a student in this course</font></h3>');
         } else {
-           $r->print('<br><b>Section/Group:</b> '.&getcsec($asheet));
+            $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('<br><b>Assessment:</b> <tt>'.
+                      $ENV{'form.usymb'}.'</tt>');
         }
     }
-
-# ---------------------------------------------------------------- Course title
-
-    $r->print('<h1>'.
-            $ENV{'course.'.$ENV{'request.course.id'}.'.description'}.
-             '</h1><h3>'.localtime().'</h3>');
-
-# ---------------------------------------------------- See if user can see this
-
-    if ((&gettype($asheet) eq 'classcalc') || 
-        (&getuname($asheet) ne $ENV{'user.name'}) ||
-        (&getudom($asheet) ne $ENV{'user.domain'})) {
-        unless (&Apache::lonnet::allowed('vgr',&getcid($asheet))) {
-	    $r->print(
-           '<h1>Access Permission Denied</h1></form></body></html>');
+    #
+    # Check user permissions
+    if (($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;
         }
     }
-
-# ---------------------------------------------------------- Additional options
-
-    $r->print(
- '<input type=submit name=forcerecalc value="Completely Recalculate Sheet"><p>'
-		 );
-    if (&gettype($asheet) eq 'assesscalc') {
-       $r->print ('<p><font size=+2><a href="/adm/studentcalc?uname='.
-                                               &getuname($asheet).
-                                               '&udom='.&getudom($asheet).
-                  '">Level up: Student Sheet</a></font><p>');
-    }
-    
-    if ((&gettype($asheet) eq 'studentcalc') && 
-        (&Apache::lonnet::allowed('vgr',&getcid($asheet)))) {
-       $r->print (
-                   '<p><font size=+2><a href="/adm/classcalc">'.
+    # Additional options
+    $r->print('<br />'.
+              '<input type="submit" name="forcerecalc" '.
+              'value="Completely Recalculate Sheet"><p>');
+    if ($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
-
-
+    # Save dialog
     if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
         my $fname=$ENV{'form.ufn'};
         $fname=~s/\_[^\_]+$//;
         if ($fname eq 'default') { $fname='course_default'; }
         $r->print('<input type=submit name=saveas value="Save as ...">'.
-              '<input type=text size=20 name=newfn value="'.$fname.
-              '"> (make default: <input type=checkbox name="makedefufn">)<p>');
+                  '<input type=text size=20 name=newfn value="'.$fname.'">'.
+                  'make default: <input type=checkbox name="makedefufn"><p>');
     }
-
     $r->print(&hiddenfield('ufn',&getfilename($asheet)));
-
-# ----------------------------------------------------------------- Load dialog
+    # Load dialog
     if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
-	$r->print('<p><input type=submit name=load value="Load ...">'.
+        $r->print('<p><input type=submit name=load value="Load ...">'.
                   '<select name="loadthissheet">'.
                   '<option name="default">Default</option>');
-        foreach (&othersheets($asheet,&gettype($asheet))) {
-	    $r->print('<option name="'.$_.'"');
+        foreach (&othersheets($asheet,$asheetdata->{'sheettype'})) {
+            $r->print('<option name="'.$_.'"');
             if ($ENV{'form.ufn'} eq $_) {
-               $r->print(' selected');
+                $r->print(' selected');
             }
             $r->print('>'.$_.'</option>');
         } 
         $r->print('</select><p>');
         if (&gettype($asheet) eq 'studentcalc') {
-	    &setothersheets($asheet,&othersheets($asheet,'assesscalc'));
+            &setothersheets($asheet,&othersheets($asheet,'assesscalc'));
         }
     }
-
-# --------------------------------------------------------------- Cached sheets
-
+    # Cached sheets
     &expirationdates();
-
     undef %oldsheets;
     undef %loadedcaches;
-
-    if (&gettype($asheet) eq 'classcalc') {
-        $r->print("Loading previously calculated student sheets ...<br>\n");
+    if ($asheetdata->{'sheettype'} eq 'classcalc') {
+        $r->print("Loading previously calculated student sheets ...\n");
         $r->rflush();
         &cachedcsheets();
-    } elsif (&gettype($asheet) eq 'studentcalc') {
-        $r->print("Loading previously calculated assessment sheets ...<br>\n");
+    } elsif ($asheetdata->{'sheettype'} eq 'studentcalc') {
+        $r->print("Loading previously calculated assessment sheets ...\n");
         $r->rflush();
-        &cachedssheets(&getuname($asheet),&getudom($asheet),
-                       &getuhome($asheet));
+        &cachedssheets($asheetdata->{'uname'},$asheetdata->{'udom'},
+                       $asheetdata->{'uhome'});
     }
-
-# ----------------------------------------------------- Update sheet, load rows
-
+    # Update sheet, load rows
     $r->print("Loaded sheet(s), updating rows ...<br>\n");
     $r->rflush();
-
-    &updatesheet($asheet);
-
-    $r->print("Updated rows, loading row data ...<br>\n");
+    #
+    &updatesheet($asheet,$asheetdata);
+    $r->print("Updated rows, loading row data ...\n");
     $r->rflush();
-
-    &loadrows($asheet,$r);
-
+    #
+    &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
-
+    # See if something to save
     if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
         my $fname='';
-	if ($ENV{'form.saveas'} && ($fname=$ENV{'form.newfn'})) {
+        if ($ENV{'form.saveas'} && ($fname=$ENV{'form.newfn'})) {
             $fname=~s/\W/\_/g;
             if ($fname eq 'default') { $fname='course_default'; }
-            $fname.='_'.&gettype($asheet);
+            $fname.='_'.$asheetdata->{'sheettype'};
             &setfilename($asheet,$fname);
             $ENV{'form.ufn'}=$fname;
-	    $r->print('<p>Saving spreadsheet: '.
-                         &writesheet($asheet,$ENV{'form.makedefufn'}).'<p>');
-	}
+            $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 (&gettype($asheet) eq 'studentcalc') {
-	$r->print('<br>Show rows with empty A column: ');
+    #
+    #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()"');
-
+              '<input type="checkbox" name="showall" onClick="submit()"');
+    #
     if ($ENV{'form.showall'}) { 
-       $r->print(' checked'); 
+        $r->print(' checked'); 
     } else {
-	unless ($ENV{'form.userselhidden'}) {
-           unless 
-	($ENV{'course.'.$ENV{'request.course.id'}.'.hideemptyrows'} eq 'yes') {
-          $r->print(' checked');
-          $ENV{'form.showall'}=1;
-           }
-       }
+        unless ($ENV{'form.userselhidden'}) {
+            unless 
+                ($ENV{'course.'.$ENV{'request.course.id'}.'.hideemptyrows'} eq 'yes') {
+                    $r->print(' checked');
+                    $ENV{'form.showall'}=1;
+                }
+        }
     }
     $r->print('>');
-    if (&gettype($asheet) eq 'classcalc') {
-       $r->print(
-   ' Output CSV format: <input type=checkbox name=showcsv onClick="submit()"');
-       if ($ENV{'form.showcsv'}) { $r->print(' checked'); }
-       $r->print('>');
+    #
+    # CSV format checkbox (classcalc sheets only)
+    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('>');
     }
-# ------------------------------------------------------------- Print out sheet
-
-    &outsheet($r,$asheet);
+    #
+    # 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>');
-
-# ------------------------------------------------------------------------ Done
-  } else {
-# ----------------------------- Not in a course, or not allowed to modify parms
-      $ENV{'user.error.msg'}=
-        $r->uri.":opa:0:0:Cannot modify spreadsheet";
-      return HTTP_NOT_ACCEPTABLE; 
-  }
+    #  Done
     return OK;
-
 }
 
 1;