--- loncom/interface/Attic/lonspreadsheet.pm	2001/01/02 16:03:14	1.28
+++ loncom/interface/Attic/lonspreadsheet.pm	2001/01/02 20:19:34	1.29
@@ -81,6 +81,7 @@ $chome='';
 $cnum='';
 $cdom='';
 $cid='';
+$cfn='';
 
 # symb
 
@@ -495,6 +496,7 @@ sub getfilename {
     my $safeeval=shift;
     return $safeeval->reval('$filename');
 }
+
 # --------------------------------------------------------------- Get course ID
 
 sub getcid {
@@ -502,6 +504,13 @@ sub getcid {
     return $safeeval->reval('$cid');
 }
 
+# --------------------------------------------------------- Get course filename
+
+sub getcfn {
+    my $safeeval=shift;
+    return $safeeval->reval('$cfn');
+}
+
 # ----------------------------------------------------------- Get course number
 
 sub getcnum {
@@ -767,14 +776,16 @@ sub makenewsheet {
     my ($uname,$udom,$stype,$usymb)=@_;
     my $safeeval=initsheet();
     $safeeval->reval(
-       '$uname='.$uname.
-      ';$udom='.$udom.
-      ';$sheettype='.$stype.
-      ';$usymb='.$usymb.
-      ';$cid='.$ENV{'request.course.id'}.
-      ';$cnum='.$ENV{'course.'.$ENV{'request.course.id'}.'.num'}.
-      ';$cdom='.$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.
-      ';$chome='.$ENV{'course.'.$ENV{'request.course.id'}.'.home'}.';');
+       '$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;
 }
 
@@ -870,6 +881,11 @@ sub tmpread {
 # ================================================================== 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,$safeeval)=@_;
@@ -890,7 +906,7 @@ sub parmval {
 
        my $symbparm=$symb.'.'.$what;
        my $mapparm=$mapname.'___(all).'.$what;
-       my $usercourseprefix=$cid.'_'.$uname.'_'.$udom;
+       my $usercourseprefix=$uname.'_'.$udom.'_'.$cid;
 
        my $seclevel=
             $usercourseprefix.'.['.
@@ -1133,7 +1149,7 @@ sub updatestudentassesssheet {
 
 # ------------------------------------------------ Load data for one assessment
 
-sub rowazstudent {
+sub loadstudent {
     my $safeeval=shift;
     my %c=();
     my %f=&getformulas($safeeval);
@@ -1141,23 +1157,23 @@ sub rowazstudent {
 	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 @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');
+#              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;
@@ -1167,7 +1183,7 @@ sub rowazstudent {
 
 # --------------------------------------------------- Load data for one student
 
-sub rowazclass {
+sub loadclass {
     my $safeeval=shift;
     my %c=();
     my %f=&getformulas($safeeval);
@@ -1176,22 +1192,22 @@ sub rowazclass {
 	   my $row=$1;
            unless ($f{$_}=~/^\!/) {
 	      my ($tname,$tdom)=split(/\:/,$_);
-              my @assessdata=split(/\_\_\_\;\_\_\_/,
-                             &Apache::lonnet::ssi(
-                      '/adm/studentcalc',('utarget' => 'export',
-                                          'uname'   => $tname,
-                                          'udom'    => $tdom)));
+#              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;
@@ -1201,11 +1217,20 @@ sub rowazclass {
 
 # ------------------------------------------------ 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(
@@ -1229,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)
@@ -1260,13 +1285,18 @@ 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/) {
@@ -1282,8 +1312,9 @@ sub rowaassess {
 	   }
         }
     } keys %f;
-
-    &setconstants($safeeval,%c);
+    untie(%parmhash);
+   }
+   &setconstants($safeeval,%c);
 }
 
 # --------------------------------------------------------- Various form fields
@@ -1334,11 +1365,11 @@ sub loadrows() {
     my $safeeval=shift;
     my $stype=&gettype($safeeval);
     if ($stype eq 'classcalc') {
-	&loadcourse($thissheet);
+	&loadcourse($safeeval);
     } elsif ($stype eq 'studentcalc') {
-        &loadstudent($thissheet);
+        &loadstudent($safeeval);
     } else {
-        &loadassessment($thissheet);
+        &loadassessment($safeeval);
     }
 }
 
@@ -1349,7 +1380,7 @@ sub loadrows() {
 
 sub exportsheet {
     my ($uname,$udom,$stype,$usymb,$fn)=@_;
-    my $thissheet=($uname,$udom,$stype,$usymb);
+    my $thissheet=&makenewsheet($uname,$udom,$stype,$usymb);
     &readsheet($thissheet,$fn);
     &updatesheet($thissheet);
     &loadrows($thissheet);
@@ -1375,13 +1406,12 @@ sub handler {
 
 # ---------------------------------------------------- Global directory configs
 
-$includedir=r->dir_config('lonIncludes');
+$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
 
@@ -1398,16 +1428,17 @@ $tmpdir=$r->dir_config('lonDaemons').'/t
     } (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
 
@@ -1418,7 +1449,6 @@ $tmpdir=$r->dir_config('lonDaemons').'/t
 
 # --------------------------------------------------------------- Screen output
 
-  unless ($reroute) {
     $r->print('<html><head><title>LON-CAPA Spreadsheet</title>');
     $r->print(<<ENDSCRIPT);
 <script language="JavaScript">
@@ -1443,124 +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('<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') {
+    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 {
+#       &updatestudentrows($sheetone);
+#  } else {
 # ----------------- For assessment and student: 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>');
-   }
- }
+#       $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>');
-               }
-            }
-        }
-    }
+#    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) {
-    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>');
-    }
-   }
+#   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);
-    } else {
-        &rowazclass($sheetone);
-    }
-    my $calcoutput=&calcsheet($sheetone);
-    unless ($reroute) {
-       $r->print('<h3><font color=red>'.$calcoutput.'</h3></font>');
-    }
 
-# ------------------------------------------------------- Print or export sheet
-   unless ($reroute) {   
-    &outsheet($r,$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
@@ -1570,7 +1602,6 @@ ENDSCRIPT
   }
     return OK;
 
-    $bombnomatterwhat='yes';
 }
 
 1;