--- loncom/interface/Attic/lonspreadsheet.pm 2000/12/05 15:09:22 1.5 +++ loncom/interface/Attic/lonspreadsheet.pm 2000/12/09 19:14:20 1.10 @@ -1,17 +1,19 @@ # The LearningOnline Network with CAPA # Spreadsheet/Grades Display Handler # -# 11/11,11/15,11/27,12/04,12/05 Gerd Kortemeyer +# 11/11,11/15,11/27,12/04,12/05,12/06,12/07,12/08,12/09 Gerd Kortemeyer package Apache::lonspreadsheet; use strict; +use vars qw(%spreadsheets); use Safe; use Safe::Hole; use Opcode; use Apache::lonnet; -use Apache::Constants qw(:common); +use Apache::Constants qw(:common :http); use HTML::TokeParser; +use GDBM_File; # ============================================================================= # ===================================== Implements an instance of a spreadsheet @@ -31,31 +33,41 @@ sub initsheet { # 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)=@_; - $lower=~/([A-Z]|\*)(\d+|\*)/; + $lower=~/([A-Za-z]|\*)(\d+|\*)/; my $la=$1; my $ld=$2; - $upper=~/([A-Z]|\*)(\d+|\*)/; + $upper=~/([A-Za-z]|\*)(\d+|\*)/; my $ua=$1; my $ud=$2; my $alpha=''; my $num=''; if (($la eq '*') || ($ua eq '*')) { - $alpha='[A-Z]'; + $alpha='[A-Za-z]'; } else { - $alpha='['.$la.'-'.$ua.']'; + if (($la=~/[A-Z]/) && ($ua=~/[A-Z]/) || + ($la=~/[a-z]/) && ($ua=~/[a-z]/)) { + $alpha='['.$la.'-'.$ua.']'; + } else { + $alpha='['.$la.'-Za-'.$ua.']'; + } } if (($ld eq '*') || ($ud eq '*')) { @@ -77,11 +89,13 @@ sub mask { } else { my @lda=($ld=~m/\d/g); my @uda=($ud=~m/\d/g); - my $i; $j=0; - for ($i=0;$i<=$#lda;$i++) { + my $i; $j=0; $notdone=1; + for ($i=0;($i<=$#lda)&&($notdone);$i++) { if ($lda[$i]==$uda[$i]) { $num.=$lda[$i]; $j=$i; + } else { + $notdone=0; } } if ($j<$#lda-1) { @@ -99,7 +113,9 @@ sub mask { } $num.=')'; } else { - $num.='['.$lda[$#lda].'-'.$uda[$#uda].']'; + if ($lda[$#lda]!=$uda[$#uda]) { + $num.='['.$lda[$#lda].'-'.$uda[$#uda].']'; + } } } } @@ -230,9 +246,15 @@ 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-Za-z]\d+)/$1\$v\{\'$2\'\}/g; + } } } keys %f; } @@ -262,6 +284,25 @@ sub calc { return ''; } +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', + '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; +} + # ------------------------------------------- End of "Inside of the safe space" ENDDEFS $safeeval->reval($code); @@ -272,7 +313,21 @@ ENDDEFS sub setformulas { my ($safeeval,@f)=@_; - $safeeval->reval('%f=(%f,'."('".join("','",@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 @@ -309,15 +364,28 @@ sub gettype { my $safeeval=shift; return $safeeval->reval('$sheettype'); } +# ------------------------------------------------------------------ Set maxrow -# -------------------------------------------------------------------- Set type +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 type +# ---------------------------------------------------------------- Get filename sub getfilename { my $safeeval=shift; @@ -328,22 +396,76 @@ sub getfilename { # ============================================================================= +# --------------------------------------------- Produce output row n from sheet + +sub rown { + my ($safeeval,$n)=@_; + my $defaultbg=((($n-1)/5)==int(($n-1)/5))?'#E0E0':'#FFFF'; + my $rowdata="\n$n"; + my $showf=0; + map { + my $bgcolor=$defaultbg.((($showf-1)/5==int(($showf-1)/5))?'99':'DD'); + my ($fm,$vl)=split(/\_\_\_eq\_\_\_/,$_); + if ($showf==0) { $vl=$_; } + if ($showf<=1) { $bgcolor='#FFDDDD'; } + if (($n==0) && ($showf<=26)) { $bgcolor='#CCCCFF'; } + 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.=""; + } ('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', + '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'); + $tabledata.=''; + my $row; + my $maxrow=&getmaxrow($safeeval); + for ($row=0;$row<=$maxrow;$row++) { + $tabledata.=&rown($safeeval,$row); + } + $tabledata.='
 A Import$_
'; +} + + # --------------------------------------- Read spreadsheet formulas from a file sub readsheet { - my ($safeeval,$fn)=shift; + my ($safeeval,$fn)=@_; &setfilename($safeeval,$fn); $fn=~/\.(\w+)/; &settype($safeeval,$1); my %f=(); - my $content; - { - my $fh=Apache::File->new($fn); - $content=join('',<$fh>); + unless ($spreadsheets{$fn}) { + $spreadsheets{$fn}=''; + { + my $fh; + if ($fh=Apache::File->new($fn)) { + $spreadsheets{$fn}=join('',<$fh>); + } + } } { - my $parser=HTML::TokeParser->new(\$content); + my $parser=HTML::TokeParser->new(\$spreadsheets{$fn}); my $token; while ($token=$parser->get_token) { if ($token->[0] eq 'S') { @@ -357,6 +479,41 @@ sub readsheet { &setformulas($safeeval,%f); } +# ----------------------------------------------- Make a temp copy of the sheet + +sub tmpwrite { + my ($safeeval,$tmpdir,$uname,$udom,$symb)=@_; + my $fn=$uname.'_'.$udom.'_spreadsheet_'.&getfilename($safeeval); + $fn=~s/\W/\_/g; + $fn=$tmpdir.$fn.'.tmp'; + my $fh; + if ($fh=Apache::File->new('>'.$fn)) { + print $fh join("\n",&getformulas($safeeval)); + } +} + +# ---------------------------------------------------------- Read the temp copy + +sub tmpread { + my ($safeeval,$tmpdir,$uname,$udom,$symb,$nfield,$nform)=@_; + my $fn=$uname.'_'.$udom.'_spreadsheet_'.&getfilename($safeeval); + $fn=~s/\W/\_/g; + $fn=$tmpdir.$fn.'.tmp'; + my $fh; + my %fo=(); + if ($fh=Apache::File->new($fn)) { + my $name; + while ($name=<$fh>) { + chomp($name); + my $value=<$fh>; + chomp($value); + $fo{$name}=$value; + } + } + $fo{$nfield}=$nform; + &setformulas($safeeval,%fo); +} + # --------------------------------------------------------------- Read metadata sub readmeta { @@ -411,7 +568,8 @@ sub updaterows { '___'.$resid.'___'. &Apache::lonnet::declutter($srcf); $allassess{$symb}=$bighash{'title_'.$id}; - if ($stype eq 'assesssheet') { + + if ($stype eq 'assesscalc') { map { if ($_=~/^stores\_(.*)/) { my $key=$_; @@ -421,6 +579,8 @@ sub updaterows { $display= &Apache::lonnet::metadata($srcf,$key.'.name'); } + + $allkeys{$key}=$display; } } split(/\,/,&Apache::lonnet::metadata($srcf,'keys')); @@ -437,45 +597,196 @@ sub updaterows { # -------------------- 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/) { - if ($stype eq 'assesssheet') { - } elsif ($stype eq 'coursesheet') { + if ($_=~/^A(\d+)/) { + $maxrow=($1>$maxrow)?$1:$maxrow; + $existing{$f{$_}}=1; + unless (defined($current{$f{$_}})) { + $f{$_}='!!! Obsolete'; + $changed=1; } } } keys %f; -# ------------------------------------------------ Find new and obsolete values + +# -------------------------------------------------------- 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 handler { +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); +} + +# --------------------------------------------------------- Various form fields + +sub textfield { + my ($title,$name,$value)=@_; + return "\n

$title:
". + ''; +} + +sub hiddenfield { + my ($name,$value)=@_; + return "\n".''; +} + +sub selectbox { + my ($title,$name,$value,%options)=@_; + my $selout="\n

$title:
".''; +} + +# ---------------------------------------------------------------- Main handler + +sub handler { my $r=shift; - $r->content_type('text/html'); - $r->send_http_header; + if ($r->header_only) { + $r->content_type('text/html'); + $r->send_http_header; + return OK; + } + +# ----------------------------------------------------- Needs to be in a course + + if (($ENV{'request.course.fn'}) || + ($ENV{'request.state'} eq 'construct')) { + +# --------------------------- Get query string for limited number of parameters + map { + 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')) { + unless ($ENV{'form.'.$name}) { + $ENV{'form.'.$name}=$value; + } + } + } (split(/&/,$ENV{'QUERY_STRING'})); - $r->print('LON-CAPA Spreadsheet'); - $r->print(''); - - my $sheetone=initsheet(); +# ------------------------------------------- Nothing there? Must be login user - &setformulas($sheetone,('A1' => '5', 'B2' => '6', 'C4' => 'A1+B2')); - $r->print(&calcsheet($sheetone)); - my %output=&getformulas($sheetone); - - $r->print('FORM:'.$output{'A1'}.' '.$output{'B2'}.' '.$output{'C4'}); + unless ($ENV{'form.uname'}) { + $ENV{'form.uname'}=$ENV{'user.name'}; + $ENV{'form.udom'}=$ENV{'user.domain'}; + } +# ------------------------------------------------------------------- Open page - my %output=&getvalues($sheetone); - - $r->print('
OUT:'.$output{'A1'}.' '.$output{'B2'}.' '.$output{'C4'}); + $r->content_type('text/html'); + $r->send_http_header; - $r->print(''); + $r->print('LON-CAPA Spreadsheet'); + $r->print(< + + function celledit(cn,cf) { + var cnf=prompt(cn,cf); + if (cnf!=null) { + document.sheet.unewfield.value=cn; + document.sheet.unewformula.value=cnf; + document.sheet.submit(); + } + } + + +ENDSCRIPT + $r->print(''. + '

'. + &hiddenfield('uname',$ENV{'form.uname'}). + &hiddenfield('udom',$ENV{'form.udom'}). + &hiddenfield('usymb',$ENV{'form.usymb'}). + &hiddenfield('unewfield',''). + &hiddenfield('unewformula','')); + my $sheetone=initsheet(); + if ($ENV{'form.unewfield'}) { + $r->print('

Modified Workcopy

'); + $ENV{'form.unewformula'}=~s/\'/\"/g; + $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.unewfield'},$ENV{'form.unewformula'}); + &setfilename($sheetone,$r->filename); + $r->filename=~/\.(\w+)/; + &settype($sheetone,$1); + } else { + &readsheet($sheetone,$r->filename); + } + &updaterows($sheetone); + &tmpwrite($sheetone,$r->dir_config('lonDaemons').'/tmp/', + $ENV{'form.uname'},$ENV{'form.udom'},$ENV{'form.usymb'}); + &calcsheet($sheetone); + $r->print(&outsheet($sheetone)); + + $r->print('
'); + + } else { +# ----------------------------- Not in a course, or not allowed to modify parms + $ENV{'user.error.msg'}= + $r->uri.":opa:0:0:Cannot modify spreadsheet"; + return HTTP_NOT_ACCEPTABLE; + } return OK; }