--- loncom/interface/Attic/lonspreadsheet.pm	2002/10/22 13:13:15	1.121
+++ loncom/interface/Attic/lonspreadsheet.pm	2002/10/22 18:54:53	1.123
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.121 2002/10/22 13:13:15 matthew Exp $
+# $Id: lonspreadsheet.pm,v 1.123 2002/10/22 18:54:53 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -208,7 +208,6 @@ sub initsheet {
     $safeeval->deny(":base_io");
     $safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT');
     $safehole->wrap(\&Apache::lonspreadsheet::mask,$safeeval,'&mask');
-    $safehole->wrap(\&Apache::lonspreadsheet::templaterow,$safeeval,'&templaterow');
     $safeeval->share('$@');
     my $code=<<'ENDDEFS';
 # ---------------------------------------------------- Inside of the safe space
@@ -755,7 +754,6 @@ parametername should be a string such as
 sub MINPARM {
     my ($expression) = @_;
     my $min = undef;
-    study($expression);
     foreach $parameter (keys(%c)) {
         next if ($parameter !~ /$expression/);
         if ((! defined($min)) || ($min > $c{$parameter})) {
@@ -778,7 +776,6 @@ parametername should be a string such as
 sub MAXPARM {
     my ($expression) = @_;
     my $max = undef;
-    study($expression);
     foreach $parameter (keys(%c)) {
         next if ($parameter !~ /$expression/);
         if ((! defined($min)) || ($max < $c{$parameter})) {
@@ -830,7 +827,6 @@ sub expandnamed {
         my $returnvalue = '';
         my @matches = ();
         $#matches = -1;
-        study $expression;
         foreach $parameter (keys(%c)) {
             push @matches,$parameter if ($parameter =~ /$expression/);
         }
@@ -919,45 +915,42 @@ sub sett {
     $t{'A0'}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.&expandnamed($2)/ge;
 }
 
-sub calc {
-    undef %sheet_values;
-    &sett();
-    my $notfinished=1;
-    my $lastcalc='';
-    my $depth=0;
-    while ($notfinished) {
-	$notfinished=0;
-        foreach (keys(%t)) {
-            my $old=$sheet_values{$_};
-            $sheet_values{$_}=eval $t{$_};
-	    if ($@) {
-		undef %sheet_values;
-                return $_.': '.$@;
-            }
-	    if ($sheet_values{$_} ne $old) { $notfinished=1; $lastcalc=$_; }
-        }
-        $depth++;
-        if ($depth>100) {
-	    undef %sheet_values;
-            return $lastcalc.': Maximum calculation depth exceeded';
-        }
-    }
-    return '';
+# ------------------------------------------- End of "Inside of the safe space"
+ENDDEFS
+    $safeeval->reval($code);
+    return $safeeval;
 }
 
 #
 # This is actually used for the student spreadsheet, not the assessment sheet
 # Do not be fooled by the name!
 #
+sub templaterow {
+    my $sheet = shift;
+    my @cols=();
+    $cols[0]='<b><font size=+1>Template</font></b>';
+    foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M',
+	     'N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
+	     'a','b','c','d','e','f','g','h','i','j','k','l','m',
+	     'n','o','p','q','r','s','t','u','v','w','x','y','z') {
+        my $fm=$sheet->{'f'}->{'template_'.$_};
+        $fm=~s/[\'\"]/\&\#34;/g;
+        push(@cols,"'template_$_','$fm'".'___eq___'.$fm);
+    }
+    return @cols;
+}
+
+
 sub outrowassess {
     # $n is the current row number
+    my $sheet = shift;
     my $n=shift; 
-    my $csv = shift;
+    my $csv = $ENV{'form.showcsv'};
     my @cols=();
     if ($n) {
-        my ($usy,$ufn)=split(/__&&&\__/,$f{'A'.$n});
-        if ($rowlabel{$usy}) {
-            $cols[0]=$rowlabel{$usy};
+        my ($usy,$ufn)=split(/__&&&\__/,$sheet->{'f'}->{'A'.$n});
+        if ($sheet->{'rowlabel'}->{$usy}) {
+            $cols[0]=$sheet->{'rowlabel'}->{$usy};
             if (! $csv) {
                 $cols[0].='<br>'.
                 '<select name="sel_'.$n.'" onChange="changesheet('.$n.')">'.
@@ -967,7 +960,7 @@ sub outrowassess {
             $cols[0]=''; 
         }
         if (! $csv) {
-            foreach (@os) {
+            foreach (@{$sheet->{'othersheets'}}) {
                 $cols[0].='<option name="'.$_.'"';
                 if ($ufn eq $_) {
                     $cols[0].=' selected';
@@ -983,18 +976,19 @@ sub outrowassess {
 	     'N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
 	     'a','b','c','d','e','f','g','h','i','j','k','l','m',
 	     'n','o','p','q','r','s','t','u','v','w','x','y','z') {
-        my $fm=$f{$_.$n};
+        my $fm=$sheet->{'f'}->{$_.$n};
         $fm=~s/[\'\"]/\&\#34;/g;
-        push(@cols,"'$_$n','$fm'".'___eq___'.$sheet_values{$_.$n});
+        push(@cols,"'$_$n','$fm'".'___eq___'.$sheet->{'values'}->{$_.$n});
     }
     return @cols;
 }
 
 sub outrow {
+    my $sheet=shift;
     my $n=shift;
     my @cols=();
     if ($n) {
-       $cols[0]=$rowlabel{$f{'A'.$n}};
+       $cols[0]=$sheet->{'rowlabel'}->{$sheet->{'f'}->{'A'.$n}};
     } else {
        $cols[0]='<b><font size=+1>Export</font></b>';
     }
@@ -1002,44 +996,55 @@ sub outrow {
 	     'N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
 	     'a','b','c','d','e','f','g','h','i','j','k','l','m',
 	     'n','o','p','q','r','s','t','u','v','w','x','y','z') {
-        my $fm=$f{$_.$n};
+        my $fm=$sheet->{'f'}->{$_.$n};
         $fm=~s/[\'\"]/\&\#34;/g;
-        push(@cols,"'$_$n','$fm'".'___eq___'.$sheet_values{$_.$n});
+        push(@cols,"'$_$n','$fm'".'___eq___'.$sheet->{'values'}->{$_.$n});
     }
     return @cols;
 }
 
-sub templaterow {
-    my @cols=();
-    $cols[0]='<b><font size=+1>Template</font></b>';
-    foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M',
-	     'N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
-	     'a','b','c','d','e','f','g','h','i','j','k','l','m',
-	     'n','o','p','q','r','s','t','u','v','w','x','y','z') {
-        my $fm=$f{'template_'.$_};
-        $fm=~s/[\'\"]/\&\#34;/g;
-        push(@cols,"'template_$_','$fm'".'___eq___'.$fm);
-    }
-    return @cols;
+# ------------------------------------------------ Add or change formula values
+sub update_values {
+    my $sheet = shift;
+    %{$sheet->{'safe'}->varglob('sheet_values')}=%{$sheet->{'values'}};
+    return undef;
 }
 
-
-# ------------------------------------------- End of "Inside of the safe space"
-ENDDEFS
-    $safeeval->reval($code);
-    return $safeeval;
+sub setvalues {
+    my $sheet=shift;
+    my ($values) = @_;
+    $values = {} if (! defined($values));
+    if (! ref($values)) {
+        my %tmp   = @_;
+        $values = \%tmp;
+    }
+    $sheet->{'values'} = $values;
+    %{$sheet->{'safe'}->varglob('sheet_values')}=%{$sheet->{'values'}};
+    return undef;
 }
 
-
-# ------------------------------------------------ Add or change formula values
 sub setformulas {
-    my ($sheet)=shift;
+    my $sheet=shift;
+    my ($formulas) = @_;
+    $formulas = {} if (! defined($formulas));
+    if (! ref($formulas)) {
+        my %tmp   = @_;
+        $formulas = \%tmp;
+    }
+    $sheet->{'f'} = $formulas;
     %{$sheet->{'safe'}->varglob('f')}=%{$sheet->{'f'}};
+    return undef;
 }
 
 # ------------------------------------------------ Add or change formula values
 sub setconstants {
     my ($sheet)=shift;
+    my ($constants) = @_;
+    if (! ref($constants)) {
+        my %tmp = @_;
+        $constants = \%tmp;
+    }
+    $sheet->{'constants'} = $constants;
     return %{$sheet->{'safe'}->varglob('c')}=%{$sheet->{'constants'}};
 }
 
@@ -1061,9 +1066,38 @@ sub setrowlabels {
 # ------------------------------------------------------- Calculate spreadsheet
 sub calcsheet {
     my $sheet=shift;
-    my $result =  $sheet->{'safe'}->reval('&calc();');
-    %{$sheet->{'values'}} = %{$sheet->{'safe'}->varglob('sheet_values')};
-    return $result;
+    &setvalues($sheet,undef);
+    $sheet->{'safe'}->reval('&sett();');
+    my %t = %{$sheet->{'safe'}->varglob('t')};
+    my $notfinished=1;
+    my $lastcalc='';
+    my $depth=0;
+    while ($notfinished) {
+	$notfinished=0;
+        foreach (keys(%t)) {
+            my $old=$sheet->{'values'}->{$_};
+            $sheet->{'values'}->{$_}=$sheet->{'safe'}->reval($t{$_}.';');
+	    if ($@) {
+		&setvalues($sheet,undef);
+                return $_.': '.$@;
+            }
+	    if ($sheet->{'values'}->{$_} ne $old) { 
+                $notfinished=1; 
+                $lastcalc=$_;
+            }
+        }
+        if ($notfinished) {
+            %{$sheet->{'safe'}->varglob('sheet_values')} = 
+                %{$sheet->{'values'}};
+        }
+
+        $depth++;
+        if ($depth>100) {
+	    &setvalues($sheet,undef);
+            return $lastcalc.': Maximum calculation depth exceeded';
+        }
+    }
+    return ;
 }
 
 # ---------------------------------------------------------------- Get formulas
@@ -1114,27 +1148,32 @@ sub rown {
         $rowdata.="\n".'"'.$n.'"';
     }
     my $showf=0;
-    my $proc;
+    #
+    # Determine how many pink (uneditable) cells there are in this sheet.
     my $maxred=1;
     my $sheettype=$sheet->{'sheettype'};
     if ($sheettype eq 'studentcalc') {
-        $proc='&outrowassess';
         $maxred=26;
-    } else {
-        $proc='&outrow';
-    }
-    if ($sheettype eq 'assesscalc') {
+    } elsif ($sheettype eq 'assesscalc') {
         $maxred=1;
     } else {
         $maxred=26;
     }
-    if (&getfa($sheet,$n)=~/^[\~\-]/) { $maxred=1; }
+    $maxred=1 if (&getfa($sheet,$n)=~/^[\~\-]/);
+    #
+    # Get the proper row
+    my @rowdata;
     if ($n eq '-') { 
-        $proc='&templaterow'; 
+        @rowdata = &templaterow($sheet);
         $n=-1; 
         $dataflag=1; 
+    } elsif ($sheettype eq 'studentcalc') {
+        @rowdata = &outrowassess($sheet,$n);
+    } else {
+        @rowdata = &outrow($sheet,$n);
     }
-    foreach ($sheet->{'safe'}->reval($proc.'('.$n.','.$ENV{'form.showcsv'}.')')) {
+    #
+    foreach (@rowdata) {
         my $bgcolor=$defaultbg.((($showf-1)/5==int(($showf-1)/5))?'99':'DD');
         my ($fm,$vl)=split(/\_\_\_eq\_\_\_/,$_);
         if ((($vl ne '') || ($vl eq '0')) &&
@@ -1342,8 +1381,7 @@ sub readsheet {
     my $fstring='';
     if ($fstring=$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}) {
         my %tmp = split(/___;___/,$fstring);
-        $sheet->{'f'} = \%tmp;
-        &setformulas($sheet);
+        &setformulas($sheet,\%tmp);
     } else {
         # Not cached, need to read
         my %f=();
@@ -1378,8 +1416,7 @@ sub readsheet {
         }
         # Cache and set
         $spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f);  
-        $sheet->{'f'}=\%f;
-        &setformulas($sheet);
+        &setformulas($sheet,\%f);
     }
 }
 
@@ -1525,8 +1562,7 @@ sub tmpread {
     } else {
        if ($nfield) { $fo{$nfield}=$nform; }
     }
-    $sheet->{'f'}=\%fo;
-    &setformulas($sheet);
+    &setformulas($sheet,\%fo);
 }
 
 ##################################################
@@ -1672,8 +1708,7 @@ sub updateclasssheet {
         }
     }
     if ($changed) { 
-        $sheet->{'f'} = \%f;
-        &setformulas($sheet,%f); 
+        &setformulas($sheet,\%f); 
     }
     #
     $sheet->{'rowlabel'} = \%currentlist;
@@ -1814,8 +1849,7 @@ sub updatestudentassesssheet {
         }
     }
     if ($changed) { 
-        $sheet->{'f'} = \%f;
-        &setformulas($sheet); 
+        &setformulas($sheet,\%f); 
     }
     &setrowlabels($sheet);
     #
@@ -1867,10 +1901,8 @@ sub loadstudent {
     }
     $cachedassess='';
     undef %cachedstores;
-    $sheet->{'f'} = \%f;
-    $sheet->{'constants'} = \%c;
-    &setformulas($sheet);
-    &setconstants($sheet);
+    &setformulas($sheet,\%f);
+    &setconstants($sheet,\%c);
 }
 
 # --------------------------------------------------- Load data for one student
@@ -1929,10 +1961,8 @@ ENDPOP
             }
         }
     }
-    $sheet->{'f'}=\%f;
-    $sheet->{'constants'}=\%c;
-    &setformulas($sheet);
-    &setconstants($sheet);
+    &setformulas($sheet,\%f);
+    &setconstants($sheet,\%c);
     $r->print('<script>popwin.close()</script>');
     $r->rflush(); 
 }
@@ -2056,8 +2086,7 @@ sub loadassessment {
         }
         untie(%parmhash);
     }
-    $sheet->{'constants'}=\%c;
-    &setconstants($sheet);
+    &setconstants($sheet,\%c);
 }
 
 # --------------------------------------------------------- Various form fields