--- loncom/interface/Attic/lonspreadsheet.pm	2002/01/22 10:05:24	1.79
+++ loncom/interface/Attic/lonspreadsheet.pm	2002/09/27 20:41:25	1.100.4.2
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.79 2002/01/22 10:05:24 matthew Exp $
+# $Id: lonspreadsheet.pm,v 1.100.4.2 2002/09/27 20:41:25 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,6 +34,32 @@
 # 07/09,07/14,07/21,09/01,09/10,9/11,9/12,9/13,9/14,9/17,
 # 10/16,10/17,10/20,11/05,11/28,12/27 Gerd Kortemeyer
 # 01/14/02 Matthew
+# 02/04/02 Matthew
+
+# POD required stuff:
+
+=head1 NAME
+
+lonspreadsheet
+
+=head1 SYNOPSIS
+
+Spreadsheet interface to internal LON-CAPA data
+
+=head1 DESCRIPTION
+
+Lonspreadsheet provides course coordinators the ability to manage their
+students grades online.  The students are able to view their own grades, but
+not the grades of their peers.  The spreadsheet is highly customizable,
+offering the ability to use Perl code to manipulate data, as well as many
+built-in functions.
+
+
+=head2 Functions available to user of lonspreadsheet
+
+=over 4
+
+=cut
 
 package Apache::lonspreadsheet;
             
@@ -45,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
 #
@@ -80,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;
@@ -96,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
 
@@ -139,6 +174,10 @@ $cfn='';
 
 $usymb='';
 
+# error messages
+
+$errormsg='';
+
 sub mask {
     my ($lower,$upper)=@_;
 
@@ -215,6 +254,282 @@ sub mask {
     return '^'.$alpha.$num."\$";
 }
 
+#-------------------------------------------------------
+
+=item UWCALC(hashname,modules,units,date) 
+
+returns the proportion of the module 
+weights not previously completed by the student.
+
+=over 4
+
+=item hashname 
+
+name of the hash the module dates have been inserted into
+
+=item modules 
+
+reference to a cell which contains a comma deliminated list of modules 
+covered by the assignment.
+
+=item units 
+
+reference to a cell which contains a comma deliminated list of module 
+weights with respect to the assignment
+
+=item date 
+
+reference to a cell which contains the date the assignment was completed.
+
+=back 
+
+=cut
+
+#-------------------------------------------------------
+sub UWCALC {
+    my ($hashname,$modules,$units,$date) = @_;
+    my @Modules = split(/,/,$modules);
+    my @Units   = split(/,/,$units);
+    my $total_weight;
+    foreach (@Units) {
+	$total_weight += $_;
+    }
+    my $usum=0;
+    for (my $i=0; $i<=$#Modules; $i++) {
+	if (&HASH($hashname,$Modules[$i]) eq $date) {
+	    $usum += $Units[$i];
+	}
+    }
+    return $usum/$total_weight;
+}
+
+#-------------------------------------------------------
+
+=item CDLSUM(list) 
+
+returns the sum of the elements in a cell which contains
+a Comma Deliminate List of numerical values.
+'list' is a reference to a cell which contains a comma deliminated list.
+
+=cut
+
+#-------------------------------------------------------
+sub CDLSUM {
+    my ($list)=@_;
+    my $sum;
+    foreach (split/,/,$list) {
+	$sum += $_;
+    }
+    return $sum;
+}
+
+#-------------------------------------------------------
+
+=item CDLITEM(list,index) 
+
+returns the item at 'index' in a Comma Deliminated List.
+
+=over 4
+
+=item list
+
+reference to a cell which contains a comma deliminated list.
+
+=item index 
+
+the Perl index of the item requested (first element in list has
+an index of 0) 
+
+=back
+
+=cut
+
+#-------------------------------------------------------
+sub CDLITEM {
+    my ($list,$index)=@_;
+    my @Temp = split/,/,$list;
+    return $Temp[$index];
+}
+
+#-------------------------------------------------------
+
+=item CDLHASH(name,key,value) 
+
+loads a comma deliminated list of keys into
+the hash 'name', all with a value of 'value'.
+
+=over 4
+
+=item name  
+
+name of the hash.
+
+=item key
+
+(a pointer to) a comma deliminated list of keys.
+
+=item value
+
+a single value to be entered for each key.
+
+=back
+
+=cut
+
+#-------------------------------------------------------
+sub CDLHASH {
+    my ($name,$key,$value)=@_;
+    my @Keys;
+    my @Values;
+    # Check to see if we have multiple $key values
+    if ($key =~ /[A-z](\-[A-z])?\d+(\-\d+)?/) {
+	my $keymask = &mask($key);
+	# Assume the keys are addresses
+	my @Temp = grep /$keymask/,keys(%v);
+	@Keys = $v{@Temp};
+    } else {
+	$Keys[0]= $key;
+    }
+    my @Temp;
+    foreach $key (@Keys) {
+	@Temp = (@Temp, split/,/,$key);
+    }
+    @Keys = @Temp;
+    if ($value =~ /[A-z](\-[A-z])?\d+(\-\d+)?/) {
+	my $valmask = &mask($value);
+	my @Temp = grep /$valmask/,keys(%v);
+	@Values =$v{@Temp};
+    } else {
+	$Values[0]= $value;
+    }
+    $value = $Values[0];
+    # Add values to hash
+    for (my $i = 0; $i<=$#Keys; $i++) {
+	my $key   = $Keys[$i];
+	if (! exists ($hashes{$name}->{$key})) {
+	    $hashes{$name}->{$key}->[0]=$value;
+	} else {
+	    my @Temp = sort(@{$hashes{$name}->{$key}},$value);
+	    $hashes{$name}->{$key} = \@Temp;
+	}
+    }
+    return "hash '$name' updated";
+}
+
+#-------------------------------------------------------
+
+=item GETHASH(name,key,index) 
+
+returns the element in hash 'name' 
+reference by the key 'key', at index 'index' in the values list.
+
+=cut
+
+#-------------------------------------------------------
+sub GETHASH {
+    my ($name,$key,$index)=@_;
+    if (! defined($index)) {
+	$index = 0;
+    }
+    if ($key =~ /^[A-z]\d+$/) {
+	$key = $v{$key};
+    }
+    return $hashes{$name}->{$key}->[$index];
+}
+
+#-------------------------------------------------------
+
+=item CLEARHASH(name) 
+
+clears all the values from the hash 'name'
+
+=item CLEARHASH(name,key) 
+
+clears all the values from the hash 'name' associated with the given key.
+
+=cut
+
+#-------------------------------------------------------
+sub CLEARHASH {
+    my ($name,$key)=@_;
+    if (defined($key)) {
+	if (exists($hashes{$name}->{$key})) {
+	    $hashes{$name}->{$key}=undef;
+	    return "hash '$name' key '$key' cleared";
+	}
+    } else {
+	if (exists($hashes{$name})) {
+	    $hashes{$name}=undef;
+	    return "hash '$name' cleared";
+	}
+    }
+    return "Error in clearing hash";
+}
+
+#-------------------------------------------------------
+
+=item HASH(name,key,value) 
+
+loads values into an internal hash.  If a key 
+already has a value associated with it, the values are sorted numerically.  
+
+=item HASH(name,key) 
+
+returns the 0th value in the hash 'name' associated with 'key'.
+
+=cut
+
+#-------------------------------------------------------
+sub HASH {
+    my ($name,$key,$value)=@_;
+    my @Keys;
+    undef @Keys;
+    my @Values;
+    # Check to see if we have multiple $key values
+    if ($key =~ /[A-z](\-[A-z])?\d+(\-\d+)?/) {
+	my $keymask = &mask($key);
+	# Assume the keys are addresses
+	my @Temp = grep /$keymask/,keys(%v);
+	@Keys = $v{@Temp};
+    } else {
+	$Keys[0]= $key;
+    }
+    # If $value is empty, return the first value associated 
+    # with the first key.
+    if (! $value) {
+	return $hashes{$name}->{$Keys[0]}->[0];
+    }
+    # Check to see if we have multiple $value(s) 
+    if ($value =~ /[A-z](\-[A-z])?\d+(\-\d+)?/) {
+	my $valmask = &mask($value);
+	my @Temp = grep /$valmask/,keys(%v);
+	@Values =$v{@Temp};
+    } else {
+	$Values[0]= $value;
+    }
+    # Add values to hash
+    for (my $i = 0; $i<=$#Keys; $i++) {
+	my $key   = $Keys[$i];
+	my $value = ($i<=$#Values ? $Values[$i] : $Values[0]);
+	if (! exists ($hashes{$name}->{$key})) {
+	    $hashes{$name}->{$key}->[0]=$value;
+	} else {
+	    my @Temp = sort(@{$hashes{$name}->{$key}},$value);
+	    $hashes{$name}->{$key} = \@Temp;
+	}
+    }
+    return $Values[-1];
+}
+
+#-------------------------------------------------------
+
+=item NUM(range)
+
+returns the number of items in the range.
+
+=cut
+
+#-------------------------------------------------------
 sub NUM {
     my $mask=mask(@_);
     my $num= $#{@{grep(/$mask/,keys(%v))}}+1;
@@ -234,6 +549,15 @@ sub BIN {
 }
 
 
+#-------------------------------------------------------
+
+=item SUM(range)
+
+returns the sum of items in the range.
+
+=cut
+
+#-------------------------------------------------------
 sub SUM {
     my $mask=mask(@_);
     my $sum=0;
@@ -243,6 +567,15 @@ sub SUM {
     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;
@@ -257,6 +590,15 @@ 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;
@@ -273,6 +615,15 @@ sub STDDEV {
     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;
@@ -282,6 +633,15 @@ sub PROD {
     return $prod;   
 }
 
+#-------------------------------------------------------
+
+=item MAX(range)
+
+compute the maximum of the items in the range.
+
+=cut
+
+#-------------------------------------------------------
 sub MAX {
     my $mask=mask(@_);
     my $max='-';
@@ -292,6 +652,15 @@ sub MAX {
     return $max;   
 }
 
+#-------------------------------------------------------
+
+=item MIN(range)
+
+compute the minimum of the items in the range.
+
+=cut
+
+#-------------------------------------------------------
 sub MIN {
     my $mask=mask(@_);
     my $min='-';
@@ -302,12 +671,22 @@ sub MIN {
     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{$_};
+	push (@inside,$v{$_});
     }
     @inside=sort(@inside);
     my $sum=0; my $i;
@@ -317,6 +696,16 @@ 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);
@@ -364,7 +753,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;
     }
 }
 
@@ -376,6 +791,8 @@ sub sett {
     } else {
         $pattern='[A-Z]';
     }
+
+# Deal with the template row
     foreach (keys(%f)) {
 	if ($_=~/template\_(\w)/) {
 	  my $col=$1;
@@ -384,11 +801,17 @@ sub sett {
 	      if ($_=~/A(\d+)/) {
 		my $trow=$1;
                 if ($trow) {
+                    # Get the name of this cell
 		    my $lb=$col.$trow;
+                    # Grab the template declaration
                     $t{$lb}=$f{'template_'.$col};
+                    # Replace '#' with the row number
                     $t{$lb}=~s/\#/$trow/g;
+                    # Replace '....' with ','
                     $t{$lb}=~s/\.\.+/\,/g;
+                    # Replace 'A0' with the value from 'A0'
                     $t{$lb}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g;
+                    # Replace parameters
                     $t{$lb}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.&expandnamed($2)/ge;
                 }
 	      }
@@ -396,8 +819,10 @@ sub sett {
 	  }
       }
     }
+
+# Deal with the normal cells
     foreach (keys(%f)) {
-	if (($f{$_}) && ($_!~/template\_/)) {
+	if (exists($f{$_}) && ($_!~/template\_/)) {
             my $matches=($_=~/^$pattern(\d+)/);
             if  (($matches) && ($1)) {
 	        unless ($f{$_}=~/^\!/) {
@@ -411,6 +836,23 @@ sub sett {
             }
         }
     }
+# 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\$v\{\'$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;
@@ -418,25 +860,26 @@ sub sett {
 }
 
 sub calc {
-    %v=();
+    undef %v;
     &sett();
     my $notfinished=1;
+    my $lastcalc='';
     my $depth=0;
     while ($notfinished) {
 	$notfinished=0;
         foreach (keys(%t)) {
             my $old=$v{$_};
-            $v{$_}=eval($t{$_});
+            $v{$_}=eval $t{$_};
 	    if ($@) {
-		%v=();
-                return $@;
+		undef %v;
+                return $_.': '.$@;
             }
-	    if ($v{$_} ne $old) { $notfinished=1; }
+	    if ($v{$_} ne $old) { $notfinished=1; $lastcalc=$_; }
         }
         $depth++;
         if ($depth>100) {
-	    %v=();
-            return 'Maximum calculation depth exceeded';
+	    undef %v;
+            return $lastcalc.': Maximum calculation depth exceeded';
         }
     }
     return '';
@@ -461,9 +904,11 @@ sub outrowassess {
     my @cols=();
     if ($n) {
        my ($usy,$ufn)=split(/\_\_\&\&\&\_\_/,$f{'A'.$n});
+      if ($rl{$usy}) {
        $cols[0]=$rl{$usy}.'<br>'.
                 '<select name="sel_'.$n.'" onChange="changesheet('.$n.
                 ')"><option name="default">Default</option>';
+      } else { $cols[0]=''; }
        foreach (@os) {
            $cols[0].='<option name="'.$_.'"';
             if ($ufn eq $_) {
@@ -481,7 +926,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___'.$v{$_.$n});
     }
     return @cols;
 }
@@ -552,7 +997,7 @@ sub setrowlabels {
 
 sub calcsheet {
     my $safeeval=shift;
-    $safeeval->reval('&calc();');
+    return $safeeval->reval('&calc();');
 }
 
 # ------------------------------------------------------------------ Get values
@@ -569,6 +1014,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 {
@@ -707,7 +1159,7 @@ sub rown {
     }
     my $showf=0;
     my $proc;
-    my $maxred;
+    my $maxred=1;
     my $sheettype=&gettype($safeeval);
     if ($sheettype eq 'studentcalc') {
         $proc='&outrowassess';
@@ -720,6 +1172,7 @@ sub rown {
     } else {
         $maxred=26;
     }
+    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');
@@ -734,9 +1187,14 @@ sub rown {
 	   if ($vl eq '') {
 	       $vl='<font size=+2 color='.$bgcolor.'>&#35;</font>';
            }
-           $rowdata.=
-       '<td bgcolor='.$bgcolor.'><a href="javascript:celledit('.$fm.');">'.$vl.
-	       '</a></td>';
+           $rowdata.='<td bgcolor='.$bgcolor.'>';
+           if ($ENV{'request.role'} =~ /^st\./) {
+               $rowdata.=$vl;
+           } else {
+               $rowdata.='<a href="javascript:celledit('.$fm.');">'.
+                   $vl.'</a>';
+           }
+           $rowdata.='</td>';
        } else {
            $rowdata.='<td bgcolor='.$bgcolor.'>&nbsp;'.$vl.'&nbsp;</td>';
        }
@@ -840,26 +1298,51 @@ sub outsheet {
 #
 # ----------------------------------------------- Read list of available sheets
 # 
-
 sub othersheets {
     my ($safeeval,$stype)=@_;
-
+    #
     my $cnum=&getcnum($safeeval);
     my $cdom=&getcdom($safeeval);
     my $chome=&getchome($safeeval);
-
+    #
     my @alternatives=();
-    my $result=&Apache::lonnet::reply('dump:'.$cdom.':'.$cnum.':'.
-                                      $stype.'_spreadsheets',$chome);
-    if ($result!~/^error\:/) {
-	foreach (split(/\&/,$result)) {
-            $alternatives[$#alternatives+1]=
-            &Apache::lonnet::unescape((split(/\=/,$_))[0]);
-        }
-    } 
+    my %results=&Apache::lonnet::dump($stype.'_spreadsheets',$cdom,$cnum);
+    my ($tmp) = keys(%results);
+    unless ($tmp =~ /^(con_lost|error|no_such_host)/i) {
+        @alternatives = sort (keys(%results));
+    }
     return @alternatives; 
 }
 
+
+#
+# -------------------------------------- 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
 #
@@ -871,17 +1354,22 @@ sub readsheet {
   my $cdom=&getcdom($safeeval);
   my $chome=&getchome($safeeval);
 
-# --------- There is no filename. Look for defaults in course and global, cache
-
-  unless($fn) {
+  if (! defined($fn)) {
+      # There is no filename. Look for defaults in course and global, cache
       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; 
+          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; 
       }
   }
 
@@ -900,44 +1388,34 @@ sub readsheet {
      my %f=();
 
      if ($fn=~/^default\_/) {
-	my $sheetxml='';
-       {
+         my $sheetxml='';
          my $fh;
          my $dfn=$fn;
          $dfn=~s/\_/\./g;
          if ($fh=Apache::File->new($includedir.'/'.$dfn)) {
-               $sheetxml=join('',<$fh>);
-	 } else {
+             $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');
+         }
+         %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{$_};
              }
-          }
-        }
-      } else {
-          my $sheet='';
-          my $reply=&Apache::lonnet::reply('dump:'.$cdom.':'.$cnum.':'.$fn,
-                                         $chome);
-          unless ($reply=~/^error\:/) {
-             $sheet=$reply;
-	  }
-          foreach (split(/\&/,$sheet)) {
-             my ($name,$value)=split(/\=/,$_);
-             $f{&Apache::lonnet::unescape($name)}=
-	        &Apache::lonnet::unescape($value);
-          }
-       }
+         }
+     }
 # --------------------------------------------------------------- Cache and set
        $spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f);  
        &setformulas($safeeval,%f);
@@ -1044,6 +1522,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>) {
@@ -1051,6 +1530,11 @@ sub tmpread {
             my $value=<$fh>;
             chomp($value);
             $fo{$name}=$value;
+            if ($name=~/^A(\d+)$/) {
+		if ($1>$countrows) {
+		    $countrows=$1;
+                }
+            }
         }
     }
     if ($nform eq 'changesheet') {
@@ -1058,6 +1542,14 @@ 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; }
     }
@@ -1173,20 +1665,22 @@ sub updateclasssheet {
             my ($end,$start)=split(/\:/,&Apache::lonnet::unescape($value));
             my $active=1;
             if (($end) && ($now>$end)) { $active=0; }
+            $active = 1 if ($ENV{'form.Status'} eq 'Any');
+            $active = !$active if ($ENV{'form.Status'} eq 'Expired');
             if ($active) {
                 my $rowlabel='';
                 $name=&Apache::lonnet::unescape($name);
                 my ($sname,$sdom)=split(/\:/,$name);
                 my $ssec=&Apache::lonnet::usection($sdom,$sname,$cid);
-                if ($ssec==-1) {
-		   unless ($ENV{'form.showcsv'}) {
-                    $rowlabel='<font color=red>Data not available: '.$name.
-			      '</font>';
-		   } else {
-		       $rowlabel='ERROR","'.$name.
-                                 '","Data not available","","","';
-                   }
-                } else {
+#                if ($ssec==-1) {
+#		   unless ($ENV{'form.showcsv'}) {
+#                    $rowlabel='<font color=red>Data not available: '.$name.
+#			      '</font>';
+#		   } else {
+#		       $rowlabel='ERROR","'.$name.
+#                                 '","Data not available","","","';
+#                   }
+#                } else {
                     my %reply=&Apache::lonnet::idrget($sdom,$sname);
                     my $reply=&Apache::lonnet::reply('get:'.$sdom.':'.$sname.
 		      ':environment:firstname&middlename&lastname&generation',
@@ -1209,7 +1703,7 @@ sub updateclasssheet {
                     unless ($ncount==4) { $rowlabel.=',""'; }
                     $rowlabel=~s/\"$//;
 		   }
-                }
+#                }
 		$currentlist{&Apache::lonnet::unescape($name)}=$rowlabel;
             }
         } # end of foreach (split(/\&/,$classlst))
@@ -1227,7 +1721,8 @@ sub updateclasssheet {
 	    if ($_=~/^A(\d+)/) {
                 $maxrow=($1>$maxrow)?$1:$maxrow;
                 $existing{$f{$_}}=1;
-		unless ((defined($currentlist{$f{$_}})) || (!$1)) {
+		unless ((defined($currentlist{$f{$_}})) || (!$1) ||
+                        ($f{$_}=~/^(\~\~\~|\-\-\-)/)) {
 		   $f{$_}='!!! Obsolete';
                    $changed=1;
                 }
@@ -1260,11 +1755,14 @@ sub updatestudentassesssheet {
     my $safeeval=shift;
     my %bighash;
     my $stype=&gettype($safeeval);
+    my $uname=&getuname($safeeval);
+    my $udom =&getudom($safeeval);
     my %current=();
-    unless ($updatedata{$ENV{'request.course.fn'}.'_'.$stype}) {
+    unless ($updatedata{
+        $ENV{'request.course.fn'}.'_'.$stype.'_'.$uname.'_'.$udom}) {
 # -------------------------------------------------------------------- Tie hash
       if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
-                       &GDBM_READER,0640)) {
+                       &GDBM_READER(),0640)) {
 # --------------------------------------------------------- Get all assessments
 
 	my %allkeys=('timestamp' => 
@@ -1342,7 +1840,7 @@ sub updatestudentassesssheet {
         } elsif ($stype eq 'studentcalc') {
             %current=%allassess;
         }
-        $updatedata{$ENV{'request.course.fn'}.'_'.$stype}=
+        $updatedata{$ENV{'request.course.fn'}.'_'.$stype.'_'.$uname.'_'.$udom}=
 	    join('___;___',%current);
     } else {
         return 'Could not access course data';
@@ -1350,7 +1848,7 @@ sub updatestudentassesssheet {
 # ------------------------------------------------------ Get current from cache
     } else {
         %current=split(/\_\_\_\;\_\_\_/,
-		       $updatedata{$ENV{'request.course.fn'}.'_'.$stype});
+	     $updatedata{$ENV{'request.course.fn'}.'_'.$stype.'_'.$uname.'_'.$udom});
     }
 # -------------------- Find discrepancies between the course row table and this
 #
@@ -1366,8 +1864,9 @@ sub updatestudentassesssheet {
                 $maxrow=($1>$maxrow)?$1:$maxrow;
                 my ($usy,$ufn)=split(/\_\_\&\&\&\_\_/,$f{$_});
                 $existing{$usy}=1;
-		unless ((defined($current{$usy})) || (!$1)) {
-		   $f{$_}='!!! Obsolete';
+		unless ((defined($current{$usy})) || (!$1) ||
+                        ($f{$_}=~/^(\~\~\~|\-\-\-)/)){
+ 		   $f{$_}='!!! Obsolete';
                    $changed=1;
 	        } elsif ($ufn) {
 		    $current{$usy}
@@ -1420,7 +1919,7 @@ sub loadstudent {
     foreach (keys(%f)) {
 	if ($_=~/^A(\d+)/) {
 	   my $row=$1;
-           unless (($f{$_}=~/^\!/) || ($row==0)) {
+           unless (($f{$_}=~/^[\!\~\-]/) || ($row==0)) {
 	      my ($usy,$ufn)=split(/\_\_\&\&\&\_\_/,$f{$_});
 	      @assessdata=&exportsheet(&getuname($safeeval),
                                        &getudom($safeeval),
@@ -1459,7 +1958,7 @@ sub loadcourse {
     my $total=0;
     foreach (keys(%f)) {
 	if ($_=~/^A(\d+)/) {
-	    unless ($f{$_}=~/^\!/) { $total++; }
+	    unless ($f{$_}=~/^[\!\~\-]/) { $total++; }
         }
     }
     my $now=0;
@@ -1479,7 +1978,7 @@ ENDPOP
     foreach (keys(%f)) {
 	if ($_=~/^A(\d+)/) {
 	   my $row=$1;
-           unless (($f{$_}=~/^\!/)  || ($row==0)) {
+           unless (($f{$_}=~/^[\!\~\-]/)  || ($row==0)) {
 	      my @studentdata=&exportsheet(split(/\:/,$f{$_}),
                                            'studentcalc');
               undef %userrdatas;
@@ -1639,11 +2138,11 @@ sub loadassessment {
    my %c=();
 
    if (tie(%parmhash,'GDBM_File',
-           &getcfn($safeeval).'_parms.db',&GDBM_READER,0640)) {
+           &getcfn($safeeval).'_parms.db',&GDBM_READER(),0640)) {
     my %f=&getformulas($safeeval);
     foreach (keys(%f))  {
 	if ($_=~/^A/) {
-            unless ($f{$_}=~/^\!/) {
+            unless ($f{$_}=~/^[\!\~\-]/) {
   	       if ($f{$_}=~/^parameter/) {
 		if ($thisassess{$f{$_}}) {
                   my $val=&parmval($f{$_},$safeeval);
@@ -1967,6 +2466,11 @@ sub handler {
       return OK;
     }
 
+    if ($ENV{'request.role'} =~ /^st\./) {
+        delete $ENV{'form.unewfield'}   if (exists($ENV{'form.unewfield'}));
+        delete $ENV{'form.unewformula'} if (exists($ENV{'form.unewformula'}));
+    }
+
 # ---------------------------------------------------- Global directory configs
 
 $includedir=$r->dir_config('lonIncludes');
@@ -1978,17 +2482,8 @@ $tmpdir=$r->dir_config('lonDaemons').'/t
 
 # --------------------------- 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;
-	   }
-       }
-    }
+    &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;
@@ -2021,13 +2516,14 @@ $tmpdir=$r->dir_config('lonDaemons').'/t
 # --------------------------------------------------------------- Screen output
 
     $r->print('<html><head><title>LON-CAPA Spreadsheet</title>');
-    $r->print(<<ENDSCRIPT);
+    if ($ENV{'request.role'} !~ /^st\./) {
+        $r->print(<<ENDSCRIPT);
 <script language="JavaScript">
 
     function celledit(cn,cf) {
         var cnf=prompt(cn,cf);
-	if (cnf!=null) {
-	    document.sheet.unewfield.value=cn;
+        if (cnf!=null) {
+            document.sheet.unewfield.value=cn;
             document.sheet.unewformula.value=cnf;
             document.sheet.submit();
         }
@@ -2039,8 +2535,15 @@ $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>'.
@@ -2096,12 +2599,12 @@ ENDSCRIPT
     unless (&gettype($asheet) eq 'classcalc') {
         $r->print('<p><b>User:</b> '.&getuname($asheet).
                   '<br><b>Domain:</b> '.&getudom($asheet));
-        if (&getcsec($asheet) eq '-1') {
-           $r->print('<h3><font color=red>'.
-                     'Not a student in this course</font></h3>');
-        } else {
+#        if (&getcsec($asheet) eq '-1') {
+#           $r->print('<h3><font color=red>'.
+#                     'Not a student in this course</font></h3>');
+#        } else {
            $r->print('<br><b>Section/Group:</b> '.&getcsec($asheet));
-        }
+#        }
         if ($ENV{'form.usymb'}) {
            $r->print('<br><b>Assessment:</b> <tt>'.$ENV{'form.usymb'}.'</tt>');
         }
@@ -2255,12 +2758,27 @@ ENDSCRIPT
        }
     }
     $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('>');
     }
+
+# ------------------------------------------------------------------ Insertrows
+    $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);