[BACK]Return to lonspreadsheet.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/Attic/lonspreadsheet.pm between versions 1.106 and 1.107

version 1.106, 2002/09/01 18:06:52 version 1.107, 2002/09/05 14:38:57
Line 1395  sub parse_sheet { Line 1395  sub parse_sheet {
 #  #
   
 sub readsheet {  sub readsheet {
     my ($safeeval,$fn)=@_;      my ($safeeval,$sheetdata,$fn)=@_;
     my $stype = &gettype($safeeval);      #
     my $cnum  = &getcnum($safeeval);      my $stype = $sheetdata->{'sheettype'};
     my $cdom  = &getcdom($safeeval);      my $cnum  = $sheetdata->{'cnum'};
     my $chome = &getchome($safeeval);      my $cdom  = $sheetdata->{'cdom'};
       my $chome = $sheetdata->{'chome'};
       #
     if (! defined($fn)) {      if (! defined($fn)) {
         # There is no filename. Look for defaults in course and global, cache          # There is no filename. Look for defaults in course and global, cache
         unless ($fn=$defaultsheets{$cnum.'_'.$cdom.'_'.$stype}) {          unless ($fn=$defaultsheets{$cnum.'_'.$cdom.'_'.$stype}) {
Line 1822  sub updatestudentassesssheet { Line 1823  sub updatestudentassesssheet {
              '_discussion' =>'<a href="/adm/assesscalc?usymb=_discussion'.               '_discussion' =>'<a href="/adm/assesscalc?usymb=_discussion'.
              $adduserstr.'">Discussion</a>'               $adduserstr.'">Discussion</a>'
              );               );
         foreach (keys(%bighash)) {          while (($_,undef) = each(%bighash)) {
             next if ($_!~/^src\_(\d+)\.(\d+)$/);              next if ($_!~/^src\_(\d+)\.(\d+)$/);
             my $mapid=$1;              my $mapid=$1;
             my $resid=$2;              my $resid=$2;
Line 2292  sub exportsheet { Line 2293  sub exportsheet {
         # Not cached          # Not cached
         #                  #        
         my ($thissheet,$sheetdata)=&makenewsheet($uname,$udom,$stype,$usymb);          my ($thissheet,$sheetdata)=&makenewsheet($uname,$udom,$stype,$usymb);
         &readsheet($thissheet,$fn);          &readsheet($thissheet,$sheetdata,$fn);
         &updatesheet($thissheet,$sheetdata);          &updatesheet($thissheet,$sheetdata);
         &loadrows($thissheet,$sheetdata);          &loadrows($thissheet,$sheetdata);
         &calcsheet($thissheet,$sheetdata);           &calcsheet($thissheet,$sheetdata); 
Line 2540  ENDSCRIPT Line 2541  ENDSCRIPT
         &setfilename($asheet,$ENV{'form.ufn'});          &setfilename($asheet,$ENV{'form.ufn'});
         &tmpread($asheet);          &tmpread($asheet);
     } else {      } else {
         &readsheet($asheet,$ENV{'form.ufn'});          &readsheet($asheet,$asheetdata,$ENV{'form.ufn'});
     }      }
     # Print out user information      # Print out user information
     unless ($asheetdata->{'sheettype'} eq 'classcalc') {      unless ($asheetdata->{'sheettype'} eq 'classcalc') {
Removed from v.1.106  
changed lines
  Added in v.1.107

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>