--- loncom/interface/Attic/lonspreadsheet.pm	2000/12/30 19:59:18	1.21
+++ loncom/interface/Attic/lonspreadsheet.pm	2001/01/02 20:19:34	1.29
@@ -2,7 +2,8 @@
 # Spreadsheet/Grades Display Handler
 #
 # 11/11,11/15,11/27,12/04,12/05,12/06,12/07,
-# 12/08,12/09,12/11,12/12,12/15,12/16,12/18,12/19,12/30 Gerd Kortemeyer
+# 12/08,12/09,12/11,12/12,12/15,12/16,12/18,12/19,12/30,
+# 01/01/01,02/01 Gerd Kortemeyer
 
 package Apache::lonspreadsheet;
 
@@ -17,9 +18,10 @@ use HTML::TokeParser;
 
 #
 # These cache hashes need to be independent of user, resource and course
-# (user and course are in the keys)
+# (user and course can/should be in the keys)
 #
-use vars qw(%spreadsheets %courserdatas %userrdatas);
+use vars qw(%spreadsheets %courserdatas %userrdatas %defaultsheets);
+
 #
 # These global hashes are dependent on user, course and resource, 
 # and need to be initialized every time when a sheet is calculated
@@ -27,9 +29,11 @@ use vars qw(%spreadsheets %courserdatas
 my %courseopt;
 my %useropt;
 my %parmhash;
-my $csec;
-my $uname;
-my $udom;
+
+# Stuff that only the screen handler can know
+
+my $includedir;
+my $tmpdir;
 
 # =============================================================================
 # ===================================== Implements an instance of a spreadsheet
@@ -60,8 +64,29 @@ sub initsheet {
 
 $maxrow=0;
 $sheettype='';
+
+# filename/reference of the sheet
+
 $filename='';
 
+# user data
+$uname='';
+$uhome='';
+$udom='';
+
+# course data
+
+$csec='';
+$chome='';
+$cnum='';
+$cdom='';
+$cid='';
+$cfn='';
+
+# symb
+
+$usymb='';
+
 sub mask {
     my ($lower,$upper)=@_;
 
@@ -381,13 +406,12 @@ sub outrow {
 }
 
 sub exportrowa {
-    my $rowa='';
+    my @exportarray=();
     map {
-	$rowa.=$v{$_.'0'}."___;___";
+	$exportarray[$#exportarray+1]=$v{$_.'0'};
     } ('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');
-    $rowa=~s/\_\_\_\;\_\_\_$//;
-    return $rowa;
+    return @exportarray;
 }
 
 # ------------------------------------------- End of "Inside of the safe space"
@@ -438,19 +462,13 @@ sub getformulas {
     return $safeeval->reval('%f');
 }
 
-# -------------------------------------------------------------------- Set type
-
-sub settype {
-    my ($safeeval,$type)=@_;
-    $safeeval->reval('$sheettype="'.$type.'";');
-}
-
 # -------------------------------------------------------------------- Get type
 
 sub gettype {
     my $safeeval=shift;
     return $safeeval->reval('$sheettype');
 }
+
 # ------------------------------------------------------------------ Set maxrow
 
 sub setmaxrow {
@@ -479,9 +497,79 @@ sub getfilename {
     return $safeeval->reval('$filename');
 }
 
+# --------------------------------------------------------------- Get course ID
+
+sub getcid {
+    my $safeeval=shift;
+    return $safeeval->reval('$cid');
+}
+
+# --------------------------------------------------------- Get course filename
+
+sub getcfn {
+    my $safeeval=shift;
+    return $safeeval->reval('$cfn');
+}
+
+# ----------------------------------------------------------- Get course number
+
+sub getcnum {
+    my $safeeval=shift;
+    return $safeeval->reval('$cnum');
+}
+
+# ------------------------------------------------------------- Get course home
+
+sub getchome {
+    my $safeeval=shift;
+    return $safeeval->reval('$chome');
+}
+
+# ----------------------------------------------------------- Get course domain
+
+sub getcdom {
+    my $safeeval=shift;
+    return $safeeval->reval('$cdom');
+}
+
+# ---------------------------------------------------------- Get course section
+
+sub getcsec {
+    my $safeeval=shift;
+    return $safeeval->reval('$csec');
+}
+
+# --------------------------------------------------------------- Get user name
+
+sub getuname {
+    my $safeeval=shift;
+    return $safeeval->reval('$uname');
+}
+
+# ------------------------------------------------------------- Get user domain
+
+sub getudom {
+    my $safeeval=shift;
+    return $safeeval->reval('$udom');
+}
+
+# --------------------------------------------------------------- Get user home
+
+sub getuhome {
+    my $safeeval=shift;
+    return $safeeval->reval('$uhome');
+}
+
+# -------------------------------------------------------------------- Get symb
+
+sub getusymb {
+    my $safeeval=shift;
+    return $safeeval->reval('$usymb');
+}
+
 # ------------------------------------------------------------- Export of A-row
 
-sub exportrow {
+sub exportdata {
     my $safeeval=shift;
     return $safeeval->reval('&exportrowa()');
 }
@@ -489,18 +577,38 @@ sub exportrow {
 # ========================================================== End of Spreadsheet
 # =============================================================================
 
-
+#
+# Procedures for screen output
+#
 # --------------------------------------------- Produce output row n from sheet
 
 sub rown {
     my ($safeeval,$n)=@_;
     my $defaultbg;
+    my $rowdata='';
     unless ($n eq '-') {
        $defaultbg=((($n-1)/5)==int(($n-1)/5))?'#E0E0':'#FFFF';
     } else {
        $defaultbg='#E0FF';
     }
-    my $rowdata="\n<tr><td><b><font size=+1>$n</font></b></td>";
+    if ((($n-1)/25)==int(($n-1)/25)) {
+        my $what='Student';
+        if (&gettype($safeeval) eq 'assesscalc') {
+	    $what='Item';
+	} elsif (&gettype($safeeval) eq 'studentcalc') {
+            $what='Assessment';
+        }
+	$rowdata.="</table>\n<br><table border=2>".
+        '<tr><td>&nbsp;<td>'.$what.'</td>';
+        map {
+           $rowdata.='<td>'.$_.'</td>';
+        } ('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');
+        $rowdata.='</tr>';
+    }
+    $rowdata.="\n<tr><td><b><font size=+1>$n</font></b></td>";
     my $showf=0;
     my $proc;
     my $maxred;
@@ -536,7 +644,7 @@ sub rown {
 # ------------------------------------------------------------- Print out sheet
 
 sub outsheet {
-    my $safeeval=shift;
+    my ($r,$safeeval)=@_;
     my $maxred;
     my $realm;
     if (&gettype($safeeval) eq 'assesscalc') {
@@ -550,7 +658,8 @@ sub outsheet {
         $realm='Course';
     }
     my $maxyellow=52-$maxred;
-    my $tabledata='<table border=2><tr><th colspan=2 rowspan=2><font size=+2>'.
+    my $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>'.
@@ -573,31 +682,64 @@ sub outsheet {
     my $row;
     my $maxrow=&getmaxrow($safeeval);
     $tabledata.=&rown($safeeval,'-');
+    $r->print($tabledata);
     for ($row=0;$row<=$maxrow;$row++) {
-        $tabledata.=&rown($safeeval,$row);
+        $r->print(&rown($safeeval,$row));
     }
-    $tabledata.='</table>';
+    $r->print('</table>');
 }
 
+#
+# -------------------------------------- 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);
 
-# ------------------------------------- Read spreadsheet formulas from a course
+# ------------------------------------------------------ see if sheet is cached
+  my $fstring='';
+  if ($fstring=$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}) {
+      &setformulas($safeeval,split(/\_\_\_\;\_\_\_/,$fstring));
+  } else {
 
-sub readsheet {
-    my ($safeeval,$fn,$r)=@_;
-    my %f=();
-    if (($fn eq '') || ($fn=~/^default\_/)) {
+# ---------------------------------------------------- Not cached, need to read
+
+     my %f=();
+
+     if ($fn=~/^default\_/) {
 	my $sheetxml='';
        {
          my $fh;
-         if ($fh=Apache::File->new($r->dir_config('lonIncludes').
+         if ($fh=Apache::File->new($includedir.
                          '/default.'.&gettype($safeeval))) {
                $sheetxml=join('',<$fh>);
           }
        }
-       my $parser=HTML::TokeParser->new(\$sheetxml);
-       my $token;
-       while ($token=$parser->get_token) {
+        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'}}=
@@ -608,56 +750,102 @@ sub readsheet {
                      $parser->get_text('/template');
              }
           }
-       }
-       &setfilename($safeeval,'default_'.&gettype($safeeval));
-    } else {
-       &setfilename($safeeval,$fn);
-       unless ($spreadsheets{$fn}) {
-          $spreadsheets{$fn}='';
-          my $reply=&Apache::lonnet::reply('dump:'.
-              $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'.
-              $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.':'.$fn,
-              $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
+        }
+      } else {
+          my $sheet='';
+          my $reply=&Apache::lonnet::reply('dump:'.$cdom.':'.$cnum.':'.$fn,
+                                         $chome);
           unless ($reply=~/^error\:/) {
-             $spreadsheets{$fn}=$reply;
-          }
+             $sheet=$reply;
+	  }
+          map {
+             my ($name,$value)=split(/\=/,$_);
+             $f{&Apache::lonnet::unescape($name)}=
+	        &Apache::lonnet::unescape($value);
+          } split(/\&/,$sheet);
        }
-       map {
-           my ($name,$value)=split(/\=/,$_);
-           $f{&Apache::lonnet::unescape($name)}=
-	      &Apache::lonnet::unescape($value);
-       } split(/\&/,$spreadsheets{$fn});
+# --------------------------------------------------------------- Cache and set
+       $spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f);  
+       &setformulas($safeeval,%f);
     }
+}
 
-    &setformulas($safeeval,%f);
+# -------------------------------------------------------- Make new spreadsheet
+
+sub makenewsheet {
+    my ($uname,$udom,$stype,$usymb)=@_;
+    my $safeeval=initsheet();
+    $safeeval->reval(
+       '$uname="'.$uname.
+      '";$udom="'.$udom.
+      '";$uhome="'.&Apache::lonnet::homeserver($uname,$udom).
+      '";$sheettype="'.$stype.
+      '";$usymb="'.$usymb.
+      '";$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;
 }
 
 # ------------------------------------------------------------ Save spreadsheet
 
 sub writesheet {
-  my $safeeval=shift;
-  if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
+  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='';
     map {
        $sheetdata.=&Apache::lonnet::escape($_).'='.
 	   &Apache::lonnet::escape($f{$_}).'&';
     } keys %f;
     $sheetdata=~s/\&$//;
-    my $reply=&Apache::lonnet::reply('put:'.
-              $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'.
-              $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.':'.
-              &getfilename($safeeval).':'.
-              $sheetdata,
-              $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
-  }   
+    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'},
+              $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';
 }
 
 # ----------------------------------------------- Make a temp copy of the sheet
+# "Modified workcopy" - interactive only
+#
 
 sub tmpwrite {
-    my ($safeeval,$tmpdir,$symb)=@_;
-    my $fn=$uname.'_'.$udom.'_spreadsheet_'.$symb.'_'.&getfilename($safeeval);
+    my $safeeval=shift;
+    my $fn=$ENV{'user.name'}.'_'.
+           $ENV{'user.domain'}.'_spreadsheet_'.&getusymb($safeeval).'_'.
+           &getfilename($safeeval);
     $fn=~s/\W/\_/g;
     $fn=$tmpdir.$fn.'.tmp';
     my $fh;
@@ -669,8 +857,10 @@ sub tmpwrite {
 # ---------------------------------------------------------- Read the temp copy
 
 sub tmpread {
-    my ($safeeval,$tmpdir,$symb,$nfield,$nform)=@_;
-    my $fn=$uname.'_'.$udom.'_spreadsheet_'.$symb.'_'.&getfilename($safeeval);
+    my ($safeeval,$nfield,$nform)=@_;
+    my $fn=$ENV{'user.name'}.'_'.
+           $ENV{'user.domain'}.'_spreadsheet_'.&getusymb($safeeval).'_'.
+           &getfilename($safeeval);
     $fn=~s/\W/\_/g;
     $fn=$tmpdir.$fn.'.tmp';
     my $fh;
@@ -684,42 +874,26 @@ sub tmpread {
             $fo{$name}=$value;
         }
     }
-    $fo{$nfield}=$nform;
+    if ($nfield) { $fo{$nfield}=$nform; }
     &setformulas($safeeval,%fo);
 }
 
-# --------------------------------------------------------------- Read metadata
-
-sub readmeta {
-    my $fn=shift;
-    unless ($fn=~/\.meta$/) { $fn.='meta'; }
-    my $content;
-    my %returnhash=();
-    {
-      my $fh=Apache::File->new($fn);
-      $content=join('',<$fh>);
-    }
-   my $parser=HTML::TokeParser->new(\$content);
-   my $token;
-   while ($token=$parser->get_token) {
-      if ($token->[0] eq 'S') {
-         my $entry=$token->[1];
-         if (($entry eq 'stores') || ($entry eq 'parameter')) {
-             my $unikey=$entry;
-             $unikey.='_'.$token->[2]->{'part'}; 
-             $unikey.='_'.$token->[2]->{'name'}; 
-             $returnhash{$unikey}=$token->[2]->{'display'};
-         }
-     }
-  }
-    return %returnhash;
-}
-
 # ================================================================== 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,$symb)=@_;
+    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='';
@@ -732,23 +906,24 @@ sub parmval {
 
        my $symbparm=$symb.'.'.$what;
        my $mapparm=$mapname.'___(all).'.$what;
+       my $usercourseprefix=$uname.'_'.$udom.'_'.$cid;
 
        my $seclevel=
-            $ENV{'request.course.id'}.'.['.
+            $usercourseprefix.'.['.
 		$csec.'].'.$what;
        my $seclevelr=
-            $ENV{'request.course.id'}.'.['.
+            $usercourseprefix.'.['.
 		$csec.'].'.$symbparm;
        my $seclevelm=
-            $ENV{'request.course.id'}.'.['.
+            $usercourseprefix.'.['.
 		$csec.'].'.$mapparm;
 
        my $courselevel=
-            $ENV{'request.course.id'}.'.'.$what;
+            $usercourseprefix.'.'.$what;
        my $courselevelr=
-            $ENV{'request.course.id'}.'.'.$symbparm;
+            $usercourseprefix.'.'.$symbparm;
        my $courselevelm=
-            $ENV{'request.course.id'}.'.'.$mapparm;
+            $usercourseprefix.'.'.$mapparm;
 
 # ---------------------------------------------------------- fourth, check user
       
@@ -791,10 +966,92 @@ sub parmval {
         
 }
 
+# ---------------------------------------------- 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);
+    my %currentlist=();
+    my $now=time;
+    unless ($classlst=~/^error\:/) {
+        map {
+            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) {
+                    $rowlabel='<font color=red>Data not available: '.$name.
+			      '</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));
+                    $rowlabel=$ssec.'&nbsp;'.$reply{$sname}.'<br>';
+                    map {
+                        $rowlabel.=&Apache::lonnet::unescape($_).' ';
+                    } split(/\&/,$reply);
+                }
+		$currentlist{&Apache::lonnet::unescape($name)}=$rowlabel;
+            }
+        } split(/\&/,$classlst);
+#
+# -------------------- Find discrepancies between the course row table and this
+#
+        my %f=&getformulas($safeeval);
+        my $changed=0;
 
-# ----------------------------------------------------------------- Update rows
+        my $maxrow=0;
+        my %existing=();
 
-sub updaterows {
+# ----------------------------------------------------------- Now obsolete rows
+	map {
+	    if ($_=~/^A(\d+)/) {
+                $maxrow=($1>$maxrow)?$1:$maxrow;
+                $existing{$f{$_}}=1;
+		unless ((defined($currentlist{$f{$_}})) || (!$1)) {
+		   $f{$_}='!!! Obsolete';
+                   $changed=1;
+                }
+            }
+        } keys %f;
+
+# -------------------------------------------------------- New and unknown keys
+     
+        map {
+            unless ($existing{$_}) {
+		$changed=1;
+                $maxrow++;
+                $f{'A'.$maxrow}=$_;
+            }
+        } sort keys %currentlist;        
+     
+        if ($changed) { &setformulas($safeeval,%f); }
+
+        &setmaxrow($safeeval,$maxrow);
+        &setrowlabels($safeeval,%currentlist);
+
+    } else {
+        return 'Could not access course data';
+    }
+}
+
+# ----------------------------------- Update rows for student and assess sheets
+
+sub updatestudentassesssheet {
     my $safeeval=shift;
     my %bighash;
 # -------------------------------------------------------------------- Tie hash
@@ -890,9 +1147,43 @@ sub updaterows {
     }
 }
 
+# ------------------------------------------------ Load data for one assessment
+
+sub loadstudent {
+    my $safeeval=shift;
+    my %c=();
+    my %f=&getformulas($safeeval);
+    map {
+	if ($_=~/^A(\d+)/) {
+	   my $row=$1;
+           unless ($f{$_}=~/^\!/) {
+     #         my @assessdata=split(/\_\_\_\;\_\_\_/,
+     #                        &Apache::lonnet::ssi(
+     #                  '/adm/assesscalc',('utarget' => 'export',
+     #                                     'uname'   => $uname,
+     #                                     'udom'    => $udom,
+#			                  'usymb'   => $f{$_})));
+              my $index=0;
+#              map {
+#                  if ($assessdata[$index]) {
+#		     $c{$_.$row}=$assessdata[$index];
+#                     unless ($_ eq 'A') { 
+#			 $f{$_.$row}='import';
+#                     }
+#		  }
+#                  $index++;
+#              } ('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');
+	   }
+        }
+    } keys %f;
+    &setformulas($safeeval,%f);
+    &setconstants($safeeval,%c);
+}
+
 # --------------------------------------------------- Load data for one student
 
-sub rowazstudent {
+sub loadclass {
     my $safeeval=shift;
     my %c=();
     my %f=&getformulas($safeeval);
@@ -900,23 +1191,23 @@ sub rowazstudent {
 	if ($_=~/^A(\d+)/) {
 	   my $row=$1;
            unless ($f{$_}=~/^\!/) {
-              my @assessdata=split(/\_\_\_\;\_\_\_/,
-                             &Apache::lonnet::ssi(
-        '/res/msu/korte/junk.assesscalc',('utarget' => 'export',
-                                          'uname'   => $uname,
-                                          'udom'    => $udom,
-			                  'usymb'   => $f{$_})));
+	      my ($tname,$tdom)=split(/\:/,$_);
+#              my @assessdata=split(/\_\_\_\;\_\_\_/,
+#                             &Apache::lonnet::ssi(
+#                      '/adm/studentcalc',('utarget' => 'export',
+#                                          'uname'   => $tname,
+#                                          'udom'    => $tdom)));
               my $index=0;
-              map {
-                  if ($assessdata[$index]) {
-		     $c{$_.$row}=$assessdata[$index];
-                     unless ($_ eq 'A') { 
-			 $f{$_.$row}='import';
-                     }
-		  }
-                  $index++;
-              } ('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');
+#              map {
+#                  if ($assessdata[$index]) {
+#		     $c{$_.$row}=$assessdata[$index];
+#                     unless ($_ eq 'A') { 
+#			 $f{$_.$row}='import';
+#                     }
+#		  }
+#                  $index++;
+#              } ('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');
 	   }
         }
     } keys %f;
@@ -926,11 +1217,20 @@ sub rowazstudent {
 
 # ------------------------------------------------ Load data for one assessment
 
-sub rowaassess {
-    my ($safeeval,$symb)=@_;
-    my $uhome=&Apache::lonnet::homeserver($uname,$udom);
+sub loadassessment {
+    my $safeeval=shift;
+
+    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 $namespace;
-    unless ($namespace=$ENV{'request.course.id'}) { return ''; }
+    unless ($namespace=$cid) { return ''; }
 
 # ----------------------------------------------------------- Get stored values
     my $answer=&Apache::lonnet::reply(
@@ -954,23 +1254,23 @@ sub rowaassess {
 # ---------------------------- initialize coursedata and userdata for this user
     %courseopt=();
     %useropt=();
-    my $uhome=&Apache::lonnet::homeserver($uname,$udom);
+
+    my $userprefix=$uname.'_'.$udom.'_';
+
     unless ($uhome eq 'no_host') { 
 # -------------------------------------------------------------- Get coursedata
       unless
-        ((time-$courserdatas{$ENV{'request.course.id'}.'.last_cache'})<120) {
-         my $reply=&Apache::lonnet::reply('dump:'.
-              $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'.
-              $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.':resourcedata',
-              $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
+        ((time-$courserdatas{$cid.'.last_cache'})<120) {
+         my $reply=&Apache::lonnet::reply('dump:'.$cdom.':'.$cnum.
+              ':resourcedata',$chome);
          if ($reply!~/^error\:/) {
-            $courserdatas{$ENV{'request.course.id'}}=$reply;
-            $courserdatas{$ENV{'request.course.id'}.'.last_cache'}=time;
+            $courserdatas{$cid}=$reply;
+            $courserdatas{$cid.'.last_cache'}=time;
          }
       }
       map {
          my ($name,$value)=split(/\=/,$_);
-         $courseopt{&Apache::lonnet::unescape($name)}=
+         $courseopt{$userprefix.&Apache::lonnet::unescape($name)}=
                     &Apache::lonnet::unescape($value);  
       } split(/\&/,$courserdatas{$ENV{'request.course.id'}});
 # --------------------------------------------------- Get userdata (if present)
@@ -985,19 +1285,24 @@ sub rowaassess {
       }
       map {
          my ($name,$value)=split(/\=/,$_);
-         $useropt{&Apache::lonnet::unescape($name)}=
+         $useropt{$userprefix.&Apache::lonnet::unescape($name)}=
 	          &Apache::lonnet::unescape($value);
       } split(/\&/,$userrdatas{$uname.'___'.$udom});
-   }
-# -- now courseopt, useropt initialized for this user and course (used parmval)
+    }
 
-    my %c=();
+# ----------------- now courseopt, useropt initialized for this user and course
+# (used by parmval)
+
+   my %c=();
+
+   if (tie(%parmhash,'GDBM_File',
+           &getcfn($safeeval).'_parms.db',&GDBM_READER,0640)) {
     my %f=&getformulas($safeeval);
     map {
 	if ($_=~/^A/) {
             unless ($f{$_}=~/^\!/) {
   	       if ($f{$_}=~/^parameter/) {
-	          $c{$_}=&parmval($f{$_},$symb);
+	          $c{$_}=&parmval($f{$_},$safeeval);
 	       } else {
 		  my $key=$f{$_};
                   $key=~s/^stores\_/resource\./;
@@ -1007,8 +1312,9 @@ sub rowaassess {
 	   }
         }
     } keys %f;
-
-    &setconstants($safeeval,%c);
+    untie(%parmhash);
+   }
+   &setconstants($safeeval,%c);
 }
 
 # --------------------------------------------------------- Various form fields
@@ -1035,25 +1341,77 @@ sub selectbox {
     return $selout.'</select>';
 }
 
+# =============================================== Update information in a sheet
+#
+# Add new users or assessments, etc.
+#
+
+sub updatesheet {
+    my $safeeval=shift;
+    my $stype=&gettype($safeeval);
+    if ($stype eq 'classcalc') {
+	return &updateclasssheet($safeeval);
+    } else {
+        return &updatestudentassesssheet($safeeval);
+    }
+}
+
+# =================================================== Load the rows for a sheet
+#
+# Import the data for rows
+#
+
+sub loadrows() {
+    my $safeeval=shift;
+    my $stype=&gettype($safeeval);
+    if ($stype eq 'classcalc') {
+	&loadcourse($safeeval);
+    } elsif ($stype eq 'studentcalc') {
+        &loadstudent($safeeval);
+    } else {
+        &loadassessment($safeeval);
+    }
+}
+
+# ============================================================== Export handler
+#
+# Non-interactive call from with program
+#
+
+sub exportsheet {
+    my ($uname,$udom,$stype,$usymb,$fn)=@_;
+    my $thissheet=&makenewsheet($uname,$udom,$stype,$usymb);
+    &readsheet($thissheet,$fn);
+    &updatesheet($thissheet);
+    &loadrows($thissheet);
+    &calcsheet($thissheet);
+    return &exportdata($thissheet);
+}
+
 # ================================================================ Main handler
+#
+# Interactive call to screen
+#
+#
+
 
 sub handler {
     my $r=shift;
 
-    $uname='';
-    $udom='';
-    $csec='';
-
-   if ($r->header_only) {
+    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'}) || 
-      ($ENV{'request.state'} eq 'construct')) { 
+  if ($ENV{'request.course.fn'}) { 
 
 # --------------------------- Get query string for limited number of parameters
 
@@ -1070,16 +1428,17 @@ sub handler {
     } (split(/&/,$ENV{'QUERY_STRING'}));
 
 # ------------------------------------------- Nothing there? Must be login user
+
+    my $aname;
+    my $adom;
+
     unless ($ENV{'form.uname'}) {
-	$uname=$ENV{'user.name'};
-        $udom=$ENV{'user.domain'};
+	$aname=$ENV{'user.name'};
+        $adom=$ENV{'user.domain'};
     } else {
-        $uname=$ENV{'form.uname'};
-        $udom=$ENV{'form.udom'};
+        $aname=$ENV{'form.uname'};
+        $adom=$ENV{'form.udom'};
     }
-# ----------------------------------------------------------- Change of target?
-
-    my $reroute=($ENV{'form.utarget'} eq 'export');
 
 # ------------------------------------------------------------------- Open page
 
@@ -1090,7 +1449,6 @@ sub handler {
 
 # --------------------------------------------------------------- Screen output
 
-  unless ($reroute) {
     $r->print('<html><head><title>LON-CAPA Spreadsheet</title>');
     $r->print(<<ENDSCRIPT);
 <script language="JavaScript">
@@ -1115,78 +1473,126 @@ ENDSCRIPT
        &hiddenfield('usymb',$ENV{'form.usymb'}).
        &hiddenfield('unewfield','').
        &hiddenfield('unewformula',''));
-  }
+
+# ---------------------- Make sure that this gets out, even if user hits "stop"
+
+    $r->rflush();
 
 # ---------------------------------------- Read new sheet or modified worksheet
 
-    my $sheetone=initsheet();
     $r->uri=~/\/(\w+)$/;
-    &settype($sheetone,$1);
-    if ($ENV{'form.unewfield'}) {
-        $r->print('<h2>Modified Workcopy</h2>');
-        $ENV{'form.unewformula'}=~s/\'/\"/g;
-        $r->print('New formula: '.$ENV{'form.unewfield'}.'='.
-                  $ENV{'form.unewformula'}.'<br>');
-        &setfilename($sheetone,$ENV{'form.ufn'});
-	&tmpread($sheetone,$r->dir_config('lonDaemons').'/tmp/',
-                 $ENV{'form.usymb'},
-                 $ENV{'form.unewfield'},$ENV{'form.unewformula'});
-    } else {
-        &readsheet($sheetone,$ENV{'form.ufn'},$r);
-        $ENV{'form.ufn'}=&getfilename($sheetone);
-    }
-
-# --------------------------------------------- See if all import rows uptodate
 
-    if (tie(%parmhash,'GDBM_File',
-       $ENV{'request.course.fn'}.'_parms.db',&GDBM_READER,0640)) {
-       $csec=&Apache::lonnet::usection($udom,$uname,$ENV{'request.course.id'});
-       if ($csec eq '-1') {
-          $r->print('<h3><font color=red>'.
-   "User '$uname' at domain '$udom' not a student in this course</font></h3>");
-       }
-       &updaterows($sheetone);
-       untie(%parmhash);
-   } else {
-       $r->print('<h3><font color=red>'.
-	   'Could not initialize import fields (not in a course)</font></h3>');
-   }
+    my $asheet=&makenewsheet($aname,$adom,$1,$ENV{'form.usymb'});
 
+#    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($sheetone,$ENV{'form.ufn'});
+#	&tmpread($sheetone,$r->dir_config('lonDaemons').'/tmp/',
+#                 $ENV{'form.usymb'},
+#                 $ENV{'form.unewfield'},$ENV{'form.unewformula'});
+#    } elsif ($ENV{'form.saveas'}) {
+#        &setfilename($sheetone,$ENV{'form.ufn'});
+#	&tmpread($sheetone,,
+#                 $ENV{'form.usymb'});
+#    } else {
+#        unless ($ENV{'form.ufn'}) {
+#    }#
+#
+#  if (&gettype($sheetone) eq 'classcalc') {
+# ---------------------------------- For course view: get courselist and update
+#       &updatestudentrows($sheetone);
+#  } else {
+# ----------------- For assessment and student: See if all import rows uptodate
+#       $csec=&Apache::lonnet::usection($udom,$uname,$ENV{'request.course.id'});
+#       if ($csec eq '-1') {
+#          $r->print('<h3><font color=red>'.
+#   "User '$uname' at domain '$udom' not a student in this course</font></h3>");
+#       }
+#       &updaterows($sheetone);
+#       untie(%parmhash);
+#   } else {
+#       $r->print('<h3><font color=red>'.
+#	   'Could not initialize import fields (not in a course)</font></h3>');
+#   }
+# }
+# ---------------------------------------------------- See if something to save
+#    if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
+#        my $fname='';
+#	if ($ENV{'form.saveas'} && ($fname=$ENV{'form.newfn'})) {
+#            $fname=~s/\W/\_/g;
+#            if ($fname eq 'default') { $fname='course_default'; }
+#            $fname.='_'.&gettype($sheetone);
+#            &setfilename($sheetone,$fname);
+#            $ENV{'form.ufn'}=$fname;
+#            my $reply=&writesheet($sheetone);
+#            unless ($reroute) {
+#		$r->print('<p>Saving spreadsheet: '.$reply.'<p>');
+#            }
+#            if ($ENV{'form.makedefufn'}) {
+#                my $reply=&Apache::lonnet::reply('put:'.
+#                     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'.
+#                     $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.
+#                     ':environment:spreadsheet_default_'.
+#                     &gettype($sheetone).'='.
+#                     &Apache::lonnet::escape($fname),
+#                     $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
+#               unless ($reroute) {
+#	           $r->print('<p>Making default spreadsheet: '.$reply.'<p>');
+#               }
+#            }
+#        }
+#    }
 # ------------------------------------------------ Write the modified worksheet
-
-   &tmpwrite($sheetone,$r->dir_config('lonDaemons').'/tmp/',
-              $ENV{'form.usymb'});
-
+#
+#   &tmpwrite($sheetone,$r->dir_config('lonDaemons').'/tmp/',
+ #             $ENV{'form.usymb'});
+#
 # ----------------------------------------------------- Print user, course, etc
-   unless ($reroute) {
-    $r->print(&hiddenfield('ufn',$ENV{'form.ufn'}).
-              "<b>User '$uname' at domain '$udom' for '".
-              $ENV{'course.'.$ENV{'request.course.id'}.'.description'}."'");
-    if ($csec) {
-       $r->print(", group/section '$csec'");
-    }
-    $r->print("</b>\n");
-   }
+#   unless ($reroute) {
+#    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>');
+#    }
+#    $r->print(&hiddenfield('ufn',$ENV{'form.ufn'}));
+#    unless (&gettype($sheetone) eq 'classcalc') {
+#        $r->print('<br><b>User:</b> '.$uname.'<br><b>Domain:</b> '.$udom);
+#    }
+#    $r->print('<h1>'.
+#            $ENV{'course.'.$ENV{'request.course.id'}.'.description'}.'</h1>');
+#    if ($csec) {
+#       $r->print('<h3>Group/Section: '.$csec.'</h3>');
+#    }
+#   }
 # -------------------------------------------------------- Import and calculate
+#
+#    if (&gettype($sheetone) eq 'assesscalc') {
+#	&rowaassess($sheetone,$ENV{'form.usymb'});
+#    } elsif  (&gettype($sheetone) eq 'studentcalc') {
+#	&rowazstudent($sheetone);
+#    } else {
+#        &rowazclass($sheetone);
+#    }
 
-    if (&gettype($sheetone) eq 'assesscalc') {
-	&rowaassess($sheetone,$ENV{'form.usymb'});
-    } elsif  (&gettype($sheetone) eq 'studentcalc') {
-	&rowazstudent($sheetone);
-    }
-    my $calcoutput=&calcsheet($sheetone);
-    unless ($reroute) {
-       $r->print('<h3><font color=red>'.$calcoutput.'</h3></font>');
-    }
 
-# ------------------------------------------------------- Print or export sheet
-   unless ($reroute) {   
-    $r->print(&outsheet($sheetone));
+    &readsheet($asheet,'');
+    &updatesheet($asheet);
+    &loadrows($asheet);
+
 
+    my $calcoutput=&calcsheet($asheet);
+    $r->print('<h3><font color=red>'.$calcoutput.'</h3></font>');
+
+    &outsheet($r,$asheet);
     $r->print('</form></body></html>');
-  } else {
-     $r->print(&exportrow($sheetone));
-  }
+
+
 # ------------------------------------------------------------------------ Done
   } else {
 # ----------------------------- Not in a course, or not allowed to modify parms
@@ -1195,6 +1601,7 @@ ENDSCRIPT
       return HTTP_NOT_ACCEPTABLE; 
   }
     return OK;
+
 }
 
 1;