--- loncom/interface/Attic/lonspreadsheet.pm 2000/12/04 19:38:35 1.3
+++ loncom/interface/Attic/lonspreadsheet.pm 2000/12/06 14:50:47 1.6
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Spreadsheet/Grades Display Handler
#
-# 11/11,11/15,11/27,12/04 Gerd Kortemeyer
+# 11/11,11/15,11/27,12/04,12/05,12/06 Gerd Kortemeyer
package Apache::lonspreadsheet;
@@ -12,21 +12,39 @@ use Opcode;
use Apache::lonnet;
use Apache::Constants qw(:common);
use HTML::TokeParser;
+use GDBM_File;
-#
-# f: formulas
-# t: intermediate format (from f after sett)
-# v: output values (from t after calcv)
-#
-
-use vars qw(%v %t %f);
-
+# =============================================================================
+# ===================================== Implements an instance of a spreadsheet
-sub deffunc {
- my $safeeval=shift;
+sub initsheet {
+ my $safeeval = new Safe;
+ my $safehole = new Safe::Hole;
+ $safeeval->permit("entereval");
+ $safeeval->permit(":base_math");
+ $safeeval->permit("sort");
+ $safeeval->deny(":base_io");
+ $safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT');
my $code=<<'ENDDEFS';
# ---------------------------------------------------- Inside of the safe space
+#
+# f: formulas
+# t: intermediate format (variable references expanded)
+# v: output values
+# c: preloaded constants (A-column)
+# rl: row label
+
+%v=();
+%t=();
+%f=();
+%c=();
+%rl=();
+
+$maxrow=0;
+$sheettype='';
+$filename='';
+
sub mask {
my ($lower,$upper)=@_;
@@ -91,10 +109,9 @@ sub mask {
}
}
}
- return '^'.$alpha.$num.'$';
+ return '^'.$alpha.$num."\$";
}
-
sub NUM {
my $mask=mask(@_);
my $num=0;
@@ -215,37 +232,33 @@ sub SUMMIN {
return $sum;
}
-
-# ------------------------------------------- End of "Inside of the safe space"
-ENDDEFS
- $safeeval->reval($code);
-}
-
-# --------------------------------------------------------- Initialize t from f
-
sub sett {
%t=();
map {
if ($f{$_}) {
- $t{$_}=$f{$_};
- $t{$_}=~s/\.+/\,/g;
- $t{$_}=~s/(^|[^\"\'])([A-Z]\d+)/$1\$v\{\'$2\'\}/g;
+ if ($_=~/^A/) {
+ unless ($f{$_}=~/^\!/) {
+ $t{$_}=$c{$_};
+ }
+ } else {
+ $t{$_}=$f{$_};
+ $t{$_}=~s/\.+/\,/g;
+ $t{$_}=~s/(^|[^\"\'])([A-Z]\d+)/$1\$v\{\'$2\'\}/g;
+ }
}
} keys %f;
}
-# ------------------------------------------------------------ Calculate values
-
-sub calcv {
- my $safeeval=shift;
+sub calc {
%v=();
+ &sett();
my $notfinished=1;
my $depth=0;
while ($notfinished) {
$notfinished=0;
map {
my $old=$v{$_};
- $v{$_}=$safeeval->reval($t{$_});
+ $v{$_}=eval($t{$_});
if ($@) {
%v=();
return $@;
@@ -261,11 +274,168 @@ sub calcv {
return '';
}
-# ------------------------------------------------------------ Read spreadsheet
+sub outrow {
+ my $n=shift;
+ my @cols=();
+ if ($n) {
+ $cols[0]=$rl{$f{'A'.$n}};
+ } else {
+ $cols[0]='Export';
+ }
+ map {
+ my $fm=$f{$_.$n};
+ $fm=~s/[\'\"]/\&\#34;/g;
+ $cols[$#cols+1]="'$_$n','$fm'".'___eq___'.$v{$_.$n};
+ } ('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');
+ return @cols;
+}
-sub readf {
- my $fn=shift;
- %f=();
+# ------------------------------------------- End of "Inside of the safe space"
+ENDDEFS
+ $safeeval->reval($code);
+ return $safeeval;
+}
+
+# ------------------------------------------------ Add or change formula values
+
+sub setformulas {
+ my ($safeeval,@f)=@_;
+ $safeeval->reval('%f='."('".join("','",@f)."');");
+}
+
+# ------------------------------------------------ Add or change formula values
+
+sub setconstants {
+ my ($safeeval,@c)=@_;
+ $safeeval->reval('%c='."('".join("','",@c)."');");
+}
+
+# ------------------------------------------------ Add or change formula values
+
+sub setrowlabels {
+ my ($safeeval,@rl)=@_;
+ $safeeval->reval('%rl='."('".join("','",@rl)."');");
+}
+
+# ------------------------------------------------------- Calculate spreadsheet
+
+sub calcsheet {
+ my $safeeval=shift;
+ $safeeval->reval('&calc();');
+}
+
+# ------------------------------------------------------------------ Get values
+
+sub getvalues {
+ my $safeeval=shift;
+ return $safeeval->reval('%v');
+}
+
+# ---------------------------------------------------------------- Get formulas
+
+sub getformulas {
+ my $safeeval=shift;
+ 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 {
+ my ($safeeval,$row)=@_;
+ $safeeval->reval('$maxrow='.$row.';');
+}
+
+# ------------------------------------------------------------------ Get maxrow
+
+sub getmaxrow {
+ my $safeeval=shift;
+ return $safeeval->reval('$maxrow');
+}
+
+# ---------------------------------------------------------------- Set filename
+
+sub setfilename {
+ my ($safeeval,$fn)=@_;
+ $safeeval->reval('$filename='.$fn.';');
+}
+
+# ---------------------------------------------------------------- Get filename
+
+sub getfilename {
+ my $safeeval=shift;
+ return $safeeval->reval('$filename');
+}
+
+# ========================================================== End of Spreadsheet
+# =============================================================================
+
+
+# --------------------------------------------- Produce output row n from sheet
+
+sub rown {
+ my ($safeeval,$n)=@_;
+ my $rowdata="\n
$n | ";
+ my $showf=0;
+ map {
+ my ($fm,$vl)=split(/\_\_\_eq\_\_\_/,$_);
+ if ($showf==0) { $vl=$_; }
+ if ($showf>1) {
+ if ($vl eq '') {
+ $vl='#';
+ }
+ $rowdata.=
+ ''.$vl.
+ ' | ';
+ } else {
+ $rowdata.=' '.$vl.' | ';
+ }
+ $showf++;
+ } $safeeval->reval('&outrow('.$n.')');
+ return $rowdata.'
';
+}
+
+# ------------------------------------------------------------- Print out sheet
+
+sub outsheet {
+ my $safeeval=shift;
+ my $tabledata=' | ';
+ map {
+ $tabledata.="$_ | ";
+ } ('A
Import','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');
+ $tabledata.='
';
+ my $row;
+ my $maxrow=&getmaxrow($safeeval);
+ for ($row=0;$row<=$maxrow;$row++) {
+ $tabledata.=&rown($safeeval,$row);
+ }
+ $tabledata.='
';
+}
+
+
+
+# --------------------------------------- Read spreadsheet formulas from a file
+
+sub readsheet {
+ my ($safeeval,$fn)=shift;
+ &setfilename($safeeval,$fn);
+ $fn=~/\.(\w+)/;
+ &settype($safeeval,$1);
+ my %f=();
my $content;
{
my $fh=Apache::File->new($fn);
@@ -283,6 +453,7 @@ sub readf {
}
}
}
+ &setformulas($safeeval,%f);
}
# --------------------------------------------------------------- Read metadata
@@ -312,28 +483,135 @@ sub readmeta {
return %returnhash;
}
+# ----------------------------------------------------------------- Update rows
-# ------------------------------------------------------------ Returns safeeval
+sub updaterows {
+ my $safeeval=shift;
+ my %bighash;
+# -------------------------------------------------------------------- Tie hash
+ if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
+ &GDBM_READER,0640)) {
+# --------------------------------------------------------- Get all assessments
-sub init {
+ my %allkeys=();
+ my %allassess=();
- %v=();
- %t=();
- %f=();
- my $safeeval = new Safe;
- my $safehole = new Safe::Hole;
- $safeeval->permit("entereval");
- $safeeval->permit(":base_math");
- $safeeval->permit("sort");
- $safeeval->deny(":base_io");
- $safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT');
- $safeeval->share('%v','%t','%f');
- &deffunc($safeeval);
+ my $stype=&gettype($safeeval);
- return $safeeval;
+ map {
+ if ($_=~/^src\_(\d+)\.(\d+)$/) {
+ my $mapid=$1;
+ my $resid=$2;
+ my $id=$mapid.'.'.$resid;
+ my $srcf=$bighash{$_};
+ if ($srcf=~/\.(problem|exam|quiz|assess|survey|form)$/) {
+ my $symb=
+ &Apache::lonnet::declutter($bighash{'map_id_'.$mapid}).
+ '___'.$resid.'___'.
+ &Apache::lonnet::declutter($srcf);
+ $allassess{$symb}=$bighash{'title_'.$id};
+ if ($stype eq 'assesscalc') {
+ map {
+ if ($_=~/^stores\_(.*)/) {
+ my $key=$_;
+ my $display=
+ &Apache::lonnet::metadata($srcf,$key.'.display');
+ unless ($display) {
+ $display=
+ &Apache::lonnet::metadata($srcf,$key.'.name');
+ }
+ $allkeys{$key}=$display;
+ }
+ } split(/\,/,&Apache::lonnet::metadata($srcf,'keys'));
+ }
+ }
+ }
+ } keys %bighash;
+ untie(%bighash);
+
+#
+# %allkeys has a list of storage 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;
+ }
+
+ my $maxrow=0;
+ my %existing=();
+
+# ----------------------------------------------------------- Now obsolete rows
+ map {
+ if ($_=~/^A(\d+)/) {
+ $maxrow=($1>$maxrow)?$1:$maxrow;
+ $existing{$f{$_}}=1;
+ unless (defined($current{$f{$_}})) {
+ $f{$_}='!!! Obsolete';
+ $changed=1;
+ }
+ }
+ } keys %f;
+
+# -------------------------------------------------------- New and unknown keys
+
+ map {
+ unless ($existing{$_}) {
+ $changed=1;
+ $maxrow++;
+ $f{'A'.$maxrow}=$_;
+ }
+ } keys %current;
+
+ if ($changed) { &setformulas($safeeval,%f); }
+
+ &setmaxrow($safeeval,$maxrow);
+ &setrowlabels($safeeval,%current);
+
+ } else {
+ return 'Could not access course data';
+ }
+}
+
+# ------------------------------------------------ Load data for one assessment
+
+sub rowaassess {
+ my ($safeeval,$uname,$udom,$symb)=@_;
+ my $uhome=&Apache::lonnet::homeserver($uname,$udom);
+ my $namespace;
+ unless ($namespace=$ENV{'request.course.id'}) { return ''; }
+ my $answer=reply("restore:$udom:$uname:$namespace:$symb",$uhome);
+ my %returnhash=();
+ map {
+ my ($name,$value)=split(/\=/,$_);
+ $returnhash{&unescape($name)}=&unescape($value);
+ } split(/\&/,$answer);
+ my $version;
+ for ($version=1;$version<=$returnhash{'version'};$version++) {
+ map {
+ $returnhash{$_}=$returnhash{$version.':'.$_};
+ } split(/\:/,$returnhash{$version.':keys'});
+ }
+
+ my %c=();
+ my %f=&getformulas($safeeval);
+ map {
+ if ($_=~/^A/) {
+ unless ($f{$_}=~/^\!/) {
+ $c{$_}=$returnhash{$f{$_}};
+ }
+ }
+ } keys %f;
+ &setconstants($safeeval,%c);
}
-# -----------------------------------------------------------------------------
sub handler {
@@ -345,32 +623,19 @@ sub handler {
$r->print('LON-CAPA Spreadsheet');
$r->print('');
- my $safeeval=init();
-
- $f{'A3'}=5;
- $f{'A4'}=3;
- $f{'A5'}=8;
- $f{'E100'}=5;
- $f{'C3'}='A3+6';
- $f{'B4'}='8+int(C3/3)';
- $f{'C7'}='A3+B4';
- $f{'G8'}='MEAN("E*")';
- $f{'G5'}='A3+SUMMIN(2,"A*")';
- $f{'G6'}='A3+SUM("A*")';
- $f{'G7'}='STDDEV("A*")';
- $f{'G9'}='NUM("G*")';
- $f{'H10'}='MEAN("E*")';
- $f{'G10'}='BIN(3,5,"A*")';
- &sett();
- $r->print(&calcv($safeeval)."\n");
- $r->print($v{'C7'}."\n");
- $r->print($t{'G5'}.' - '.$v{'G5'}."\n");
- $r->print($t{'G6'}.' - '.$v{'G6'}."\n");
- $r->print($t{'G7'}.' - '.$v{'G7'}."\n");
- $r->print($t{'G8'}.' - '.$v{'G8'}."\n");
- $r->print($t{'G9'}.' - '.$v{'G9'}."\n");
- $r->print($t{'G10'}.' - '.$v{'G10'}."\n");
-
+ my $sheetone=initsheet();
+ &setformulas($sheetone,
+ 'B3' => 5, 'C4' => 6, 'C6' => 'B3+C4', 'C2' => 'C6+B5', 'B5'=>'&SUM("A*")',
+ 'A1' => 'a1', 'A2'=>'a2', 'A3'=>'a3','A4'=>'a4','A5'=>'a5','A6'=>'a6');
+ &setrowlabels($sheetone,
+ 'a1'=>'A Points','a2'=>'B Points','a3'=>'C Points',
+ 'a4'=>'Percentage Correct','a5'=>'Bonus Points','a6'=>'Points Awarded');
+ &setconstants($sheetone,
+ 'A1' => '3', 'A2'=>'4', 'A3'=>'0','A4'=>'76','A5'=>'1.5','A6'=>'6');
+
+ &setmaxrow($sheetone,6);
+ &calcsheet($sheetone);
+ $r->print(&outsheet($sheetone));
$r->print('');
return OK;
}