--- loncom/interface/Attic/lonspreadsheet.pm 2000/12/09 19:14:20 1.10 +++ loncom/interface/Attic/lonspreadsheet.pm 2000/12/11 15:33:58 1.11 @@ -1,12 +1,11 @@ # The LearningOnline Network with CAPA # Spreadsheet/Grades Display Handler # -# 11/11,11/15,11/27,12/04,12/05,12/06,12/07,12/08,12/09 Gerd Kortemeyer +# 11/11,11/15,11/27,12/04,12/05,12/06,12/07,12/08,12/09,12/11 Gerd Kortemeyer package Apache::lonspreadsheet; use strict; -use vars qw(%spreadsheets); use Safe; use Safe::Hole; use Opcode; @@ -15,6 +14,22 @@ use Apache::Constants qw(:common :http); use HTML::TokeParser; use GDBM_File; +# +# These cache hashes need to be independent of user, resource and course +# (user and course are in the keys) +# +use vars qw(%spreadsheets %courserdatas %userrdatas); +# +# These global hashes are dependent on user, course and resource, +# and need to be initialized every time when a sheet is calculated +# +my %courseopt; +my %useropt; +my %parmhash; +my $csec; +my $uname; +my $udom; + # ============================================================================= # ===================================== Implements an instance of a spreadsheet @@ -355,7 +370,7 @@ sub getformulas { sub settype { my ($safeeval,$type)=@_; - $safeeval->reval('$sheettype='.$type.';'); + $safeeval->reval('$sheettype="'.$type.'";'); } # -------------------------------------------------------------------- Get type @@ -382,7 +397,7 @@ sub getmaxrow { sub setfilename { my ($safeeval,$fn)=@_; - $safeeval->reval('$filename='.$fn.';'); + $safeeval->reval('$filename="'.$fn.'";'); } # ---------------------------------------------------------------- Get filename @@ -482,7 +497,7 @@ sub readsheet { # ----------------------------------------------- Make a temp copy of the sheet sub tmpwrite { - my ($safeeval,$tmpdir,$uname,$udom,$symb)=@_; + my ($safeeval,$tmpdir,$symb)=@_; my $fn=$uname.'_'.$udom.'_spreadsheet_'.&getfilename($safeeval); $fn=~s/\W/\_/g; $fn=$tmpdir.$fn.'.tmp'; @@ -495,7 +510,7 @@ sub tmpwrite { # ---------------------------------------------------------- Read the temp copy sub tmpread { - my ($safeeval,$tmpdir,$uname,$udom,$symb,$nfield,$nform)=@_; + my ($safeeval,$tmpdir,$symb,$nfield,$nform)=@_; my $fn=$uname.'_'.$udom.'_spreadsheet_'.&getfilename($safeeval); $fn=~s/\W/\_/g; $fn=$tmpdir.$fn.'.tmp'; @@ -541,6 +556,79 @@ sub readmeta { return %returnhash; } +# ================================================================== Parameters +# -------------------------------------------- Figure out a cascading parameter + +sub parmval { + my ($what,$symb)=@_; + + unless ($symb) { return ''; } + my $result=''; + + my ($mapname,$id,$fn)=split(/\_\_\_/,$symb); +# ----------------------------------------------------- Cascading lookup scheme + + my $symbparm=$symb.'.'.$what; + my $mapparm=$mapname.'___(all).'.$what; + + my $seclevel= + $ENV{'request.course.id'}.'.['. + $csec.'].'.$what; + my $seclevelr= + $ENV{'request.course.id'}.'.['. + $csec.'].'.$symbparm; + my $seclevelm= + $ENV{'request.course.id'}.'.['. + $csec.'].'.$mapparm; + + my $courselevel= + $ENV{'request.course.id'}.'.'.$what; + my $courselevelr= + $ENV{'request.course.id'}.'.'.$symbparm; + my $courselevelm= + $ENV{'request.course.id'}.'.'.$mapparm; +# ---------------------------------------------------------- fourth, check user + + if ($uname) { + + if ($useropt{$courselevelr}) { return $useropt{$courselevelr}; } + + if ($useropt{$courselevelm}) { return $useropt{$courselevelm}; } + + if ($useropt{$courselevel}) { return $useropt{$courselevel}; } + + } + +# --------------------------------------------------------- third, check course + + if ($csec) { + + if ($courseopt{$seclevelr}) { return $courseopt{$seclevelr}; } + + if ($courseopt{$seclevelm}) { return $courseopt{$seclevelm}; } + + if ($courseopt{$seclevel}) { return $courseopt{$seclevel}; } + + } + + if ($courseopt{$courselevelr}) { return $courseopt{$courselevelr}; } + + if ($courseopt{$courselevelm}) { return $courseopt{$courselevelm}; } + + if ($courseopt{$courselevel}) { return $courseopt{$courselevel}; } + +# ----------------------------------------------------- second, check map parms + + my $thisparm=$parmhash{$symbparm}; + if ($thisparm) { return $thisparm; } + +# -------------------------------------------------------- first, check default + + return &Apache::lonnet::metadata($fn,$what.'.default'); + +} + + # ----------------------------------------------------------------- Update rows sub updaterows { @@ -571,7 +659,7 @@ sub updaterows { if ($stype eq 'assesscalc') { map { - if ($_=~/^stores\_(.*)/) { + if (($_=~/^stores\_(.*)/) || ($_=~/^parameter\_(.*)/)) { my $key=$_; my $display= &Apache::lonnet::metadata($srcf,$key.'.display'); @@ -579,8 +667,6 @@ sub updaterows { $display= &Apache::lonnet::metadata($srcf,$key.'.name'); } - - $allkeys{$key}=$display; } } split(/\,/,&Apache::lonnet::metadata($srcf,'keys')); @@ -591,7 +677,7 @@ sub updaterows { untie(%bighash); # -# %allkeys has a list of storage displays by unikey +# %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 @@ -644,15 +730,19 @@ sub updaterows { # ------------------------------------------------ Load data for one assessment sub rowaassess { - my ($safeeval,$uname,$udom,$symb)=@_; + my ($safeeval,$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); + +# ----------------------------------------------------------- Get stored values + my $answer=&Apache::lonnet::reply( + "restore:$udom:$uname:$namespace:$symb",$uhome); my %returnhash=(); map { my ($name,$value)=split(/\=/,$_); - $returnhash{&unescape($name)}=&unescape($value); + $returnhash{&Apache::lonnet::unescape($name)}= + &Apache::lonnet::unescape($value); } split(/\&/,$answer); my $version; for ($version=1;$version<=$returnhash{'version'};$version++) { @@ -660,16 +750,58 @@ sub rowaassess { $returnhash{$_}=$returnhash{$version.':'.$_}; } split(/\:/,$returnhash{$version.':keys'}); } +# ----------------------------- returnhash now has all stores for this resource + +# ---------------------------- initialize coursedata and userdata for this user + %courseopt=(); + %useropt=(); + my $uhome=&Apache::lonnet::homeserver($uname,$udom); + unless ($uhome eq 'no_host') { +# -------------------------------------------------------------- Get coursedata + unless ($courserdatas{$ENV{'request.course.id'}}) { + 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'}); + if ($reply!~/^error\:/) { + $courserdatas{$ENV{'request.course.id'}}=$reply; + } + } + map { + my ($name,$value)=split(/\=/,$_); + $courseopt{&Apache::lonnet::unescape($name)}= + &Apache::lonnet::unescape($value); + } split(/\&/,$courserdatas{$ENV{'request.course.id'}}); +# --------------------------------------------------- Get userdata (if present) + unless ($userrdatas{$uname.'___'.$udom}) { + my $reply= + &Apache::lonnet::reply('dump:'.$udom.':'.$uname.':resourcedata',$uhome); + if ($reply!~/^error\:/) { + $userrdatas{$uname.'___'.$udom}=$reply; + } + } + map { + my ($name,$value)=split(/\=/,$_); + $useropt{&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=(); my %f=&getformulas($safeeval); map { if ($_=~/^A/) { unless ($f{$_}=~/^\!/) { - $c{$_}=$returnhash{$f{$_}}; - } + if ($f{$_}=~/^parameter/) { + $c{$_}=&parmval($f{$_},$symb); + } else { + $c{$_}=$returnhash{$f{$_}}; + } + } } } keys %f; + &setconstants($safeeval,%c); } @@ -702,6 +834,10 @@ sub selectbox { sub handler { my $r=shift; + $uname=''; + $udom=''; + $csec=''; + if ($r->header_only) { $r->content_type('text/html'); $r->send_http_header; @@ -718,7 +854,7 @@ sub handler { my ($name, $value) = split(/=/,$_); $value =~ tr/+/ /; $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; - if (($name='uname') || ($name='udom') || ($name='usymb')) { + if (($name eq 'uname') || ($name eq 'udom') || ($name eq 'usymb')) { unless ($ENV{'form.'.$name}) { $ENV{'form.'.$name}=$value; } @@ -728,12 +864,17 @@ sub handler { # ------------------------------------------- Nothing there? Must be login user unless ($ENV{'form.uname'}) { - $ENV{'form.uname'}=$ENV{'user.name'}; - $ENV{'form.udom'}=$ENV{'user.domain'}; + $uname=$ENV{'user.name'}; + $udom=$ENV{'user.domain'}; + } else { + $uname=$ENV{'form.uname'}; + $udom=$ENV{'form.udom'}; } # ------------------------------------------------------------------- Open page $r->content_type('text/html'); + $r->header_out('Cache-control','no-cache'); + $r->header_out('Pragma','no-cache'); $r->send_http_header; $r->print('LON-CAPA Spreadsheet'); @@ -765,17 +906,38 @@ ENDSCRIPT $r->print('New formula: '.$ENV{'form.unewfield'}.'='. $ENV{'form.unewformula'}.'
'); &tmpread($sheetone,$r->dir_config('lonDaemons').'/tmp/', - $ENV{'form.uname'},$ENV{'form.udom'},$ENV{'form.usymb'}, + $ENV{'form.usymb'}, $ENV{'form.unewfield'},$ENV{'form.unewformula'}); &setfilename($sheetone,$r->filename); $r->filename=~/\.(\w+)/; &settype($sheetone,$1); - } else { + } else { &readsheet($sheetone,$r->filename); } - &updaterows($sheetone); - &tmpwrite($sheetone,$r->dir_config('lonDaemons').'/tmp/', - $ENV{'form.uname'},$ENV{'form.udom'},$ENV{'form.usymb'}); + 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('

'. + "User '$uname' at domain '$udom' not a student in this course

"); + } + &updaterows($sheetone); + untie(%parmhash); + } else { + $r->print('

'. + 'Could not initialize import fields (not in a course)

'); + } + &tmpwrite($sheetone,$r->dir_config('lonDaemons').'/tmp/', + $ENV{'form.usymb'}); + $r->print("User '$uname' at domain '$udom' for '". + $ENV{'course.'.$ENV{'request.course.id'}.'.description'}."'"); + if ($csec) { + $r->print(", group/section '$csec'"); + } + $r->print("\n"); + if (&gettype($sheetone) eq 'assesscalc') { + &rowaassess($sheetone,$ENV{'form.usymb'}); + } &calcsheet($sheetone); $r->print(&outsheet($sheetone));