';
+ } else {
+ $tabledata='| '. + ''.$realm.' | '. 'Import | '. - 'Calculations | |
|---|---|---|---|
| '; - } else { - $tabledata.=' | '; + my $showf=0; + foreach ('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') { + $showf++; + if ($showf<=$maxred) { + $tabledata.=' | '; + } else { + $tabledata.=' | '; + } + $tabledata.="$_ | "; } - $tabledata.="$_"; + $tabledata.='
\n"); - $r->rflush(); - $r->print('
| '.$what.' | '); - foreach ('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') { - $r->print(''.$_.' | '); + my $thisrow=&rown($safeeval,$sortidx[$row]+1,$sheetdata); + if ($thisrow) { + if (($n/25==int($n/25)) && (!$ENV{'form.showcsv'})) { + $r->print("
\n"); + $r->rflush(); + $r->print('
| '.$what.' | '); + $r->print(''. + join(' | ', + (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZ'. + 'abcdefghijklmnopqrstuvwxyz'))). + " |
$sheetxml"; - if ($sheetxml == -1) { - $sheetxml='
";
- foreach (sort( keys(%f))) {
- print "$_ = $f{$_}\n";
- }
- print "";
- } else {
- my $sheet='';
- my %tmphash = &Apache::lonnet::dump($fn,$cdom,$cnum);
- my ($tmp) = keys(%tmphash);
- unless ($tmp =~ /^(con_lost|error|no_such_host)/i) {
- foreach (keys(%tmphash)) {
- $f{$_}=$tmphash{$_};
- }
- }
- }
-# --------------------------------------------------------------- Cache and set
- $spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f);
- &setformulas($safeeval,%f);
+ my ($safeeval,$sheetdata,$fn)=@_;
+ #
+ my $stype = $sheetdata->{'sheettype'};
+ my $cnum = $sheetdata->{'cnum'};
+ my $cdom = $sheetdata->{'cdom'};
+ my $chome = $sheetdata->{'chome'};
+ #
+ if (! defined($fn)) {
+ # There is no filename. Look for defaults in course and global, cache
+ unless ($fn=$defaultsheets{$cnum.'_'.$cdom.'_'.$stype}) {
+ my %tmphash = &Apache::lonnet::get('environment',
+ ['spreadsheet_default_'.$stype],
+ $cdom,$cnum);
+ my ($tmp) = keys(%tmphash);
+ if ($tmp =~ /^(con_lost|error|no_such_host)/i) {
+ $fn = 'default_'.$stype;
+ } else {
+ $fn = $tmphash{'spreadsheet_default_'.$stype};
+ }
+ unless (($fn) && ($fn!~/^error\:/)) {
+ $fn='default_'.$stype;
+ }
+ $defaultsheets{$cnum.'_'.$cdom.'_'.$stype}=$fn;
+ }
+ }
+ # $fn now has a value
+ $sheetdata->{'filename'} = $fn;
+ # see if sheet is cached
+ my $fstring='';
+ if ($fstring=$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}) {
+ &setformulas($safeeval,split(/\_\_\_\;\_\_\_/,$fstring));
+ } else {
+ # Not cached, need to read
+ my %f=();
+ if ($fn=~/^default\_/) {
+ my $sheetxml='';
+ my $fh;
+ my $dfn=$fn;
+ $dfn=~s/\_/\./g;
+ if ($fh=Apache::File->new($includedir.'/'.$dfn)) {
+ $sheetxml=join('',<$fh>);
+ } else {
+ $sheetxml=''; - foreach ( split(/\&/,$reply)) { - $rowlabel.=&Apache::lonnet::unescape($_).' '; - } - $rowlabel.=''; - } else { - $rowlabel=$ssec.'","'.$reply{$sname}.'"'; - my $ncount=0; - foreach (split(/\&/,$reply)) { - $rowlabel.=',"'.&Apache::lonnet::unescape($_).'"'; - $ncount++; - } - unless ($ncount==4) { $rowlabel.=',""'; } - $rowlabel=~s/\"$//; - } - } - $currentlist{&Apache::lonnet::unescape($name)}=$rowlabel; - } - } # end of foreach (split(/\&/,$classlst)) -# -# -------------------- Find discrepancies between the course row table and this -# - my %f=&getformulas($safeeval); - my $changed=0; - - my $maxrow=0; - my %existing=(); - -# ----------------------------------------------------------- Now obsolete rows - foreach (keys(%f)) { - if ($_=~/^A(\d+)/) { - $maxrow=($1>$maxrow)?$1:$maxrow; - $existing{$f{$_}}=1; - unless ((defined($currentlist{$f{$_}})) || (!$1)) { - $f{$_}='!!! Obsolete'; - $changed=1; - } + foreach my $student (keys(%$classlist)) { + my ($studentDomain,$studentName,$end,$start,$id,$studentSection, + $fullname,$status) = @{$classlist->{$student}}; + if ($ENV{'form.Status'} eq $status || $ENV{'form.Status'} eq 'Any') { + my $rowlabel=''; + if ($ENV{'form.showcsv'}) { + $rowlabel= '"'.join('","',($studentName,$studentDomain, + $fullname,$studentSection,$id).'"'); + } else { + $rowlabel=''; + $rowlabel.=$studentSection.' '.$id." ".$fullname; + $rowlabel.=''; } + $currentlist{$student}=$rowlabel; } - -# -------------------------------------------------------- New and unknown keys - - foreach (sort keys(%currentlist)) { - unless ($existing{$_}) { - $changed=1; - $maxrow++; - $f{'A'.$maxrow}=$_; + } + # + # Find discrepancies between the course row table and this + # + my %f=&getformulas($safeeval); + my $changed=0; + # + my $maxrow=0; + my %existing=(); + # + # Now obsolete rows + foreach (keys(%f)) { + if ($_=~/^A(\d+)/) { + $maxrow=($1>$maxrow)?$1:$maxrow; + $existing{$f{$_}}=1; + unless ((defined($currentlist{$f{$_}})) || (!$1) || + ($f{$_}=~/^(\~\~\~|\-\-\-)/)) { + $f{$_}='!!! Obsolete'; + $changed=1; } } - - if ($changed) { &setformulas($safeeval,%f); } - - &setmaxrow($safeeval,$maxrow); - &setrowlabels($safeeval,%currentlist); - - } else { - return 'Could not access course data'; } + # + # New and unknown keys + foreach (sort keys(%currentlist)) { + unless ($existing{$_}) { + $changed=1; + $maxrow++; + $f{'A'.$maxrow}=$_; + } + } + if ($changed) { &setformulas($safeeval,%f); } + # + $sheetdata->{'maxrow'} = $maxrow; + &setrowlabels($safeeval,%currentlist); } # ----------------------------------- Update rows for student and assess sheets - sub updatestudentassesssheet { - my $safeeval=shift; + my ($safeeval,$sheetdata) = @_; my %bighash; - my $stype=&gettype($safeeval); + my $stype=$sheetdata->{'sheettype'}; + my $uname=$sheetdata->{'uname'}; + my $udom =$sheetdata->{'udom'}; my %current=(); - unless ($updatedata{$ENV{'request.course.fn'}.'_'.$stype}) { -# -------------------------------------------------------------------- Tie hash - if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db', - &GDBM_READER,0640)) { -# --------------------------------------------------------- Get all assessments - - my %allkeys=('timestamp' => + if ($updatedata + {$ENV{'request.course.fn'}.'_'.$stype.'_'.$uname.'_'.$udom}) { + %current=split(/\_\_\_\;\_\_\_/, + $updatedata{$ENV{'request.course.fn'}. + '_'.$stype.'_'.$uname.'_'.$udom}); + } else { + # Tie hash + tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db', + &GDBM_READER(),0640); + if (! tied(%bighash)) { + return 'Could not access course data'; + } + # Get all assessments + my %allkeys=('timestamp' => 'Timestamp of Last Transaction
timestamp', 'subnumber' => 'Number of Submissions
subnumber', @@ -1674,173 +1667,142 @@ sub updatestudentassesssheet { 'Number of Tutor Responses
tutornumber', 'totalpoints' => 'Total Points Granted
totalpoints'); - my $adduserstr=''; - if ((&getuname($safeeval) ne $ENV{'user.name'}) || - (&getudom($safeeval) ne $ENV{'user.domain'})) { - $adduserstr='&uname='.&getuname($safeeval). - '&udom='.&getudom($safeeval); - } - - my %allassess=('_feedback' => - 'Feedback', - '_evaluation' => - 'Evaluation', - '_tutoring' => - 'Tutoring', - '_discussion' => - 'Discussion' - ); - - foreach (keys(%bighash)) { - 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') { - foreach (split(/\,/, - &Apache::lonnet::metadata($srcf,'keys'))) { - if (($_=~/^stores\_(.*)/) || ($_=~/^parameter\_(.*)/)) { - my $key=$_; - my $display= - &Apache::lonnet::metadata($srcf,$key.'.display'); - unless ($display) { - $display.= - &Apache::lonnet::metadata($srcf,$key.'.name'); - } - $display.='
'.$key; - $allkeys{$key}=$display; - } - } # end of foreach - } - } - } + if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})){ + $adduserstr='&uname='.$uname.'&udom='.$udom; + } + my %allassess = + ('_feedback' =>'Feedback', + '_evaluation' =>'Evaluation', + '_tutoring' =>'Tutoring', + '_discussion' =>'Discussion' + ); + while (($_,undef) = each(%bighash)) { + next 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}.''; + next if ($stype ne 'assesscalc'); + foreach my $key (split(/\,/, + &Apache::lonnet::metadata($srcf,'keys') + )) { + next if ($key !~ /^(stores|parameter)_/); + my $display= + &Apache::lonnet::metadata($srcf,$key.'.display'); + unless ($display) { + $display.= + &Apache::lonnet::metadata($srcf,$key.'.name'); + } + $display.='
'.$key; + $allkeys{$key}=$display; + } # end of foreach + } } # end of foreach (keys(%bighash)) untie(%bighash); - -# -# %allkeys has a list of storage and parameter displays by unikey -# %allassess has a list of all resource displays by symb -# - + # + # %allkeys has a list of storage and parameter displays by unikey + # %allassess has a list of all resource displays by symb + # if ($stype eq 'assesscalc') { - %current=%allkeys; + %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}); + $updatedata{$ENV{'request.course.fn'}.'_'.$stype.'_'.$uname.'_'.$udom}= + join('___;___',%current); + # Get current from cache } -# -------------------- Find discrepancies between the course row table and this -# - my %f=&getformulas($safeeval); - my $changed=0; - - my $maxrow=0; - my %existing=(); - -# ----------------------------------------------------------- Now obsolete rows - foreach (keys(%f)) { - if ($_=~/^A(\d+)/) { - $maxrow=($1>$maxrow)?$1:$maxrow; - my ($usy,$ufn)=split(/\_\_\&\&\&\_\_/,$f{$_}); - $existing{$usy}=1; - unless ((defined($current{$usy})) || (!$1)) { - $f{$_}='!!! Obsolete'; - $changed=1; - } elsif ($ufn) { - $current{$usy} - =~s/assesscalc\?usymb\=/assesscalc\?ufn\=$ufn\&usymb\=/; - } - } - } - -# -------------------------------------------------------- New and unknown keys - - foreach (keys(%current)) { - unless ($existing{$_}) { - $changed=1; - $maxrow++; - $f{'A'.$maxrow}=$_; - } - } + # Find discrepancies between the course row table and this + # + my %f=&getformulas($safeeval); + my $changed=0; - if ($changed) { &setformulas($safeeval,%f); } - - &setmaxrow($safeeval,$maxrow); - &setrowlabels($safeeval,%current); - - undef %current; - undef %existing; + my $maxrow=0; + my %existing=(); + # Now obsolete rows + foreach (keys(%f)) { + next if ($_!~/^A(\d+)/); + $maxrow=($1>$maxrow)?$1:$maxrow; + my ($usy,$ufn)=split(/\_\_\&\&\&\_\_/,$f{$_}); + $existing{$usy}=1; + unless ((defined($current{$usy})) || (!$1) || + ($f{$_}=~/^(\~\~\~|\-\-\-)/)){ + $f{$_}='!!! Obsolete'; + $changed=1; + } elsif ($ufn) { + $current{$usy} + =~s/assesscalc\?usymb\=/assesscalc\?ufn\=$ufn\&usymb\=/; + } + } + # New and unknown keys + foreach (keys(%current)) { + unless ($existing{$_}) { + $changed=1; + $maxrow++; + $f{'A'.$maxrow}=$_; + } + } + if ($changed) { &setformulas($safeeval,%f); } + $sheetdata->{'maxrow'} = $maxrow; + &setrowlabels($safeeval,%current); + # + undef %current; + undef %existing; } # ------------------------------------------------ Load data for one assessment sub loadstudent { - my $safeeval=shift; + my ($safeeval,$sheetdata)=@_; 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\:/) { - foreach ( split(/\&/,$reply)) { - my ($name,$value)=split(/\=/,$_); - $cachedstores{&Apache::lonnet::unescape($name)}= - &Apache::lonnet::unescape($value); - } - } + $cachedassess=$sheetdata->{'uname'}.':'.$sheetdata->{'udom'}; + # Get ALL the student preformance data + my @tmp = &Apache::lonnet::dump($sheetdata->{'cid'}, + $sheetdata->{'udom'}, + $sheetdata->{'uname'}, + undef); + if ($tmp[0] !~ /^error:/) { + %cachedstores = @tmp; } + undef @tmp; + # my @assessdata=(); foreach (keys(%f)) { - if ($_=~/^A(\d+)/) { - my $row=$1; - unless (($f{$_}=~/^\!/) || ($row==0)) { - my ($usy,$ufn)=split(/\_\_\&\&\&\_\_/,$f{$_}); - @assessdata=&exportsheet(&getuname($safeeval), - &getudom($safeeval), - 'assesscalc',$usy,$ufn); - my $index=0; - foreach ('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') { - if ($assessdata[$index]) { - 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++; - } - } + next if ($_!~/^A(\d+)/); + my $row=$1; + next if (($f{$_}=~/^[\!\~\-]/) || ($row==0)); + my ($usy,$ufn)=split(/__&&&\__/,$f{$_}); + @assessdata=&exportsheet($sheetdata->{'uname'}, + $sheetdata->{'udom'}, + 'assesscalc',$usy,$ufn); + my $index=0; + foreach ('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') { + if ($assessdata[$index]) { + 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++; } } $cachedassess=''; @@ -1850,15 +1812,15 @@ sub loadstudent { } # --------------------------------------------------- Load data for one student - +# sub loadcourse { - my ($safeeval,$r)=@_; + my ($safeeval,$sheetdata,$r)=@_; my %c=(); my %f=&getformulas($safeeval); my $total=0; foreach (keys(%f)) { if ($_=~/^A(\d+)/) { - unless ($f{$_}=~/^\!/) { $total++; } + unless ($f{$_}=~/^[\!\~\-]/) { $total++; } } } my $now=0; @@ -1876,35 +1838,33 @@ sub loadcourse { ENDPOP $r->rflush(); foreach (keys(%f)) { - if ($_=~/^A(\d+)/) { - my $row=$1; - unless (($f{$_}=~/^\!/) || ($row==0)) { - my @studentdata=&exportsheet(split(/\:/,$f{$_}), - 'studentcalc'); - undef %userrdatas; - $now++; - $r->print(''); - $r->rflush(); - - my $index=0; - foreach ('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') { - if ($studentdata[$index]) { - 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++; - } - } + ' secs remaining";'); + $r->rflush(); + # + my $index=0; + foreach ('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') { + if ($studentdata[$index]) { + 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++; + } } } &setformulas($safeeval,%f); @@ -1914,155 +1874,125 @@ ENDPOP } # ------------------------------------------------ Load data for one assessment - +# sub loadassessment { - my $safeeval=shift; + my ($safeeval,$sheetdata)=@_; - my $uhome=&getuhome($safeeval); - my $uname=&getuname($safeeval); - my $udom=&getudom($safeeval); - my $symb=&getusymb($safeeval); - my $cid=&getcid($safeeval); - my $cnum=&getcnum($safeeval); - my $cdom=&getcdom($safeeval); - my $chome=&getchome($safeeval); + my $uhome = $sheetdata->{'uhome'}; + my $uname = $sheetdata->{'uname'}; + my $udom = $sheetdata->{'udom'}; + my $symb = $sheetdata->{'usymb'}; + my $cid = $sheetdata->{'cid'}; + my $cnum = $sheetdata->{'cnum'}; + my $cdom = $sheetdata->{'cdom'}; + my $chome = $sheetdata->{'chome'}; my $namespace; 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++) { - foreach (split(/\:/,$cachedstores{$scope.':keys:'.$symb})) { - $returnhash{$_}=$cachedstores{$scope.':'.$symb.':'.$_}; - } - } - - } else { -# -# restore individual -# - - my $answer=&Apache::lonnet::reply( - "restore:$udom:$uname:". - &Apache::lonnet::escape($namespace).":". - &Apache::lonnet::escape($symb),$uhome); - foreach (split(/\&/,$answer)) { - my ($name,$value)=split(/\=/,$_); - $returnhash{&Apache::lonnet::unescape($name)}= - &Apache::lonnet::unescape($value); - } - my $version; - for ($version=1;$version<=$returnhash{'version'};$version++) { - foreach (split(/\:/,$returnhash{$version.':keys'})) { - $returnhash{$_}=$returnhash{$version.':'.$_}; - } + # 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++) { + foreach (split(/\:/,$cachedstores{$scope.':keys:'.$symb})) { + $returnhash{$_}=$cachedstores{$scope.':'.$symb.':'.$_}; + } + } + } else { + # + # restore individual + # + %returnhash = &Apache::lonnet::restore($symb,$namespace,$udom,$uname); + for (my $version=1;$version<=$returnhash{'version'};$version++) { + foreach (split(/\:/,$returnhash{$version.':keys'})) { + $returnhash{$_}=$returnhash{$version.':'.$_}; + } + } } - } -# ----------------------------- returnhash now has all stores for this resource - -# --------- convert all "_" to "." to be able to use libraries, multiparts, etc - + # + # returnhash now has all stores for this resource + # convert all "_" to "." to be able to use libraries, multiparts, etc + # + # This is dumb. It is also necessary :( my @oldkeys=keys %returnhash; - - foreach (@oldkeys) { - my $name=$_; - my $value=$returnhash{$_}; - delete $returnhash{$_}; + # + foreach my $name (@oldkeys) { + my $value=$returnhash{$name}; + delete $returnhash{$name}; $name=~s/\_/\./g; $returnhash{$name}=$value; } - -# ---------------------------- initialize coursedata and userdata for this user + # initialize coursedata and userdata for this user undef %courseopt; undef %useropt; my $userprefix=$uname.'_'.$udom.'_'; unless ($uhome eq 'no_host') { -# -------------------------------------------------------------- Get coursedata - unless - ((time-$courserdatas{$cid.'.last_cache'})<240) { - my $reply=&Apache::lonnet::reply('dump:'.$cdom.':'.$cnum. - ':resourcedata',$chome); - if ($reply!~/^error\:/) { - $courserdatas{$cid}=$reply; + # Get coursedata + unless ((time-$courserdatas{$cid.'.last_cache'})<240) { + my %Tmp = &Apache::lonnet::dump('resourcedata',$cdom,$cnum); + $courserdatas{$cid}=\%Tmp; $courserdatas{$cid.'.last_cache'}=time; - } - } - foreach (split(/\&/,$courserdatas{$cid})) { - my ($name,$value)=split(/\=/,$_); - $courseopt{$userprefix.&Apache::lonnet::unescape($name)}= - &Apache::lonnet::unescape($value); - } -# --------------------------------------------------- Get userdata (if present) - unless - ((time-$userrdatas{$uname.'___'.$udom.'.last_cache'})<240) { - my $reply= - &Apache::lonnet::reply('dump:'.$udom.':'.$uname.':resourcedata',$uhome); - if ($reply!~/^error\:/) { - $userrdatas{$uname.'___'.$udom}=$reply; - $userrdatas{$uname.'___'.$udom.'.last_cache'}=time; - } - } - foreach (split(/\&/,$userrdatas{$uname.'___'.$udom})) { - my ($name,$value)=split(/\=/,$_); - $useropt{$userprefix.&Apache::lonnet::unescape($name)}= - &Apache::lonnet::unescape($value); - } + } + while (my ($name,$value) = each(%{$courserdatas{$cid}})) { + $courseopt{$userprefix.$name}=$value; + } + # Get userdata (if present) + unless ((time-$userrdatas{$uname.'@'.$udom.'.last_cache'})<240) { + my %Tmp = &Apache::lonnet::dump('resourcedata',$udom,$uname); + $userrdatas{$cid} = \%Tmp; + # Most of the time the user does not have a 'resourcedata.db' + # file. We need to cache that we got nothing instead of bothering + # with requesting it every time. + $userrdatas{$uname.'@'.$udom.'.last_cache'}=time; + } + while (my ($name,$value) = each(%{$userrdatas{$cid}})) { + $useropt{$userprefix.$name}=$value; + } } -# ----------------- now courseopt, useropt initialized for this user and course -# (used by parmval) - -# -# Load keys for this assessment only -# + # now courseopt, useropt initialized for this user and course + # (used by parmval) + # + # Load keys for this assessment only + # my %thisassess=(); my ($symap,$syid,$srcf)=split(/\_\_\_/,$symb); - foreach (split(/\,/,&Apache::lonnet::metadata($srcf,'keys'))) { $thisassess{$_}=1; } -# -# Load parameters -# - my %c=(); - - if (tie(%parmhash,'GDBM_File', - &getcfn($safeeval).'_parms.db',&GDBM_READER,0640)) { - my %f=&getformulas($safeeval); - foreach (keys(%f)) { - if ($_=~/^A/) { - unless ($f{$_}=~/^\!/) { - if ($f{$_}=~/^parameter/) { - if ($thisassess{$f{$_}}) { - my $val=&parmval($f{$_},$safeeval); - $c{$_}=$val; - $c{$f{$_}}=$val; - } - } else { - my $key=$f{$_}; - my $ckey=$key; - $key=~s/^stores\_/resource\./; - $key=~s/\_/\./g; - $c{$_}=$returnhash{$key}; - $c{$ckey}=$returnhash{$key}; - } - } + # + # Load parameters + # + my %c=(); + if (tie(%parmhash,'GDBM_File', + $sheetdata->{'coursefilename'}.'_parms.db',&GDBM_READER(),0640)) { + my %f=&getformulas($safeeval); + foreach (keys(%f)) { + next if ($_!~/^A/); + next if ($f{$_}=~/^[\!\~\-]/); + if ($f{$_}=~/^parameter/) { + if ($thisassess{$f{$_}}) { + my $val=&parmval($f{$_},$safeeval,$sheetdata); + $c{$_}=$val; + $c{$f{$_}}=$val; + } + } else { + my $key=$f{$_}; + my $ckey=$key; + $key=~s/^stores\_/resource\./; + $key=~s/\_/\./g; + $c{$_}=$returnhash{$key}; + $c{$ckey}=$returnhash{$key}; + } } + untie(%parmhash); } - untie(%parmhash); - } - &setconstants($safeeval,%c); + &setconstants($safeeval,%c); } # --------------------------------------------------------- Various form fields @@ -2070,7 +2000,7 @@ sub loadassessment { sub textfield { my ($title,$name,$value)=@_; return "\n
$title:
".
- '';
+ '';
}
sub hiddenfield {
@@ -2095,12 +2025,12 @@ sub selectbox {
#
sub updatesheet {
- my $safeeval=shift;
- my $stype=&gettype($safeeval);
+ my ($safeeval,$sheetdata)=@_;
+ my $stype=$sheetdata->{'sheettype'};
if ($stype eq 'classcalc') {
- return &updateclasssheet($safeeval);
+ return &updateclasssheet($safeeval,$sheetdata);
} else {
- return &updatestudentassesssheet($safeeval);
+ return &updatestudentassesssheet($safeeval,$sheetdata);
}
}
@@ -2110,14 +2040,14 @@ sub updatesheet {
#
sub loadrows {
- my ($safeeval,$r)=@_;
- my $stype=&gettype($safeeval);
+ my ($safeeval,$sheetdata,$r)=@_;
+ my $stype=$sheetdata->{'sheettype'};
if ($stype eq 'classcalc') {
- &loadcourse($safeeval,$r);
+ &loadcourse($safeeval,$sheetdata,$r);
} elsif ($stype eq 'studentcalc') {
- &loadstudent($safeeval);
+ &loadstudent($safeeval,$sheetdata);
} else {
- &loadassessment($safeeval);
+ &loadassessment($safeeval,$sheetdata);
}
}
@@ -2127,6 +2057,7 @@ sub checkthis {
my ($keyname,$time)=@_;
return ($time<$expiredates{$keyname});
}
+
sub forcedrecalc {
my ($uname,$udom,$stype,$usymb)=@_;
my $key=$uname.':'.$udom.':'.$stype.':'.$usymb;
@@ -2158,131 +2089,121 @@ sub forcedrecalc {
#
sub exportsheet {
- my ($uname,$udom,$stype,$usymb,$fn)=@_;
- my @exportarr=();
-
- if (($usymb=~/^\_(\w+)/) && (!$fn)) {
- $fn='default_'.$1;
- }
-
-#
-# Check if cached
-#
-
- my $key=$uname.':'.$udom.':'.$stype.':'.$usymb;
- my $found='';
-
- if ($oldsheets{$key}) {
- foreach (split(/\_\_\_\&\_\_\_/,$oldsheets{$key})) {
- my ($name,$value)=split(/\_\_\_\=\_\_\_/,$_);
- if ($name eq $fn) {
- $found=$value;
- }
- }
- }
-
- unless ($found) {
- &cachedssheets($uname,$udom,&Apache::lonnet::homeserver($uname,$udom));
- if ($oldsheets{$key}) {
- foreach (split(/\_\_\_\&\_\_\_/,$oldsheets{$key})) {
+ my ($uname,$udom,$stype,$usymb,$fn)=@_;
+ my @exportarr=();
+ if (($usymb=~/^\_(\w+)/) && (!$fn)) {
+ $fn='default_'.$1;
+ }
+ #
+ # Check if cached
+ #
+ my $key=$uname.':'.$udom.':'.$stype.':'.$usymb;
+ my $found='';
+ if ($oldsheets{$key}) {
+ foreach (split(/\_\_\_\&\_\_\_/,$oldsheets{$key})) {
my ($name,$value)=split(/\_\_\_\=\_\_\_/,$_);
if ($name eq $fn) {
- $found=$value;
+ $found=$value;
}
- }
- }
- }
-#
-# Check if still valid
-#
- if ($found) {
- if (&forcedrecalc($uname,$udom,$stype,$usymb)) {
- $found='';
- }
- }
-
- 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);
- @exportarr=&exportdata($thissheet);
-#
-# Store now
-#
- my $cid=$ENV{'request.course.id'};
- my $current='';
- if ($stype eq 'studentcalc') {
- $current=&Apache::lonnet::reply('get:'.
- $ENV{'course.'.$cid.'.domain'}.':'.
- $ENV{'course.'.$cid.'.num'}.
- ':nohist_calculatedsheets:'.
- &Apache::lonnet::escape($key),
- $ENV{'course.'.$cid.'.home'});
- } else {
- $current=&Apache::lonnet::reply('get:'.
- &getudom($thissheet).':'.
- &getuname($thissheet).
- ':nohist_calculatedsheets_'.
- $ENV{'request.course.id'}.':'.
- &Apache::lonnet::escape($key),
- &getuhome($thissheet));
-
+ }
}
- my %currentlystored=();
- unless ($current=~/^error\:/) {
- foreach (split(/\_\_\_\&\_\_\_/,&Apache::lonnet::unescape($current))) {
- my ($name,$value)=split(/\_\_\_\=\_\_\_/,$_);
- $currentlystored{$name}=$value;
- }
+ unless ($found) {
+ &cachedssheets($uname,$udom,&Apache::lonnet::homeserver($uname,$udom));
+ if ($oldsheets{$key}) {
+ foreach (split(/\_\_\_\&\_\_\_/,$oldsheets{$key})) {
+ my ($name,$value)=split(/\_\_\_\=\_\_\_/,$_);
+ if ($name eq $fn) {
+ $found=$value;
+ }
+ }
+ }
}
- $currentlystored{$fn}=join('___;___',@exportarr);
-
- my $newstore='';
- foreach (keys(%currentlystored)) {
- if ($newstore) { $newstore.='___&___'; }
- $newstore.=$_.'___=___'.$currentlystored{$_};
- }
- my $now=time;
- if ($stype eq 'studentcalc') {
- &Apache::lonnet::reply('put:'.
- $ENV{'course.'.$cid.'.domain'}.':'.
- $ENV{'course.'.$cid.'.num'}.
- ':nohist_calculatedsheets:'.
- &Apache::lonnet::escape($key).'='.
- &Apache::lonnet::escape($newstore).'&'.
- &Apache::lonnet::escape($key).'.time='.$now,
- $ENV{'course.'.$cid.'.home'});
- } else {
- &Apache::lonnet::reply('put:'.
- &getudom($thissheet).':'.
- &getuname($thissheet).
- ':nohist_calculatedsheets_'.
- $ENV{'request.course.id'}.':'.
- &Apache::lonnet::escape($key).'='.
- &Apache::lonnet::escape($newstore).'&'.
- &Apache::lonnet::escape($key).'.time='.$now,
- &getuhome($thissheet));
- }
- }
- return @exportarr;
+ #
+ # Check if still valid
+ #
+ if ($found) {
+ if (&forcedrecalc($uname,$udom,$stype,$usymb)) {
+ $found='';
+ }
+ }
+ if ($found) {
+ #
+ # Return what was cached
+ #
+ @exportarr=split(/\_\_\_\;\_\_\_/,$found);
+ } else {
+ #
+ # Not cached
+ #
+ my ($thissheet,$sheetdata)=&makenewsheet($uname,$udom,$stype,$usymb);
+ &readsheet($thissheet,$sheetdata,$fn);
+ &updatesheet($thissheet,$sheetdata);
+ &loadrows($thissheet,$sheetdata);
+ &calcsheet($thissheet);
+ @exportarr=&exportdata($thissheet);
+ #
+ # Store now
+ #
+ my $cid=$ENV{'request.course.id'};
+ my $current='';
+ if ($stype eq 'studentcalc') {
+ $current=&Apache::lonnet::reply('get:'.
+ $ENV{'course.'.$cid.'.domain'}.':'.
+ $ENV{'course.'.$cid.'.num'}.
+ ':nohist_calculatedsheets:'.
+ &Apache::lonnet::escape($key),
+ $ENV{'course.'.$cid.'.home'});
+ } else {
+ $current=&Apache::lonnet::reply('get:'.$sheetdata->{'udom'}.':'.
+ $sheetdata->{'uname'}.
+ ':nohist_calculatedsheets_'.
+ $ENV{'request.course.id'}.':'.
+ &Apache::lonnet::escape($key),
+ $sheetdata->{'uhome'});
+ }
+ my %currentlystored=();
+ unless ($current=~/^error\:/) {
+ foreach (split(/___&\___/,&Apache::lonnet::unescape($current))) {
+ my ($name,$value)=split(/___=___/,$_);
+ $currentlystored{$name}=$value;
+ }
+ }
+ $currentlystored{$fn}=join('___;___',@exportarr);
+ #
+ my $newstore='';
+ foreach (keys(%currentlystored)) {
+ if ($newstore) { $newstore.='___&___'; }
+ $newstore.=$_.'___=___'.$currentlystored{$_};
+ }
+ my $now=time;
+ if ($stype eq 'studentcalc') {
+ &Apache::lonnet::reply('put:'.
+ $ENV{'course.'.$cid.'.domain'}.':'.
+ $ENV{'course.'.$cid.'.num'}.
+ ':nohist_calculatedsheets:'.
+ &Apache::lonnet::escape($key).'='.
+ &Apache::lonnet::escape($newstore).'&'.
+ &Apache::lonnet::escape($key).'.time='.$now,
+ $ENV{'course.'.$cid.'.home'});
+ } else {
+ &Apache::lonnet::reply('put:'.
+ $sheetdata->{'udom'}.':'.
+ $sheetdata->{'uname'}.
+ ':nohist_calculatedsheets_'.
+ $ENV{'request.course.id'}.':'.
+ &Apache::lonnet::escape($key).'='.
+ &Apache::lonnet::escape($newstore).'&'.
+ &Apache::lonnet::escape($key).'.time='.$now,
+ $sheetdata->{'uhome'});
+ }
+ }
+ return @exportarr;
}
+
# ============================================================ Expiration Dates
#
# Load previously cached student spreadsheets for this course
#
-
sub expirationdates {
undef %expiredates;
my $cid=$ENV{'request.course.id'};
@@ -2355,78 +2276,76 @@ sub cachedssheets {
# Interactive call to screen
#
#
-
-
sub handler {
my $r=shift;
- if ($r->header_only) {
- $r->content_type('text/html');
- $r->send_http_header;
- return OK;
+ if (! exists($ENV{'form.Status'})) {
+ $ENV{'form.Status'} = 'Active';
}
-
-# ---------------------------------------------------- Global directory configs
-
-$includedir=$r->dir_config('lonIncludes');
-$tmpdir=$r->dir_config('lonDaemons').'/tmp/';
-
-# ----------------------------------------------------- Needs to be in a course
-
- if ($ENV{'request.course.fn'}) {
-
-# --------------------------- Get query string for limited number of parameters
-
- foreach (split(/&/,$ENV{'QUERY_STRING'})) {
- my ($name, $value) = split(/=/,$_);
- $value =~ tr/+/ /;
- $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
- if (($name eq 'uname') || ($name eq 'udom') ||
- ($name eq 'usymb') || ($name eq 'ufn')) {
- unless ($ENV{'form.'.$name}) {
- $ENV{'form.'.$name}=$value;
- }
- }
+ # Check this server
+ my $loaderror=&Apache::lonnet::overloaderror($r);
+ if ($loaderror) { return $loaderror; }
+ # Check the course homeserver
+ $loaderror= &Apache::lonnet::overloaderror($r,
+ $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
+ if ($loaderror) { return $loaderror; }
+
+ if ($r->header_only) {
+ $r->content_type('text/html');
+ $r->send_http_header;
+ return OK;
+ }
+ # Global directory configs
+ $includedir = $r->dir_config('lonIncludes');
+ $tmpdir = $r->dir_config('lonDaemons').'/tmp/';
+ # Needs to be in a course
+ if (! $ENV{'request.course.fn'}) {
+ # 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;
+ }
+ # Get query string for limited number of parameters
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['uname','udom','usymb','ufn']);
+ if ($ENV{'request.role'} =~ /^st\./) {
+ delete $ENV{'form.unewfield'} if (exists($ENV{'form.unewfield'}));
+ delete $ENV{'form.unewformula'} if (exists($ENV{'form.unewformula'}));
}
-
if (($ENV{'form.usymb'}=~/^\_(\w+)/) && (!$ENV{'form.ufn'})) {
- $ENV{'form.ufn'}='default_'.$1;
+ $ENV{'form.ufn'}='default_'.$1;
}
-
-# -------------------------------------- Interactive loading of specific sheet?
+ # Interactive loading of specific sheet?
if (($ENV{'form.load'}) && ($ENV{'form.loadthissheet'} ne 'Default')) {
- $ENV{'form.ufn'}=$ENV{'form.loadthissheet'};
+ $ENV{'form.ufn'}=$ENV{'form.loadthissheet'};
}
-# ------------------------------------------- Nothing there? Must be login user
-
+ #
+ # Determine the user name and domain for the sheet.
my $aname;
my $adom;
-
unless ($ENV{'form.uname'}) {
- $aname=$ENV{'user.name'};
+ $aname=$ENV{'user.name'};
$adom=$ENV{'user.domain'};
} else {
$aname=$ENV{'form.uname'};
$adom=$ENV{'form.udom'};
}
-
-# ------------------------------------------------------------------- Open page
-
+ #
+ # Open page
$r->content_type('text/html');
$r->header_out('Cache-control','no-cache');
$r->header_out('Pragma','no-cache');
$r->send_http_header;
-
-# --------------------------------------------------------------- Screen output
-
+ # Screen output
$r->print('
'.
- '