--- loncom/interface/spreadsheet/Spreadsheet.pm	2003/06/25 15:33:49	1.18
+++ loncom/interface/spreadsheet/Spreadsheet.pm	2003/09/05 01:06:45	1.22
@@ -1,5 +1,5 @@
 #
-# $Id: Spreadsheet.pm,v 1.18 2003/06/25 15:33:49 matthew Exp $
+# $Id: Spreadsheet.pm,v 1.22 2003/09/05 01:06:45 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -48,6 +48,8 @@ Spreadsheet
 package Apache::Spreadsheet;
 
 use strict;
+use warnings FATAL=>'all';
+no warnings 'uninitialized';
 use Apache::Constants qw(:common :http);
 use Apache::lonnet;
 use Safe;
@@ -90,7 +92,7 @@ sub new {
         type     => $stype,
         symb     => $usymb,
         errorlog => '',
-        maxrow   => '',
+        maxrow   => 0,
         cid      => $ENV{'request.course.id'},
         cnum     => $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
         cdom     => $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
@@ -248,18 +250,28 @@ sub load_spreadsheet_expirationdates {
 sub check_expiration_time {
     my $self = shift;
     my ($time)=@_;
-    my ($key1,$key2,$key3,$key4);
+    return 0 if (! defined($time));
+    my ($key1,$key2,$key3,$key4,$key5);
+    # Description of keys
+    #
+    # key1: all sheets of this type have expired
+    # key2: all sheets of this type for this student
+    # key3: all sheets of this type in this map for this student
+    # key4: this assessment sheet for this student
+    # key5: this assessment sheet for all students
     $key1 = '::'.$self->{'type'}.':';
     $key2 = $self->{'name'}.':'.$self->{'domain'}.':'.$self->{'type'}.':';
     $key3 = $key2.$self->{'container'} if (defined($self->{'container'}));
-    $key4 = $key2.$self->{'usymb'} if (defined($self->{'usymb'}));
-    foreach my $key ($key1,$key2,$key3,$key4) {
+    $key4 = $key2.$self->{'symb'} if (defined($self->{'symb'}));
+    $key5 = $key1.$self->{'symb'} if (defined($self->{'symb'}));
+    my $returnvalue = 1; # default to okay
+    foreach my $key ($key1,$key2,$key3,$key4,$key5) {
         next if (! defined($key));
-        if (exists($expiredates{$key}) &&$expiredates{$key} > $time) {
-            return 0;
+        if (exists($expiredates{$key}) && $expiredates{$key} > $time) {
+            $returnvalue = 0; # need to recompute
         }
     }
-    return 1;
+    return $returnvalue;
 }
 
 ######################################################
@@ -785,8 +797,8 @@ sub expandnamed {
 	my @vars=split(/\W+/,$formula);
         my %values=();
 	foreach my $varname ( @vars ) {
-            if ($varname=~/\D/) {
-               $formula=~s/$varname/'$c{\''.$varname.'\'}'/ge;
+            if ($varname=~/^(parameter|stores|timestamp)/) {
+                $formula=~s/$varname/'$c{\''.$varname.'\'}'/ge;
                $varname=~s/$var/\([\\w:\\- ]\+\)/g;
 	       foreach (keys(%{$self->{'constants'}})) {
 		  if ($_=~/$varname/) {
@@ -1135,6 +1147,7 @@ sub display {
     } elsif ($outputmode eq 'csv') {
         $self->outsheet_csv($r);
     }
+    $self->cleanup();
     return;
 }
 
@@ -1208,7 +1221,9 @@ sub html_editable_cell {
     #
     # The encoding string "^A-blah" is placed in []'s inside a regexp, so 
     # we specify the characters we want left alone by putting a '^' in front.
-    $formula = &HTML::Entities::encode($formula,"^A-z0-9 !#\$%-;=?~");
+    $formula = &HTML::Entities::encode($formula,'^A-z0-9 !#$%-;=?~');
+    # HTML::Entities::encode does not catch everything - we need '\' encoded
+    $formula =~ s/\\/&\#092/g;
     # Escape it again - this time the only encodable character is '&'
     $formula =~ s/\&/\&/g;
     # Glue everything together
@@ -1564,7 +1579,7 @@ sub load {
 sub set_row_sources {
     my $self = shift;
     while (my ($cell,$value) = each(%{$self->{'formulas'}})) {
-        next if ($cell !~ /^A(\d+)/ && $1 > 0);
+        next if ($cell !~ /^A(\d+)/ || $1 < 1);
         my $row = $1;
         $self->{'row_source'}->{$row} = $value;
     }
@@ -1626,8 +1641,10 @@ sub save {
             return $reply if ($reply ne 'ok');
         } 
         if ($self->is_default()) {
-            &Apache::lonnet::expirespread('','',$self->{'type'},'');
-            if ($self->{'type'} eq 'assesscalc') {
+            if ($self->{'type'} eq 'studentcalc') {
+                &Apache::lonnet::expirespread('','','studentcalc','');
+            } elsif ($self->{'type'} eq 'assesscalc') {
+                &Apache::lonnet::expirespread('','','assesscalc','');
                 &Apache::lonnet::expirespread('','','studentcalc','');
             }
         }
@@ -1641,7 +1658,7 @@ sub save {
 sub save_tmp {
     my $self = shift;
     my $filename=$ENV{'user.name'}.'_'.
-        $ENV{'user.domain'}.'_spreadsheet_'.$self->{'usymb'}.'_'.
+        $ENV{'user.domain'}.'_spreadsheet_'.$self->{'symb'}.'_'.
            $self->{'filename'};
     $filename=~s/\W/\_/g;
     $filename=$Apache::lonnet::tmpdir.$filename.'.tmp';
@@ -1661,7 +1678,7 @@ sub save_tmp {
 sub load_tmp {
     my $self = shift;
     my $filename=$ENV{'user.name'}.'_'.
-        $ENV{'user.domain'}.'_spreadsheet_'.$self->{'usymb'}.'_'.
+        $ENV{'user.domain'}.'_spreadsheet_'.$self->{'symb'}.'_'.
             $self->{'filename'};
     $filename=~s/\W/\_/g;
     $filename=$Apache::lonnet::tmpdir.$filename.'.tmp';