--- loncom/interface/Attic/lonspreadsheet.pm 2001/01/02 23:27:11 1.32
+++ loncom/interface/Attic/lonspreadsheet.pm 2001/03/13 15:50:47 1.44
@@ -3,10 +3,11 @@
#
# 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,
-# 01/01/01,02/01 Gerd Kortemeyer
+# 01/01/01,02/01,03/01,19/01,20/01,22/01,
+# 03/05,03/08,03/10,03/12,03/13 Gerd Kortemeyer
package Apache::lonspreadsheet;
-
+
use strict;
use Safe;
use Safe::Hole;
@@ -17,10 +18,28 @@ use GDBM_File;
use HTML::TokeParser;
#
+# Caches for previously calculated spreadsheets
+#
+
+my %oldsheets;
+
+#
+# Cache for stores of an individual user
+#
+
+my $cachedassess;
+my %cachedstores;
+
+#
# These cache hashes need to be independent of user, resource and course
# (user and course can/should be in the keys)
#
-use vars qw(%spreadsheets %courserdatas %userrdatas %defaultsheets);
+
+my %spreadsheets;
+my %courserdatas;
+my %userrdatas;
+my %defaultsheets;
+my %updatedata;
#
# These global hashes are dependent on user, course and resource,
@@ -39,7 +58,7 @@ my $tmpdir;
# ===================================== Implements an instance of a spreadsheet
sub initsheet {
- my $safeeval = new Safe;
+ my $safeeval = new Safe(shift);
my $safehole = new Safe::Hole;
$safeeval->permit("entereval");
$safeeval->permit(":base_math");
@@ -56,11 +75,11 @@ sub initsheet {
# c: preloaded constants (A-column)
# rl: row label
-%v=();
-%t=();
-%f=();
-%c=();
-%rl=();
+undef %v;
+undef %t;
+undef %f;
+undef %c;
+undef %rl;
$maxrow=0;
$sheettype='';
@@ -304,6 +323,7 @@ sub sett {
$t{$lb}=~s/\#/$trow/g;
$t{$lb}=~s/\.\.+/\,/g;
$t{$lb}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g;
+ $t{$lb}=~s/(^|[^\"\'])\[(\w+)\]/$1\$c\{\'$2\'\}/g;
}
}
} keys %f;
@@ -312,7 +332,8 @@ sub sett {
} keys %f;
map {
if (($f{$_}) && ($_!~/template\_/)) {
- if ($_=~/^$pattern/) {
+ my $matches=($_=~/^$pattern(\d+)/);
+ if (($matches) && ($1)) {
unless ($f{$_}=~/^\!/) {
$t{$_}=$c{$_};
}
@@ -320,12 +341,14 @@ sub sett {
$t{$_}=$f{$_};
$t{$_}=~s/\.\.+/\,/g;
$t{$_}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g;
+ $t{$_}=~s/(^|[^\"\'])\[([\w\.]+)\]/$1\$c\{\'$2\'\}/g;
}
}
} keys %f;
$t{'A0'}=$f{'A0'};
$t{'A0'}=~s/\.\.+/\,/g;
$t{'A0'}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$v\{\'$2\'\}/g;
+ $t{'A0'}=~s/(^|[^\"\'])\[([\w\.]+)\]/$1\$c\{\'$2\'\}/g;
}
sub calc {
@@ -423,22 +446,22 @@ ENDDEFS
# ------------------------------------------------ Add or change formula values
sub setformulas {
- my ($safeeval,@f)=@_;
- $safeeval->reval('%f='."('".join("','",@f)."');");
+ my ($safeeval,%f)=@_;
+ %{$safeeval->varglob('f')}=%f;
}
# ------------------------------------------------ Add or change formula values
sub setconstants {
- my ($safeeval,@c)=@_;
- $safeeval->reval('%c='."('".join("','",@c)."');");
+ my ($safeeval,%c)=@_;
+ %{$safeeval->varglob('c')}=%c;
}
# ------------------------------------------------ Add or change formula values
sub setrowlabels {
- my ($safeeval,@rl)=@_;
- $safeeval->reval('%rl='."('".join("','",@rl)."');");
+ my ($safeeval,%rl)=@_;
+ %{$safeeval->varglob('rl')}=%rl;
}
# ------------------------------------------------------- Calculate spreadsheet
@@ -459,7 +482,7 @@ sub getvalues {
sub getformulas {
my $safeeval=shift;
- return $safeeval->reval('%f');
+ return %{$safeeval->varglob('f')};
}
# -------------------------------------------------------------------- Get type
@@ -774,7 +797,7 @@ sub readsheet {
sub makenewsheet {
my ($uname,$udom,$stype,$usymb)=@_;
- my $safeeval=initsheet();
+ my $safeeval=initsheet($stype);
$safeeval->reval(
'$uname="'.$uname.
'";$udom="'.$udom.
@@ -1056,6 +1079,9 @@ sub updateclasssheet {
sub updatestudentassesssheet {
my $safeeval=shift;
my %bighash;
+ my $stype=&gettype($safeeval);
+ my %current=();
+ unless ($updatedata{$ENV{'request.course.fn'}.'_'.$stype}) {
# -------------------------------------------------------------------- Tie hash
if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
&GDBM_READER,0640)) {
@@ -1064,8 +1090,6 @@ sub updatestudentassesssheet {
my %allkeys=();
my %allassess=();
- my $stype=&gettype($safeeval);
-
map {
if ($_=~/^src\_(\d+)\.(\d+)$/) {
my $mapid=$1;
@@ -1077,8 +1101,8 @@ sub updatestudentassesssheet {
&Apache::lonnet::declutter($bighash{'map_id_'.$mapid}).
'___'.$resid.'___'.
&Apache::lonnet::declutter($srcf);
- $allassess{$symb}=$bighash{'title_'.$id};
-
+ $allassess{$symb}=
+ ''.$bighash{'title_'.$id}.'';
if ($stype eq 'assesscalc') {
map {
if (($_=~/^stores\_(.*)/) || ($_=~/^parameter\_(.*)/)) {
@@ -1086,9 +1110,10 @@ sub updatestudentassesssheet {
my $display=
&Apache::lonnet::metadata($srcf,$key.'.display');
unless ($display) {
- $display=
+ $display.=
&Apache::lonnet::metadata($srcf,$key.'.name');
}
+ $display.='
'.$key;
$allkeys{$key}=$display;
}
} split(/\,/,&Apache::lonnet::metadata($srcf,'keys'));
@@ -1102,17 +1127,26 @@ sub updatestudentassesssheet {
# %allkeys has a list of storage and parameter displays by unikey
# %allassess has a list of all resource displays by symb
#
-# -------------------- Find discrepancies between the course row table and this
-#
- my %f=&getformulas($safeeval);
- my $changed=0;
- my %current=();
if ($stype eq 'assesscalc') {
%current=%allkeys;
} elsif ($stype eq 'studentcalc') {
%current=%allassess;
}
+ $updatedata{$ENV{'request.course.fn'}.'_'.$stype}=
+ join('___;___',%current);
+ } else {
+ return 'Could not access course data';
+ }
+# ------------------------------------------------------ Get current from cache
+ } else {
+ %current=split(/\_\_\_\;\_\_\_/,
+ $updatedata{$ENV{'request.course.fn'}.'_'.$stype});
+ }
+# -------------------- Find discrepancies between the course row table and this
+#
+ my %f=&getformulas($safeeval);
+ my $changed=0;
my $maxrow=0;
my %existing=();
@@ -1138,15 +1172,14 @@ sub updatestudentassesssheet {
$f{'A'.$maxrow}=$_;
}
} keys %current;
-
+
if ($changed) { &setformulas($safeeval,%f); }
&setmaxrow($safeeval,$maxrow);
&setrowlabels($safeeval,%current);
-
- } else {
- return 'Could not access course data';
- }
+
+ undef %current;
+ undef %existing;
}
# ------------------------------------------------ Load data for one assessment
@@ -1155,19 +1188,40 @@ sub loadstudent {
my $safeeval=shift;
my %c=();
my %f=&getformulas($safeeval);
+ $cachedassess=&getuname($safeeval).':'.&getudom($safeeval);
+ %cachedstores=();
+ {
+ my $reply=&Apache::lonnet::reply('dump:'.&getudom($safeeval).':'.
+ &getuname($safeeval).':'.
+ &getcid($safeeval),
+ &getuhome($safeeval));
+ unless ($reply=~/^error\:/) {
+ map {
+ my ($name,$value)=split(/\=/,$_);
+ $cachedstores{&Apache::lonnet::unescape($name)}=
+ &Apache::lonnet::unescape($value);
+ } split(/\&/,$reply);
+ }
+ }
+ my @assessdata=();
map {
if ($_=~/^A(\d+)/) {
my $row=$1;
- unless ($f{$_}=~/^\!/) {
- my @assessdata=&exportsheet(&getuname($safeeval),
- &getudom($safeeval),
- 'assesscalc',$f{$_});
+ unless (($f{$_}=~/^\!/) || ($row==0)) {
+ @assessdata=&exportsheet(&getuname($safeeval),
+ &getudom($safeeval),
+ 'assesscalc',$f{$_});
my $index=0;
map {
if ($assessdata[$index]) {
- $c{$_.$row}=$assessdata[$index];
- unless ($_ eq 'A') {
- $f{$_.$row}='import';
+ my $col=$_;
+ if ($assessdata[$index]=~/\D/) {
+ $c{$col.$row}="'".$assessdata[$index]."'";
+ } else {
+ $c{$col.$row}=$assessdata[$index];
+ }
+ unless ($col eq 'A') {
+ $f{$col.$row}='import';
}
}
$index++;
@@ -1176,6 +1230,8 @@ sub loadstudent {
}
}
} keys %f;
+ $cachedassess='';
+ undef %cachedstores;
&setformulas($safeeval,%f);
&setconstants($safeeval,%c);
}
@@ -1183,27 +1239,53 @@ sub loadstudent {
# --------------------------------------------------- Load data for one student
sub loadcourse {
- my $safeeval=shift;
+ my ($safeeval,$r)=@_;
my %c=();
my %f=&getformulas($safeeval);
+ my $total=0;
+ map {
+ if ($_=~/^A(\d+)/) {
+ unless ($f{$_}=~/^\!/) { $total++; }
+ }
+ } keys %f;
+ my $now=0;
+ my $since=time;
+ $r->print(<
+ popwin=open('','popwin','width=400,height=100');
+ popwin.document.writeln(''+
+ 'Spreadsheet Calculation Progress
'+
+ ''+
+ '');
+ popwin.document.close();
+
+ENDPOP
+ $r->rflush();
map {
if ($_=~/^A(\d+)/) {
my $row=$1;
- unless (($f{$_}=~/^\!/)
-
-|| ($row>200))
-
- {
- my @studentdata=&exportsheet(&getuname($safeeval),
- &getudom($safeeval),
+ unless (($f{$_}=~/^\!/) || ($row==0)) {
+ my @studentdata=&exportsheet(split(/\:/,$f{$_}),
'studentcalc');
- undef %userrdatas;
+ undef %userrdatas;
+ $now++;
+ $r->print('');
+ $r->rflush();
+
my $index=0;
map {
if ($studentdata[$index]) {
- $c{$_.$row}=$studentdata[$index];
- unless ($_ eq 'A') {
- $f{$_.$row}='import';
+ my $col=$_;
+ if ($studentdata[$index]=~/\D/) {
+ $c{$col.$row}="'".$studentdata[$index]."'";
+ } else {
+ $c{$col.$row}=$studentdata[$index];
+ }
+ unless ($col eq 'A') {
+ $f{$col.$row}='import';
}
}
$index++;
@@ -1214,6 +1296,8 @@ sub loadcourse {
} keys %f;
&setformulas($safeeval,%f);
&setconstants($safeeval,%c);
+ $r->print('');
+ $r->rflush();
}
# ------------------------------------------------ Load data for one assessment
@@ -1234,11 +1318,31 @@ sub loadassessment {
unless ($namespace=$cid) { return ''; }
# ----------------------------------------------------------- Get stored values
+
+ my %returnhash=();
+
+ if ($cachedassess eq $uname.':'.$udom) {
+#
+# get data out of the dumped stores
+#
+
+ my $version=$cachedstores{'version:'.$symb};
+ my $scope;
+ for ($scope=1;$scope<=$version;$scope++) {
+ map {
+ $returnhash{$_}=$cachedstores{$scope.':'.$symb.':'.$_};
+ } split(/\:/,$cachedstores{$scope.':keys:'.$symb});
+ }
+
+ } else {
+#
+# restore individual
+#
+
my $answer=&Apache::lonnet::reply(
"restore:$udom:$uname:".
&Apache::lonnet::escape($namespace).":".
&Apache::lonnet::escape($symb),$uhome);
- my %returnhash=();
map {
my ($name,$value)=split(/\=/,$_);
$returnhash{&Apache::lonnet::unescape($name)}=
@@ -1250,6 +1354,7 @@ sub loadassessment {
$returnhash{$_}=$returnhash{$version.':'.$_};
} split(/\:/,$returnhash{$version.':keys'});
}
+ }
# ----------------------------- returnhash now has all stores for this resource
# ---------------------------- initialize coursedata and userdata for this user
@@ -1273,7 +1378,7 @@ sub loadassessment {
my ($name,$value)=split(/\=/,$_);
$courseopt{$userprefix.&Apache::lonnet::unescape($name)}=
&Apache::lonnet::unescape($value);
- } split(/\&/,$courserdatas{$ENV{'request.course.id'}});
+ } split(/\&/,$courserdatas{$cid});
# --------------------------------------------------- Get userdata (if present)
unless
((time-$userrdatas{$uname.'___'.$udom.'.last_cache'})<240) {
@@ -1290,7 +1395,6 @@ sub loadassessment {
&Apache::lonnet::unescape($value);
} split(/\&/,$userrdatas{$uname.'___'.$udom});
}
-
# ----------------- now courseopt, useropt initialized for this user and course
# (used by parmval)
@@ -1303,12 +1407,16 @@ sub loadassessment {
if ($_=~/^A/) {
unless ($f{$_}=~/^\!/) {
if ($f{$_}=~/^parameter/) {
- $c{$_}=&parmval($f{$_},$safeeval);
+ my $val=&parmval($f{$_},$safeeval);
+ $c{$_}=$val;
+ $c{$f{$_}}=$val;
} else {
my $key=$f{$_};
+ my $ckey=$key;
$key=~s/^stores\_/resource\./;
$key=~s/\_/\./;
$c{$_}=$returnhash{$key};
+ $c{$ckey}=$returnhash{$key};
}
}
}
@@ -1362,11 +1470,11 @@ sub updatesheet {
# Import the data for rows
#
-sub loadrows() {
- my $safeeval=shift;
+sub loadrows {
+ my ($safeeval,$r)=@_;
my $stype=&gettype($safeeval);
if ($stype eq 'classcalc') {
- &loadcourse($safeeval);
+ &loadcourse($safeeval,$r);
} elsif ($stype eq 'studentcalc') {
&loadstudent($safeeval);
} else {
@@ -1380,15 +1488,94 @@ sub loadrows() {
#
sub exportsheet {
- my ($uname,$udom,$stype,$usymb,$fn)=@_;
+ my ($uname,$udom,$stype,$usymb,$fn)=@_;
+ my @exportarr=();
+#
+# Check if cached
+#
+ my $key=$uname.':'.$udom.':'.$stype.':'.$usymb;
+ my $found='';
+
+ if ($oldsheets{$key}) {
+ map {
+ my ($name,$value)=split(/\_\_\_\=\_\_\_/,$_);
+ if ($name eq $fn) {
+ $found=$value;
+ }
+ } split(/\_\_\_\&\_\_\_/,$oldsheets{$key});
+ }
+
+ if ($found) {
+#
+# Return what was cached
+#
+ @exportarr=split(/\_\_\_\;\_\_\_/,$found);
+
+ } else {
+#
+# Not cached
+#
my $thissheet=&makenewsheet($uname,$udom,$stype,$usymb);
&readsheet($thissheet,$fn);
&updatesheet($thissheet);
&loadrows($thissheet);
- &calcsheet($thissheet);
- my @returnthis=&exportdata($thissheet);
- undef $thissheet;
- return @returnthis;
+ &calcsheet($thissheet);
+ @exportarr=&exportdata($thissheet);
+#
+# Store now
+#
+ my $cid=$ENV{'request.course.id'};
+ my $current=&Apache::lonnet::reply('get:'.
+ $ENV{'course.'.$cid.'.domain'}.':'.
+ $ENV{'course.'.$cid.'.num'}.
+ ':nohist_calculatedsheets:'.
+ &Apache::lonnet::escape($key),
+ $ENV{'course.'.$cid.'.home'});
+ my %currentlystored=();
+ unless ($current=~/^error\:/) {
+ map {
+ my ($name,$value)=split(/\_\_\_\=\_\_\_/,$_);
+ $currentlystored{$name}=$value;
+ } split(/\_\_\_\&\_\_\_/,&Apache::lonnet::unescape($current));
+ }
+ $currentlystored{$fn}=join('___;___',@exportarr);
+
+ my $newstore='';
+ map {
+ if ($newstore) { $newstore.='___&___'; }
+ $newstore.=$_.'___=___'.$currentlystored{$_};
+ } keys %currentlystored;
+ &Apache::lonnet::reply('put:'.
+ $ENV{'course.'.$cid.'.domain'}.':'.
+ $ENV{'course.'.$cid.'.num'}.
+ ':nohist_calculatedsheets:'.
+ &Apache::lonnet::escape($key).'='.
+ &Apache::lonnet::escape($newstore),
+ $ENV{'course.'.$cid.'.home'});
+ }
+ return @exportarr;
+}
+
+# ===================================================== Calculated sheets cache
+#
+# Load all previously cached spreadsheets for this course
+#
+
+sub cachedsheets {
+ my $cid=$ENV{'request.course.id'};
+ my $reply=&Apache::lonnet::reply('dump:'.
+ $ENV{'course.'.$cid.'.domain'}.':'.
+ $ENV{'course.'.$cid.'.num'}.
+ ':nohist_calculatedsheets',
+ $ENV{'course.'.$cid.'.home'});
+ undef %oldsheets;
+ unless ($reply=~/^error\:/) {
+ map {
+ my ($name,$value)=split(/\=/,$_);
+ $oldsheets{&Apache::lonnet::unescape($name)}
+ =&Apache::lonnet::unescape($value);
+ } split(/\&/,$reply);
+ }
}
# ================================================================ Main handler
@@ -1559,12 +1746,24 @@ ENDSCRIPT
$r->print(&hiddenfield('ufn',&getfilename($asheet)));
+# ----------------------------------------------------------- Get cached sheets
+
+ &cachedsheets();
# ----------------------------------------------------- Update sheet, load rows
+ $r->print("Loaded sheet(s), updating rows ...
\n");
+ $r->rflush();
+
&updatesheet($asheet);
- &loadrows($asheet);
+ $r->print("Updated rows, loading row data ...
\n");
+ $r->rflush();
+
+ &loadrows($asheet,$r);
+
+ $r->print("Loaded row data, calculating sheet ...
\n");
+ $r->rflush();
my $calcoutput=&calcsheet($asheet);
$r->print(''.$calcoutput.'
');
@@ -1572,7 +1771,6 @@ ENDSCRIPT
&outsheet($r,$asheet);
$r->print('