--- loncom/interface/Attic/lonspreadsheet.pm	2002/10/21 17:59:36	1.119
+++ loncom/interface/Attic/lonspreadsheet.pm	2002/10/22 13:29:57	1.122
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.119 2002/10/21 17:59:36 matthew Exp $
+# $Id: lonspreadsheet.pm,v 1.122 2002/10/22 13:29:57 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
@@ -945,31 +944,60 @@ sub calc {
     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 $n=shift;
+    my $sheet = shift;
+    my $n=shift; 
+    my $csv = $ENV{'form.showcsv'};
     my @cols=();
     if ($n) {
-        my ($usy,$ufn)=split(/__&&&\__/,$f{'A'.$n});
-        if ($rowlabel{$usy}) {
-            $cols[0]=$rowlabel{$usy}.'<br>'.
+        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.')">'.
                     '<option name="default">Default</option>';
+            }
         } else { 
             $cols[0]=''; 
         }
-        foreach (@os) {
-            $cols[0].='<option name="'.$_.'"';
-            if ($ufn eq $_) {
-                $cols[0].=' selected';
+        if (! $csv) {
+            foreach (@{$sheet->{'othersheets'}}) {
+                $cols[0].='<option name="'.$_.'"';
+                if ($ufn eq $_) {
+                    $cols[0].=' selected';
+                }
+                $cols[0].='>'.$_.'</option>';
             }
-            $cols[0].='>'.$_.'</option>';
+            $cols[0].='</select>';
         }
-        $cols[0].='</select>';
     } else {
         $cols[0]='<b><font size=+1>Export</font></b>';
     }
@@ -977,18 +1005,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>';
     }
@@ -996,44 +1025,13 @@ 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};
-        $fm=~s/[\'\"]/\&\#34;/g;
-        push(@cols,"'$_$n','$fm'".'___eq___'.$sheet_values{$_.$n});
-    }
-    return @cols;
-}
-
-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') {
-	push(@exportarray,$sheet_values{$_.'0'});
-    } 
-    return @exportarray;
-}
-
-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_'.$_};
+        my $fm=$sheet->{'f'}->{$_.$n};
         $fm=~s/[\'\"]/\&\#34;/g;
-        push(@cols,"'template_$_','$fm'".'___eq___'.$fm);
+        push(@cols,"'$_$n','$fm'".'___eq___'.$sheet->{'values'}->{$_.$n});
     }
     return @cols;
 }
 
-
-# ------------------------------------------- End of "Inside of the safe space"
-ENDDEFS
-    $safeeval->reval($code);
-    return $safeeval;
-}
-
-
 # ------------------------------------------------ Add or change formula values
 sub setformulas {
     my ($sheet)=shift;
@@ -1043,6 +1041,12 @@ sub setformulas {
 # ------------------------------------------------ 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'}};
 }
 
@@ -1064,7 +1068,9 @@ sub setrowlabels {
 # ------------------------------------------------------- Calculate spreadsheet
 sub calcsheet {
     my $sheet=shift;
-    return $sheet->{'safe'}->reval('&calc();');
+    my $result =  $sheet->{'safe'}->reval('&calc();');
+    %{$sheet->{'values'}} = %{$sheet->{'safe'}->varglob('sheet_values')};
+    return $result;
 }
 
 # ---------------------------------------------------------------- Get formulas
@@ -1083,10 +1089,14 @@ sub getfa {
 # ------------------------------------------------------------- Export of A-row
 sub exportdata {
     my $sheet=shift;
-    return $sheet->{'safe'}->reval('&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') {
+	push(@exportarray,$sheet->{'values'}->{$_.'0'});
+    } 
+    return @exportarray;
 }
 
-
 # ========================================================== End of Spreadsheet
 # =============================================================================
 
@@ -1111,27 +1121,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.')')) {
+    #
+    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')) &&
@@ -1653,7 +1668,7 @@ sub updateclasssheet {
             }
             $existing{$f{$_}}=1;
             unless ((defined($currentlist{$f{$_}})) || (!$1) ||
-                    ($f{$_}=~/^(\~\~\~|\-\-\-)/)) {
+                    ($f{$_}=~/^(~~~|---)/)) {
                 $f{$_}='!!! Obsolete';
                 $changed=1;
             }
@@ -1710,16 +1725,26 @@ sub updatestudentassesssheet {
         if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})){
             $adduserstr='&uname='.$uname.'&udom='.$udom;
         }
-        my %allassess =
-            ('_feedback' =>'<a href="/adm/assesscalc?usymb=_feedback'.
-             $adduserstr.'">Feedback</a>',
-             '_evaluation' =>'<a href="/adm/assesscalc?usymb=_evaluation'.
-             $adduserstr.'">Evaluation</a>',
-             '_tutoring' =>'<a href="/adm/assesscalc?usymb=_tutoring'.
-             $adduserstr.'">Tutoring</a>',
-             '_discussion' =>'<a href="/adm/assesscalc?usymb=_discussion'.
-             $adduserstr.'">Discussion</a>'
-             );
+        my %allassess;
+        if (! $ENV{'form.showcsv'}) {
+            %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>'
+                 );
+        } else {
+            %allassess =
+                ('_feedback'   => "Feedback",
+                 '_evaluation' => "Evaluation",
+                 '_tutoring'   => "Tutoring",
+                 '_discussion' => "Discussion",
+                 );
+        }
         while (($_,undef) = each(%bighash)) {
             next if ($_!~/^src\_(\d+)\.(\d+)$/);
             my $mapid=$1;
@@ -1730,9 +1755,13 @@ sub updatestudentassesssheet {
                 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 (! $ENV{'form.showcsv'}) {
+                    $allassess{$symb}=
+                        '<a href="/adm/assesscalc?usymb='.$symb.$adduserstr.'">'.
+                            $bighash{'title_'.$id}.'</a>';
+                } else {
+                    $allassess{$symb}=$bighash{'title_'.$id};
+                }
                 next if ($stype ne 'assesscalc');
                 foreach my $key (split(/\,/,
                                        &Apache::lonnet::metadata($srcf,'keys')
@@ -1780,7 +1809,7 @@ sub updatestudentassesssheet {
         $existing{$usy}=1;
         unless ((exists($sheet->{'rowlabel'}->{$usy}) && 
                  (defined($sheet->{'rowlabel'}->{$usy})) || (!$1) ||
-                ($f{$_}=~/^(\~\~\~|\-\-\-)/))){
+                ($f{$_}=~/^(~~~|---)/))){
             $f{$_}='!!! Obsolete';
             $changed=1;
         } elsif ($ufn) {
@@ -1851,9 +1880,8 @@ sub loadstudent {
     $cachedassess='';
     undef %cachedstores;
     $sheet->{'f'} = \%f;
-    $sheet->{'constants'} = \%c;
     &setformulas($sheet);
-    &setconstants($sheet);
+    &setconstants($sheet,\%c);
 }
 
 # --------------------------------------------------- Load data for one student
@@ -1913,9 +1941,8 @@ ENDPOP
         }
     }
     $sheet->{'f'}=\%f;
-    $sheet->{'constants'}=\%c;
     &setformulas($sheet);
-    &setconstants($sheet);
+    &setconstants($sheet,\%c);
     $r->print('<script>popwin.close()</script>');
     $r->rflush(); 
 }
@@ -2039,8 +2066,7 @@ sub loadassessment {
         }
         untie(%parmhash);
     }
-    $sheet->{'constants'}=\%c;
-    &setconstants($sheet);
+    &setconstants($sheet,\%c);
 }
 
 # --------------------------------------------------------- Various form fields
@@ -2113,7 +2139,7 @@ sub forcedrecalc {
     if ($ENV{'form.forcerecalc'}) { return 1; }
     unless ($time) { return 1; }
     if ($stype eq 'assesscalc') {
-        my $map=(split(/\_\_\_/,$usymb))[0];
+        my $map=(split(/___/,$usymb))[0];
         if (&checkthis('::assesscalc:',$time) ||
             &checkthis('::assesscalc:'.$map,$time) ||
             &checkthis('::assesscalc:'.$usymb,$time) ||
@@ -2132,14 +2158,10 @@ sub forcedrecalc {
 }
 
 # ============================================================== Export handler
-#
-# Non-interactive call from with program
-#
-
 sub exportsheet {
     my ($uname,$udom,$stype,$usymb,$fn)=@_;
     my @exportarr=();
-    if (($usymb=~/^\_(\w+)/) && (!$fn)) {
+    if (defined($usymb) && ($usymb=~/^\_(\w+)/) && (!$fn)) {
         $fn='default_'.$1;
     }
     #
@@ -2148,8 +2170,8 @@ sub exportsheet {
     my $key=$uname.':'.$udom.':'.$stype.':'.$usymb;
     my $found='';
     if ($oldsheets{$key}) {
-        foreach (split(/\_\_\_\&\_\_\_/,$oldsheets{$key})) {
-            my ($name,$value)=split(/\_\_\_\=\_\_\_/,$_);
+        foreach (split(/___&\___/,$oldsheets{$key})) {
+            my ($name,$value)=split(/___=___/,$_);
             if ($name eq $fn) {
                 $found=$value;
             }
@@ -2158,8 +2180,8 @@ sub exportsheet {
     unless ($found) {
         &cachedssheets($uname,$udom,&Apache::lonnet::homeserver($uname,$udom));
         if ($oldsheets{$key}) {
-            foreach (split(/\_\_\_\&\_\_\_/,$oldsheets{$key})) {
-                my ($name,$value)=split(/\_\_\_\=\_\_\_/,$_);
+            foreach (split(/___&\___/,$oldsheets{$key})) {
+                my ($name,$value)=split(/___=___/,$_);
                 if ($name eq $fn) {
                     $found=$value;
                 }
@@ -2178,72 +2200,65 @@ sub exportsheet {
         #
         # Return what was cached
         #
-        @exportarr=split(/\_\_\_\;\_\_\_/,$found);
-    } else {
-        #
-        # Not cached
-        #        
-        my ($sheet)=&makenewsheet($uname,$udom,$stype,$usymb);
-        &readsheet($sheet,$fn);
-        &updatesheet($sheet);
-        &loadrows($sheet);
-        &calcsheet($sheet); 
-        @exportarr=&exportdata($sheet);
-        #
-        # 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:'.$sheet->{'udom'}.':'.
-                                            $sheet->{'uname'}.
-                                            ':nohist_calculatedsheets_'.
-                                            $ENV{'request.course.id'}.':'.
-                                            &Apache::lonnet::escape($key),
-                                            $sheet->{'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:'.
-                                   $sheet->{'udom'}.':'.
-                                   $sheet->{'uname'}.
-                                   ':nohist_calculatedsheets_'.
-                                   $ENV{'request.course.id'}.':'.
-                                   &Apache::lonnet::escape($key).'='.
-                                   &Apache::lonnet::escape($newstore).'&'.
-                                   &Apache::lonnet::escape($key).'.time='.$now,
-                                   $sheet->{'uhome'});
-        }
+        @exportarr=split(/___;___/,$found);
+        return @exportarr;
+    }
+    #
+    # Not cached
+    #        
+    my ($sheet)=&makenewsheet($uname,$udom,$stype,$usymb);
+    &readsheet($sheet,$fn);
+    &updatesheet($sheet);
+    &loadrows($sheet);
+    &calcsheet($sheet); 
+    @exportarr=&exportdata($sheet);
+    #
+    # 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:'.$sheet->{'udom'}.':'.
+                                        $sheet->{'uname'}.
+                                        ':nohist_calculatedsheets_'.
+                                        $ENV{'request.course.id'}.':'.
+                                        &Apache::lonnet::escape($key),
+                                        $sheet->{'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::put('nohist_calculatedsheets',
+                             { $key => $newstore,
+                               $key.time => $now },
+                             $ENV{'course.'.$cid.'.domain'},
+                             $ENV{'course.'.$cid.'.num'})
+    } else {
+        &Apache::lonnet::put('nohist_calculatedsheets_'.$sheet->{'cid'},
+                             { $key => $newstore,
+                               $key.time => $now },
+                             $sheet->{'udom'},
+                             $sheet->{'uname'})
     }
     return @exportarr;
 }
@@ -2451,7 +2466,7 @@ ENDSCRIPT
         &readsheet($sheet,$ENV{'form.ufn'});
     }
     # Print out user information
-    unless ($sheet->{'sheettype'} eq 'classcalc') {
+    if ($sheet->{'sheettype'} ne 'classcalc') {
         $r->print('<p><b>User:</b> '.$sheet->{'uname'}.
                   '<br><b>Domain:</b> '.$sheet->{'udom'});
         $r->print('<br><b>Section/Group:</b> '.$sheet->{'csec'});
@@ -2564,7 +2579,7 @@ ENDSCRIPT
         $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()"');
@@ -2581,19 +2596,19 @@ ENDSCRIPT
         }
     }
     $r->print('>');
+    #
+    # CSV format checkbox (classcalc sheets only)
+    $r->print(' Output CSV format: <input type="checkbox" '.
+              'name="showcsv" onClick="submit()"');
+    $r->print(' checked') if ($ENV{'form.showcsv'});
+    $r->print('>');
     if ($sheet->{'sheettype'} eq 'classcalc') {
-        #
-        # CSV format checkbox (classcalc sheets only)
-        $r->print(' Output CSV format: <input type="checkbox" '.
-                  'name="showcsv" onClick="submit()"');
-        if ($ENV{'form.showcsv'}) { $r->print(' checked'); }
-        $r->print('>');
-        #
-        # Buttons to insert rows
         $r->print('&nbsp;Student Status: '.
                   &Apache::lonhtmlcommon::StatusOptions
                   ($ENV{'form.Status'},'sheet'));
     }
+    #
+    # Buttons to insert rows
     $r->print(<<ENDINSERTBUTTONS);
 <br>
 <input type='button' onClick='insertrow("top");'