--- loncom/interface/Attic/lonspreadsheet.pm 2002/09/27 18:29:15 1.111
+++ loncom/interface/Attic/lonspreadsheet.pm 2002/10/22 13:09:49 1.120
@@ -1,5 +1,5 @@
#
-# $Id: lonspreadsheet.pm,v 1.111 2002/09/27 18:29:15 matthew Exp $
+# $Id: lonspreadsheet.pm,v 1.120 2002/10/22 13:09:49 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -61,6 +61,12 @@ use Apache::Constants qw(:common :http);
use GDBM_File;
use HTML::TokeParser;
use Apache::lonhtmlcommon;
+use Apache::loncoursedata;
+#
+# Caches for coursewide information
+#
+my %Section;
+
#
# Caches for previously calculated spreadsheets
#
@@ -111,60 +117,9 @@ my $tmpdir;
# =============================================================================
# ===================================== Implements an instance of a spreadsheet
-sub initsheet {
- my $safeeval = new Safe(shift);
- 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('$@');
- 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
-# os: other spreadsheets (for student spreadsheet only)
-
-undef %sheet_values;
-undef %t;
-undef %f;
-undef %c;
-undef %rowlabel;
-undef @os;
-
-$maxrow = 0;
-$sheettype = '';
-
-# filename/reference of the sheet
-$filename = '';
-
-# user data
-$uname = '';
-$uhome = '';
-$udom = '';
-
-# course data
-
-$csec = '';
-$chome= '';
-$cnum = '';
-$cdom = '';
-$cid = '';
-$coursefilename = '';
-
-# symb
-
-$usymb = '';
-
-# error messages
-$errormsg = '';
-
+##
+## mask - used to reside in the safe space.
+##
sub mask {
my ($lower,$upper)=@_;
@@ -188,7 +143,6 @@ sub mask {
$alpha='['.$la.'-Za-'.$ua.']';
}
}
-
if (($ld eq '*') || ($ud eq '*')) {
$num='\d+';
} else {
@@ -208,7 +162,9 @@ sub mask {
} else {
my @lda=($ld=~m/\d/g);
my @uda=($ud=~m/\d/g);
- my $i; $j=0; $notdone=1;
+ my $i;
+ my $j=0;
+ my $notdone=1;
for ($i=0;($i<=$#lda)&&($notdone);$i++) {
if ($lda[$i]==$uda[$i]) {
$num.=$lda[$i];
@@ -241,6 +197,82 @@ sub mask {
return '^'.$alpha.$num."\$";
}
+
+
+sub initsheet {
+ my $safeeval = new Safe(shift);
+ 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');
+ $safehole->wrap(\&Apache::lonspreadsheet::mask,$safeeval,'&mask');
+ $safehole->wrap(\&Apache::lonspreadsheet::templaterow,$safeeval,'&templaterow');
+ $safeeval->share('$@');
+ 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
+# os: other spreadsheets (for student spreadsheet only)
+
+undef %sheet_values; # Holds the (computed, final) values for the sheet
+ # This is only written to by &calc, the spreadsheet computation routine.
+ # It is read by many functions
+undef %t; # Holds the values of the spreadsheet temporarily. Set in &sett,
+ # which does the translation of strings like C5 into the value in C5.
+ # Used in &calc - %t holds the values that are actually eval'd.
+undef %f; # Holds the formulas for each cell. This is the users
+ # (spreadsheet authors) data for each cell.
+ # set by &setformulas and returned by &getformulas
+ # &setformulas is called by &readsheet, &tmpread, &updateclasssheet,
+ # &updatestudentassesssheet, &loadstudent, &loadcourse
+ # &getformulas is called by &writesheet, &tmpwrite, &updateclasssheet,
+ # &updatestudentassesssheet, &loadstudent, &loadcourse, &loadassessment,
+undef %c; # Holds the constants for a sheet. In the assessment
+ # sheets, this is the A column. Used in &MINPARM, &MAXPARM, &expandnamed,
+ # &sett, and &setconstants. There is no &getconstants.
+ # &setconstants is called by &loadstudent, &loadcourse, &load assessment,
+undef %rowlabel; # Holds the 'prefix' for each row. Set by &setrowlabels.
+ # &setrowlabels is called by &updateclasssheet, &updatestudentassesssheet,
+undef @os; # Holds the names of other spreadsheets - this is used to specify
+ # the spreadsheets that are available for the assessment sheet.
+ # Set by &setothersheets. &setothersheets is called by &handler. A
+ # related subroutine is &othersheets.
+
+$maxrow = 0;
+$sheettype = '';
+
+# filename/reference of the sheet
+$filename = '';
+
+# user data
+$uname = '';
+$uhome = '';
+$udom = '';
+
+# course data
+
+$csec = '';
+$chome= '';
+$cnum = '';
+$cdom = '';
+$cid = '';
+$coursefilename = '';
+
+# symb
+
+$usymb = '';
+
+# error messages
+$errormsg = '';
+
+
#-------------------------------------------------------
=item UWCALC(hashname,modules,units,date)
@@ -852,7 +884,7 @@ sub sett {
}
# Deal with the normal cells
foreach (keys(%f)) {
- if (($f{$_}) && ($_!~/template\_/)) {
+ if (exists($f{$_}) && ($_!~/template\_/)) {
my $matches=($_=~/^$pattern(\d+)/);
if (($matches) && ($1)) {
unless ($f{$_}=~/^\!/) {
@@ -913,45 +945,37 @@ sub calc {
return '';
}
-sub templaterow {
- my @cols=();
- $cols[0]='Template';
- 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') {
- my $fm=$f{'template_'.$_};
- $fm=~s/[\'\"]/\&\#34;/g;
- push(@cols,"'template_$_','$fm'".'___eq___'.$fm);
- }
- return @cols;
-}
-
#
# This is actually used for the student spreadsheet, not the assessment sheet
# Do not be fooled by the name!
#
sub outrowassess {
# $n is the current row number
- my $n=shift;
+ my $n=shift;
+ my $csv = shift;
my @cols=();
if ($n) {
my ($usy,$ufn)=split(/__&&&\__/,$f{'A'.$n});
if ($rowlabel{$usy}) {
- $cols[0]=$rowlabel{$usy}.'
'.
+ $cols[0]=$rowlabel{$usy};
+ if (! $csv) {
+ $cols[0].='
'.
'';
}
- $cols[0].='';
} else {
$cols[0]='Export';
}
@@ -994,178 +1018,80 @@ sub exportrowa {
return @exportarray;
}
+sub templaterow {
+ my @cols=();
+ $cols[0]='Template';
+ 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') {
+ my $fm=$f{'template_'.$_};
+ $fm=~s/[\'\"]/\&\#34;/g;
+ push(@cols,"'template_$_','$fm'".'___eq___'.$fm);
+ }
+ return @cols;
+}
+
+
# ------------------------------------------- End of "Inside of the safe space"
ENDDEFS
$safeeval->reval($code);
return $safeeval;
}
-# ------------------------------------------------ Add or change formula values
+# ------------------------------------------------ Add or change formula values
sub setformulas {
- my ($safeeval,%f)=@_;
- %{$safeeval->varglob('f')}=%f;
+ my ($sheet)=shift;
+ %{$sheet->{'safe'}->varglob('f')}=%{$sheet->{'f'}};
}
# ------------------------------------------------ Add or change formula values
-
sub setconstants {
- my ($safeeval,%c)=@_;
- %{$safeeval->varglob('c')}=%c;
+ my ($sheet)=shift;
+ return %{$sheet->{'safe'}->varglob('c')}=%{$sheet->{'constants'}};
}
# --------------------------------------------- Set names of other spreadsheets
-
sub setothersheets {
- my ($safeeval,@os)=@_;
- @{$safeeval->varglob('os')}=@os;
+ my $sheet = shift;
+ my @othersheets = @_;
+ $sheet->{'othersheets'} = \@othersheets;
+ @{$sheet->{'safe'}->varglob('os')}=@othersheets;
+ return;
}
# ------------------------------------------------ Add or change formula values
-
sub setrowlabels {
- my ($safeeval,%rowlabel)=@_;
- %{$safeeval->varglob('rowlabel')}=%rowlabel;
+ my $sheet=shift;
+ %{$sheet->{'safe'}->varglob('rowlabel')}=%{$sheet->{'rowlabel'}};
}
# ------------------------------------------------------- Calculate spreadsheet
-
sub calcsheet {
- my $safeeval=shift;
- return $safeeval->reval('&calc();');
-}
-
-# ------------------------------------------------------------------ Get values
-
-sub getvalues {
- my $safeeval=shift;
- return $safeeval->reval('%sheet_values');
+ my $sheet=shift;
+ my $result = $sheet->{'safe'}->reval('&calc();');
+ %{$sheet->{'values'}} = %{$sheet->{'safe'}->varglob('sheet_values')};
+ return $result;
}
# ---------------------------------------------------------------- Get formulas
-
sub getformulas {
- my $safeeval=shift;
- return %{$safeeval->varglob('f')};
+ my $sheet = shift;
+ return %{$sheet->{'safe'}->varglob('f')};
}
# ----------------------------------------------------- Get value of $f{'A'.$n}
-
sub getfa {
- my ($safeeval,$n)=@_;
- return $safeeval->reval('$f{"A'.$n.'"}');
-}
-
-# -------------------------------------------------------------------- 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');
-}
-
-# --------------------------------------------------------------- Get course ID
-
-sub getcid {
- my $safeeval=shift;
- return $safeeval->reval('$cid');
-}
-
-# --------------------------------------------------------- Get course filename
-
-sub getcoursefilename {
- my $safeeval=shift;
- return $safeeval->reval('$coursefilename');
-}
-
-# ----------------------------------------------------------- Get course number
-
-sub getcnum {
- my $safeeval=shift;
- return $safeeval->reval('$cnum');
-}
-
-# ------------------------------------------------------------- Get course home
-
-sub getchome {
- my $safeeval=shift;
- return $safeeval->reval('$chome');
-}
-
-# ----------------------------------------------------------- Get course domain
-
-sub getcdom {
- my $safeeval=shift;
- return $safeeval->reval('$cdom');
-}
-
-# ---------------------------------------------------------- Get course section
-
-sub getcsec {
- my $safeeval=shift;
- return $safeeval->reval('$csec');
-}
-
-# --------------------------------------------------------------- Get user name
-
-sub getuname {
- my $safeeval=shift;
- return $safeeval->reval('$uname');
-}
-
-# ------------------------------------------------------------- Get user domain
-
-sub getudom {
- my $safeeval=shift;
- return $safeeval->reval('$udom');
-}
-
-# --------------------------------------------------------------- Get user home
-
-sub getuhome {
- my $safeeval=shift;
- return $safeeval->reval('$uhome');
-}
-
-# -------------------------------------------------------------------- Get symb
-
-sub getusymb {
- my $safeeval=shift;
- return $safeeval->reval('$usymb');
+ my $sheet = shift;
+ my ($n)=@_;
+ return $sheet->{'safe'}->reval('$f{"A'.$n.'"}');
}
# ------------------------------------------------------------- Export of A-row
-
sub exportdata {
- my $safeeval=shift;
- return $safeeval->reval('&exportrowa()');
+ my $sheet=shift;
+ return $sheet->{'safe'}->reval('&exportrowa()');
}
@@ -1178,7 +1104,7 @@ sub exportdata {
# --------------------------------------------- Produce output row n from sheet
sub rown {
- my ($safeeval,$n)=@_;
+ my ($sheet,$n)=@_;
my $defaultbg;
my $rowdata='';
my $dataflag=0;
@@ -1195,7 +1121,7 @@ sub rown {
my $showf=0;
my $proc;
my $maxred=1;
- my $sheettype=&gettype($safeeval);
+ my $sheettype=$sheet->{'sheettype'};
if ($sheettype eq 'studentcalc') {
$proc='&outrowassess';
$maxred=26;
@@ -1207,13 +1133,13 @@ sub rown {
} else {
$maxred=26;
}
- if (&getfa($safeeval,$n)=~/^[\~\-]/) { $maxred=1; }
+ if (&getfa($sheet,$n)=~/^[\~\-]/) { $maxred=1; }
if ($n eq '-') {
$proc='&templaterow';
$n=-1;
$dataflag=1;
}
- foreach ($safeeval->reval($proc.'('.$n.')')) {
+ foreach ($sheet->{'safe'}->reval($proc.'('.$n.','.$ENV{'form.showcsv'}.')')) {
my $bgcolor=$defaultbg.((($showf-1)/5==int(($showf-1)/5))?'99':'DD');
my ($fm,$vl)=split(/\_\_\_eq\_\_\_/,$_);
if ((($vl ne '') || ($vl eq '0')) &&
@@ -1252,17 +1178,17 @@ sub rown {
# ------------------------------------------------------------- Print out sheet
sub outsheet {
- my ($r,$safeeval,$sheetdata)=@_;
+ my ($r,$sheet)=@_;
my $maxred = 26; # The maximum number of cells to show as
# red (uneditable)
# To make student sheets uneditable could we
# set $maxred = 52?
#
my $realm='Course'; # 'assessment', 'user', or 'course' sheet
- if ($sheetdata->{'sheettype'} eq 'assesscalc') {
+ if ($sheet->{'sheettype'} eq 'assesscalc') {
$maxred=1;
$realm='Assessment';
- } elsif ($sheetdata->{'sheettype'} eq 'studentcalc') {
+ } elsif ($sheet->{'sheettype'} eq 'studentcalc') {
$maxred=26;
$realm='User';
}
@@ -1291,34 +1217,34 @@ sub outsheet {
}
$tabledata.="$_";
}
- $tabledata.=''.&rown($safeeval,'-').&rown($safeeval,0);
+ $tabledata.=''.&rown($sheet,'-').
+ &rown($sheet,0);
}
$r->print($tabledata);
#
# Prepare to output rows
my $row;
- my $maxrow=&getmaxrow($safeeval);
#
my @sortby=();
my @sortidx=();
- for ($row=1;$row<=$maxrow;$row++) {
- push (@sortby, $safeeval->reval('$f{"A'.$row.'"}'));
+ for ($row=1;$row<=$sheet->{'maxrow'};$row++) {
+ push (@sortby, $sheet->{'safe'}->reval('$f{"A'.$row.'"}'));
push (@sortidx, $row-1);
}
@sortidx=sort { lc($sortby[$a]) cmp lc($sortby[$b]); } @sortidx;
#
# Determine the type of child spreadsheets
my $what='Student';
- if ($sheetdata->{'sheettype'} eq 'assesscalc') {
+ if ($sheet->{'sheettype'} eq 'assesscalc') {
$what='Item';
- } elsif ($sheetdata->{'sheettype'} eq 'studentcalc') {
+ } elsif ($sheet->{'sheettype'} eq 'studentcalc') {
$what='Assessment';
}
#
# Loop through the rows and output them one at a time
my $n=0;
- for ($row=0;$row<$maxrow;$row++) {
- my $thisrow=&rown($safeeval,$sortidx[$row]+1);
+ for ($row=0;$row<$sheet->{'maxrow'};$row++) {
+ my $thisrow=&rown($sheet,$sortidx[$row]+1);
if ($thisrow) {
if (($n/25==int($n/25)) && (!$ENV{'form.showcsv'})) {
$r->print("\n
\n");
@@ -1341,11 +1267,12 @@ sub outsheet {
# ----------------------------------------------- Read list of available sheets
#
sub othersheets {
- my ($safeeval,$stype)=@_;
+ my ($sheet,$stype)=@_;
+ $stype = $sheet->{'sheettype'} if (! defined($stype));
#
- my $cnum = &getcnum($safeeval);
- my $cdom = &getcdom($safeeval);
- my $chome = &getchome($safeeval);
+ my $cnum = $sheet->{'cnum'};
+ my $cdom = $sheet->{'cdom'};
+ my $chome = $sheet->{'chome'};
#
my @alternatives=();
my %results=&Apache::lonnet::dump($stype.'_spreadsheets',$cdom,$cnum);
@@ -1389,12 +1316,12 @@ sub parse_sheet {
# -------------------------------------- Read spreadsheet formulas for a course
#
sub readsheet {
- my ($safeeval,$sheetdata,$fn)=@_;
+ my ($sheet,$fn)=@_;
#
- my $stype = $sheetdata->{'sheettype'};
- my $cnum = $sheetdata->{'cnum'};
- my $cdom = $sheetdata->{'cdom'};
- my $chome = $sheetdata->{'chome'};
+ my $stype = $sheet->{'sheettype'};
+ my $cnum = $sheet->{'cnum'};
+ my $cdom = $sheet->{'cdom'};
+ my $chome = $sheet->{'chome'};
#
if (! defined($fn)) {
# There is no filename. Look for defaults in course and global, cache
@@ -1415,11 +1342,13 @@ sub readsheet {
}
}
# $fn now has a value
- &setfilename($safeeval,$fn);
+ $sheet->{'filename'} = $fn;
# see if sheet is cached
my $fstring='';
if ($fstring=$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}) {
- &setformulas($safeeval,split(/\_\_\_\;\_\_\_/,$fstring));
+ my %tmp = split(/___;___/,$fstring);
+ $sheet->{'f'} = \%tmp;
+ &setformulas($sheet);
} else {
# Not cached, need to read
my %f=();
@@ -1454,47 +1383,58 @@ sub readsheet {
}
# Cache and set
$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f);
- &setformulas($safeeval,%f);
+ $sheet->{'f'}=\%f;
+ &setformulas($sheet);
}
}
# -------------------------------------------------------- Make new spreadsheet
sub makenewsheet {
my ($uname,$udom,$stype,$usymb)=@_;
- my %sheetdata=();
- $sheetdata{'uname'} = $uname;
- $sheetdata{'udom'} = $udom;
- $sheetdata{'sheettype'} = $stype;
- $sheetdata{'usymb'} = $usymb;
- $sheetdata{'cid'} = $ENV{'request.course.id'};
- $sheetdata{'csec'} = &Apache::lonnet::usection
- ($udom,$uname,$ENV{'request.course.id'});
- $sheetdata{'coursefilename'} = $ENV{'request.course.fn'};
- $sheetdata{'cnum'} = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
- $sheetdata{'cdom'} = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
- $sheetdata{'chome'} = $ENV{'course.'.$ENV{'request.course.id'}.'.home'};
- $sheetdata{'uhome'} = &Apache::lonnet::homeserver($uname,$udom);
-
- my $safeeval=initsheet($stype);
+ my $sheet={};
+ $sheet->{'uname'} = $uname;
+ $sheet->{'udom'} = $udom;
+ $sheet->{'sheettype'} = $stype;
+ $sheet->{'usymb'} = $usymb;
+ $sheet->{'cid'} = $ENV{'request.course.id'};
+ $sheet->{'csec'} = $Section{$uname.':'.$udom};
+ $sheet->{'coursefilename'} = $ENV{'request.course.fn'};
+ $sheet->{'cnum'} = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+ $sheet->{'cdom'} = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+ $sheet->{'chome'} = $ENV{'course.'.$ENV{'request.course.id'}.'.home'};
+ $sheet->{'uhome'} = &Apache::lonnet::homeserver($uname,$udom);
+ #
+ #
+ $sheet->{'f'} = {};
+ $sheet->{'constants'} = {};
+ $sheet->{'othersheets'} = [];
+ $sheet->{'rowlabel'} = {};
+ #
+ #
+ $sheet->{'safe'}=&initsheet($sheet->{'sheettype'});
+ #
+ # Place all the %$sheet items into the safe space except the safe space
+ # itself
my $initstring = '';
- foreach (keys(%sheetdata)) {
- $initstring.= qq{\$$_="$sheetdata{$_}";};
+ foreach (qw/uname udom sheettype usymb cid csec coursefilename
+ cnum cdom chome uhome/) {
+ $initstring.= qq{\$$_="$sheet->{$_}";};
}
- $safeeval->reval($initstring);
- return $safeeval,\%sheetdata;
+ $sheet->{'safe'}->reval($initstring);
+ return $sheet;
}
# ------------------------------------------------------------ Save spreadsheet
sub writesheet {
- my ($safeeval,$makedef)=@_;
- my $cid=&getcid($safeeval);
+ my ($sheet,$makedef)=@_;
+ my $cid=$sheet->{'cid'};
if (&Apache::lonnet::allowed('opa',$cid)) {
- my %f=&getformulas($safeeval);
- my $stype=&gettype($safeeval);
- my $cnum=&getcnum($safeeval);
- my $cdom=&getcdom($safeeval);
- my $chome=&getchome($safeeval);
- my $fn=&getfilename($safeeval);
+ my %f=&getformulas($sheet);
+ my $stype= $sheet->{'sheettype'};
+ my $cnum = $sheet->{'cnum'};
+ my $cdom = $sheet->{'cdom'};
+ my $chome= $sheet->{'chome'};
+ my $fn = $sheet->{'filename'};
# Cache new sheet
$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f);
# Write sheet
@@ -1537,24 +1477,24 @@ sub writesheet {
# "Modified workcopy" - interactive only
#
sub tmpwrite {
- my $safeeval=shift;
+ my ($sheet) = @_;
my $fn=$ENV{'user.name'}.'_'.
- $ENV{'user.domain'}.'_spreadsheet_'.&getusymb($safeeval).'_'.
- &getfilename($safeeval);
+ $ENV{'user.domain'}.'_spreadsheet_'.$sheet->{'usymb'}.'_'.
+ $sheet->{'filename'};
$fn=~s/\W/\_/g;
$fn=$tmpdir.$fn.'.tmp';
my $fh;
if ($fh=Apache::File->new('>'.$fn)) {
- print $fh join("\n",&getformulas($safeeval));
+ print $fh join("\n",&getformulas($sheet));
}
}
# ---------------------------------------------------------- Read the temp copy
sub tmpread {
- my ($safeeval,$nfield,$nform)=@_;
+ my ($sheet,$nfield,$nform)=@_;
my $fn=$ENV{'user.name'}.'_'.
- $ENV{'user.domain'}.'_spreadsheet_'.&getusymb($safeeval).'_'.
- &getfilename($safeeval);
+ $ENV{'user.domain'}.'_spreadsheet_'.$sheet->{'usymb'}.'_'.
+ $sheet->{'filename'};
$fn=~s/\W/\_/g;
$fn=$tmpdir.$fn.'.tmp';
my $fh;
@@ -1590,7 +1530,8 @@ sub tmpread {
} else {
if ($nfield) { $fo{$nfield}=$nform; }
}
- &setformulas($safeeval,%fo);
+ $sheet->{'f'}=\%fo;
+ &setformulas($sheet);
}
##################################################
@@ -1602,7 +1543,7 @@ sub tmpread {
Determine the value of a parameter.
-Inputs: $what, the parameter needed, $safeeval, the safe space
+Inputs: $what, the parameter needed, $sheet, the safe space
Returns: The value of a parameter, or '' if none.
@@ -1618,14 +1559,14 @@ this user and course.
##################################################
##################################################
sub parmval {
- my ($what,$safeeval,$sheetdata)=@_;
- my $symb = $sheetdata->{'usymb'};
+ my ($what,$sheet)=@_;
+ my $symb = $sheet->{'usymb'};
unless ($symb) { return ''; }
#
- my $cid = $sheetdata->{'cid'};
- my $csec = $sheetdata->{'csec'};
- my $uname = $sheetdata->{'uname'};
- my $udom = $sheetdata->{'udom'};
+ my $cid = $sheet->{'cid'};
+ my $csec = $sheet->{'csec'};
+ my $uname = $sheet->{'uname'};
+ my $udom = $sheet->{'udom'};
my $result='';
#
my ($mapname,$id,$fn)=split(/\_\_\_/,$symb);
@@ -1646,112 +1587,81 @@ sub parmval {
my $courselevelr = $usercourseprefix.'.'.$symbparm;
my $courselevelm = $usercourseprefix.'.'.$mapparm;
# fourth, check user
- if ($uname) {
- return $useropt{$courselevelr} if ($useropt{$courselevelr});
- return $useropt{$courselevelm} if ($useropt{$courselevelm});
- return $useropt{$courselevel} if ($useropt{$courselevel});
+ if (defined($uname)) {
+ return $useropt{$courselevelr} if (defined($useropt{$courselevelr}));
+ return $useropt{$courselevelm} if (defined($useropt{$courselevelm}));
+ return $useropt{$courselevel} if (defined($useropt{$courselevel}));
}
# third, check course
- if ($csec) {
- return $courseopt{$seclevelr} if ($courseopt{$seclevelr});
- return $courseopt{$seclevelm} if ($courseopt{$seclevelm});
- return $courseopt{$seclevel} if ($courseopt{$seclevel});
+ if (defined($csec)) {
+ return $courseopt{$seclevelr} if (defined($courseopt{$seclevelr}));
+ return $courseopt{$seclevelm} if (defined($courseopt{$seclevelm}));
+ return $courseopt{$seclevel} if (defined($courseopt{$seclevel}));
}
#
- return $courseopt{$courselevelr} if ($courseopt{$courselevelr});
- return $courseopt{$courselevelm} if ($courseopt{$courselevelm});
- return $courseopt{$courselevel} if ($courseopt{$courselevel});
+ return $courseopt{$courselevelr} if (defined($courseopt{$courselevelr}));
+ return $courseopt{$courselevelm} if (defined($courseopt{$courselevelm}));
+ return $courseopt{$courselevel} if (defined($courseopt{$courselevel}));
# second, check map parms
my $thisparm = $parmhash{$symbparm};
- return $thisparm if ($thisparm);
+ return $thisparm if (defined($thisparm));
# first, check default
return &Apache::lonnet::metadata($fn,$rwhat.'.default');
}
# ---------------------------------------------- Update rows for course listing
sub updateclasssheet {
- my ($safeeval,$sheetdata) = @_;
- my $cnum =$sheetdata->{'cnum'};
- my $cdom =$sheetdata->{'cdom'};
- my $cid =$sheetdata->{'cid'};
- my $chome =$sheetdata->{'chome'};
+ my ($sheet) = @_;
+ my $cnum =$sheet->{'cnum'};
+ my $cdom =$sheet->{'cdom'};
+ my $cid =$sheet->{'cid'};
+ my $chome =$sheet->{'chome'};
+ #
+ %Section = ();
+
#
# Read class list and row labels
- my %classlist;
- my @tmp = &Apache::lonnet::dump('classlist',$cdom,$cnum);
- if ($tmp[0] !~ /^error/) {
- %classlist = @tmp;
- } else {
- return 'Could not access course data';
- }
- undef @tmp;
+ my $classlist = &Apache::loncoursedata::get_classlist();
+ if (! defined($classlist)) {
+ return 'Could not access course classlist';
+ }
#
my %currentlist=();
- my $now=time;
- foreach my $student (keys(%classlist)) {
- my ($end,$start)=split(/\:/,$classlist{$student});
- my $active=1;
- $active = 0 if (($end) && ($now>$end));
- $active = 1 if ($ENV{'form.Status'} eq 'Any');
- $active = !$active if ($ENV{'form.Status'} eq 'Expired');
- if ($active) {
+ 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='';
- my ($studentName,$studentDomain)=split(/\:/,$student);
- my $studentSection=&Apache::lonnet::usection($studentDomain,
- $studentName,$cid);
-# if ($studentSection==-1) {
-# unless ($ENV{'form.showcsv'}) {
-# $rowlabel='Data not available: '.
-# $studentName.'';
-# } else {
-# $rowlabel='ERROR","'.$studentName.
-# '","Data not available","","","';
-# }
-# } else {
- my %reply=&Apache::lonnet::idrget($studentDomain,$studentName);
- my %studentInformation=&Apache::lonnet::get
- ('environment',
- ['lastname','generation','firstname','middlename','id'],
- $studentDomain,$studentName);
- if (! $ENV{'form.showcsv'}) {
- $rowlabel=''.
- $studentSection.' ';
- foreach ('id','firstname','middlename',
- 'lastname','generation'){
- $rowlabel.=$studentInformation{$_}." ";
- }
- $rowlabel.='';
- } else {
- $rowlabel= '"'.join('","',
- ($studentSection,
- $studentInformation{'id'},
- $studentInformation{'firstname'},
- $studentInformation{'middlename'},
- $studentInformation{'lastname'},
- $studentInformation{'generation'})
- ).'"';
- }
- # }
+ if ($ENV{'form.showcsv'}) {
+ $rowlabel= '"'.join('","',($studentName,$studentDomain,
+ $fullname,$studentSection,$id).'"');
+ } else {
+ $rowlabel='';
+ $rowlabel.=$studentSection.' '.$id." ".$fullname;
+ $rowlabel.='';
+ }
$currentlist{$student}=$rowlabel;
- } # end of if ($active)
- } # end of foreach my $student (keys(%classlist))
+ }
+ }
#
# Find discrepancies between the course row table and this
#
- my %f=&getformulas($safeeval);
+ my %f=&getformulas($sheet);
my $changed=0;
#
- my $maxrow=0;
+ $sheet->{'maxrow'}=0;
my %existing=();
#
# Now obsolete rows
foreach (keys(%f)) {
if ($_=~/^A(\d+)/) {
- $maxrow=($1>$maxrow)?$1:$maxrow;
+ if ($1 > $sheet->{'maxrow'}) {
+ $sheet->{'maxrow'}= $1;
+ }
$existing{$f{$_}}=1;
unless ((defined($currentlist{$f{$_}})) || (!$1) ||
- ($f{$_}=~/^(\~\~\~|\-\-\-)/)) {
+ ($f{$_}=~/^(~~~|---)/)) {
$f{$_}='!!! Obsolete';
$changed=1;
}
@@ -1762,27 +1672,30 @@ sub updateclasssheet {
foreach (sort keys(%currentlist)) {
unless ($existing{$_}) {
$changed=1;
- $maxrow++;
- $f{'A'.$maxrow}=$_;
+ $sheet->{'maxrow'}++;
+ $f{'A'.$sheet->{'maxrow'}}=$_;
}
}
- if ($changed) { &setformulas($safeeval,%f); }
+ if ($changed) {
+ $sheet->{'f'} = \%f;
+ &setformulas($sheet,%f);
+ }
#
- &setmaxrow($safeeval,$maxrow);
- &setrowlabels($safeeval,%currentlist);
+ $sheet->{'rowlabel'} = \%currentlist;
+ &setrowlabels($sheet);
}
# ----------------------------------- Update rows for student and assess sheets
sub updatestudentassesssheet {
- my ($safeeval,$sheetdata) = @_;
+ my ($sheet) = @_;
my %bighash;
- my $stype=$sheetdata->{'sheettype'};
- my $uname=$sheetdata->{'uname'};
- my $udom =$sheetdata->{'udom'};
- my %current=();
+ my $stype=$sheet->{'sheettype'};
+ my $uname=$sheet->{'uname'};
+ my $udom =$sheet->{'udom'};
+ $sheet->{'rowlabel'} = {};
if ($updatedata
{$ENV{'request.course.fn'}.'_'.$stype.'_'.$uname.'_'.$udom}) {
- %current=split(/\_\_\_\;\_\_\_/,
+ %{$sheet->{'rowlabel'}}=split(/___;___/,
$updatedata{$ENV{'request.course.fn'}.
'_'.$stype.'_'.$uname.'_'.$udom});
} else {
@@ -1805,16 +1718,26 @@ sub updatestudentassesssheet {
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'
- );
+ my %allassess;
+ if (! $ENV{'form.showcsv'}) {
+ %allassess =
+ ('_feedback' =>'Feedback',
+ '_evaluation' =>'Evaluation',
+ '_tutoring' =>'Tutoring',
+ '_discussion' =>'Discussion'
+ );
+ } else {
+ %allassess =
+ ('_feedback' => "Feedback",
+ '_evaluation' => "Evaluation",
+ '_tutoring' => "Tutoring",
+ '_discussion' => "Discussion",
+ );
+ }
while (($_,undef) = each(%bighash)) {
next if ($_!~/^src\_(\d+)\.(\d+)$/);
my $mapid=$1;
@@ -1825,9 +1748,13 @@ sub updatestudentassesssheet {
my $symb=
&Apache::lonnet::declutter($bighash{'map_id_'.$mapid}).
'___'.$resid.'___'.&Apache::lonnet::declutter($srcf);
- $allassess{$symb}=
- ''.
- $bighash{'title_'.$id}.'';
+ if (! $ENV{'form.showcsv'}) {
+ $allassess{$symb}=
+ ''.
+ $bighash{'title_'.$id}.'';
+ } else {
+ $allassess{$symb}=$bighash{'title_'.$id};
+ }
next if ($stype ne 'assesscalc');
foreach my $key (split(/\,/,
&Apache::lonnet::metadata($srcf,'keys')
@@ -1850,63 +1777,67 @@ sub updatestudentassesssheet {
# %allassess has a list of all resource displays by symb
#
if ($stype eq 'assesscalc') {
- %current=%allkeys;
+ $sheet->{'rowlabel'} = \%allkeys;
} elsif ($stype eq 'studentcalc') {
- %current=%allassess;
+ $sheet->{'rowlabel'} = \%allassess;
}
$updatedata{$ENV{'request.course.fn'}.'_'.$stype.'_'.$uname.'_'.$udom}=
- join('___;___',%current);
+ join('___;___',%{$sheet->{'rowlabel'}});
# Get current from cache
}
# Find discrepancies between the course row table and this
#
- my %f=&getformulas($safeeval);
+ my %f=&getformulas($sheet);
my $changed=0;
- my $maxrow=0;
+ $sheet->{'maxrow'} = 0;
my %existing=();
# Now obsolete rows
foreach (keys(%f)) {
next if ($_!~/^A(\d+)/);
- $maxrow=($1>$maxrow)?$1:$maxrow;
- my ($usy,$ufn)=split(/\_\_\&\&\&\_\_/,$f{$_});
+ if ($1 > $sheet->{'maxrow'}) {
+ $sheet->{'maxrow'} = $1;
+ }
+ my ($usy,$ufn)=split(/__&&&\__/,$f{$_});
$existing{$usy}=1;
- unless ((defined($current{$usy})) || (!$1) ||
- ($f{$_}=~/^(\~\~\~|\-\-\-)/)){
+ unless ((exists($sheet->{'rowlabel'}->{$usy}) &&
+ (defined($sheet->{'rowlabel'}->{$usy})) || (!$1) ||
+ ($f{$_}=~/^(~~~|---)/))){
$f{$_}='!!! Obsolete';
$changed=1;
} elsif ($ufn) {
- $current{$usy}
- =~s/assesscalc\?usymb\=/assesscalc\?ufn\=$ufn\&usymb\=/;
+ $sheet->{'rowlabel'}->{$usy}
+ =~s/assesscalc\?usymb\=/assesscalc\?ufn\=$ufn\&usymb\=/;
}
}
# New and unknown keys
- foreach (keys(%current)) {
+ foreach (keys(%{$sheet->{'rowlabel'}})) {
unless ($existing{$_}) {
$changed=1;
- $maxrow++;
- $f{'A'.$maxrow}=$_;
+ $sheet->{'maxrow'}++;
+ $f{'A'.$sheet->{'maxrow'}}=$_;
}
}
- if ($changed) { &setformulas($safeeval,%f); }
- &setmaxrow($safeeval,$maxrow);
- &setrowlabels($safeeval,%current);
+ if ($changed) {
+ $sheet->{'f'} = \%f;
+ &setformulas($sheet);
+ }
+ &setrowlabels($sheet);
#
- undef %current;
undef %existing;
}
# ------------------------------------------------ Load data for one assessment
sub loadstudent {
- my ($safeeval,$sheetdata)=@_;
+ my ($sheet)=@_;
my %c=();
- my %f=&getformulas($safeeval);
- $cachedassess=$sheetdata->{'uname'}.':'.$sheetdata->{'udom'};
+ my %f=&getformulas($sheet);
+ $cachedassess=$sheet->{'uname'}.':'.$sheet->{'udom'};
# Get ALL the student preformance data
- my @tmp = &Apache::lonnet::dump($sheetdata->{'cid'},
- $sheetdata->{'udom'},
- $sheetdata->{'uname'},
+ my @tmp = &Apache::lonnet::dump($sheet->{'cid'},
+ $sheet->{'udom'},
+ $sheet->{'uname'},
undef);
if ($tmp[0] !~ /^error:/) {
%cachedstores = @tmp;
@@ -1919,8 +1850,8 @@ sub loadstudent {
my $row=$1;
next if (($f{$_}=~/^[\!\~\-]/) || ($row==0));
my ($usy,$ufn)=split(/__&&&\__/,$f{$_});
- @assessdata=&exportsheet($sheetdata->{'uname'},
- $sheetdata->{'udom'},
+ @assessdata=&exportsheet($sheet->{'uname'},
+ $sheet->{'udom'},
'assesscalc',$usy,$ufn);
my $index=0;
foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M',
@@ -1941,16 +1872,18 @@ sub loadstudent {
}
$cachedassess='';
undef %cachedstores;
- &setformulas($safeeval,%f);
- &setconstants($safeeval,%c);
+ $sheet->{'f'} = \%f;
+ $sheet->{'constants'} = \%c;
+ &setformulas($sheet);
+ &setconstants($sheet);
}
# --------------------------------------------------- Load data for one student
#
sub loadcourse {
- my ($safeeval,$sheetdata,$r)=@_;
+ my ($sheet,$r)=@_;
my %c=();
- my %f=&getformulas($safeeval);
+ my %f=&getformulas($sheet);
my $total=0;
foreach (keys(%f)) {
if ($_=~/^A(\d+)/) {
@@ -2001,8 +1934,10 @@ ENDPOP
}
}
}
- &setformulas($safeeval,%f);
- &setconstants($safeeval,%c);
+ $sheet->{'f'}=\%f;
+ $sheet->{'constants'}=\%c;
+ &setformulas($sheet);
+ &setconstants($sheet);
$r->print('');
$r->rflush();
}
@@ -2010,16 +1945,16 @@ ENDPOP
# ------------------------------------------------ Load data for one assessment
#
sub loadassessment {
- my ($safeeval,$sheetdata)=@_;
+ my ($sheet)=@_;
- 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 $uhome = $sheet->{'uhome'};
+ my $uname = $sheet->{'uname'};
+ my $udom = $sheet->{'udom'};
+ my $symb = $sheet->{'usymb'};
+ my $cid = $sheet->{'cid'};
+ my $cnum = $sheet->{'cnum'};
+ my $cdom = $sheet->{'cdom'};
+ my $chome = $sheet->{'chome'};
my $namespace;
unless ($namespace=$cid) { return ''; }
@@ -2054,10 +1989,9 @@ sub loadassessment {
# 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;
}
@@ -2066,35 +2000,28 @@ sub loadassessment {
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;
- $courserdatas{$cid.'.last_cache'}=time;
- }
+ 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);
+ while (my ($name,$value) = each(%{$courserdatas{$cid}})) {
+ $courseopt{$userprefix.$name}=$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;
- }
+ 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;
}
- foreach (split(/\&/,$userrdatas{$uname.'___'.$udom})) {
- my ($name,$value)=split(/\=/,$_);
- $useropt{$userprefix.&Apache::lonnet::unescape($name)}=
- &Apache::lonnet::unescape($value);
+ while (my ($name,$value) = each(%{$userrdatas{$cid}})) {
+ $useropt{$userprefix.$name}=$value;
}
}
# now courseopt, useropt initialized for this user and course
@@ -2112,14 +2039,14 @@ sub loadassessment {
#
my %c=();
if (tie(%parmhash,'GDBM_File',
- &getcoursefilename($safeeval).'_parms.db',&GDBM_READER(),0640)) {
- my %f=&getformulas($safeeval);
+ $sheet->{'coursefilename'}.'_parms.db',&GDBM_READER(),0640)) {
+ my %f=&getformulas($sheet);
foreach (keys(%f)) {
next if ($_!~/^A/);
next if ($f{$_}=~/^[\!\~\-]/);
if ($f{$_}=~/^parameter/) {
if ($thisassess{$f{$_}}) {
- my $val=&parmval($f{$_},$safeeval,$sheetdata);
+ my $val=&parmval($f{$_},$sheet);
$c{$_}=$val;
$c{$f{$_}}=$val;
}
@@ -2134,7 +2061,8 @@ sub loadassessment {
}
untie(%parmhash);
}
- &setconstants($safeeval,%c);
+ $sheet->{'constants'}=\%c;
+ &setconstants($sheet);
}
# --------------------------------------------------------- Various form fields
@@ -2167,12 +2095,12 @@ sub selectbox {
#
sub updatesheet {
- my ($safeeval,$sheetdata)=@_;
- my $stype=$sheetdata->{'sheettype'};
+ my ($sheet)=@_;
+ my $stype=$sheet->{'sheettype'};
if ($stype eq 'classcalc') {
- return &updateclasssheet($safeeval,$sheetdata);
+ return &updateclasssheet($sheet);
} else {
- return &updatestudentassesssheet($safeeval,$sheetdata);
+ return &updatestudentassesssheet($sheet);
}
}
@@ -2182,14 +2110,14 @@ sub updatesheet {
#
sub loadrows {
- my ($safeeval,$sheetdata,$r)=@_;
- my $stype=$sheetdata->{'sheettype'};
+ my ($sheet,$r)=@_;
+ my $stype=$sheet->{'sheettype'};
if ($stype eq 'classcalc') {
- &loadcourse($safeeval,$sheetdata,$r);
+ &loadcourse($sheet,$r);
} elsif ($stype eq 'studentcalc') {
- &loadstudent($safeeval,$sheetdata);
+ &loadstudent($sheet);
} else {
- &loadassessment($safeeval,$sheetdata);
+ &loadassessment($sheet);
}
}
@@ -2207,7 +2135,7 @@ sub forcedrecalc {
if ($ENV{'form.forcerecalc'}) { return 1; }
unless ($time) { return 1; }
if ($stype eq 'assesscalc') {
- my $map=(split(/\_\_\_/,$usymb))[0];
+ my $map=(split(/___/,$usymb))[0];
if (&checkthis('::assesscalc:',$time) ||
&checkthis('::assesscalc:'.$map,$time) ||
&checkthis('::assesscalc:'.$usymb,$time) ||
@@ -2226,14 +2154,10 @@ sub forcedrecalc {
}
# ============================================================== Export handler
-#
-# Non-interactive call from with program
-#
-
sub exportsheet {
my ($uname,$udom,$stype,$usymb,$fn)=@_;
my @exportarr=();
- if (($usymb=~/^\_(\w+)/) && (!$fn)) {
+ if (defined($usymb) && ($usymb=~/^\_(\w+)/) && (!$fn)) {
$fn='default_'.$1;
}
#
@@ -2242,8 +2166,8 @@ sub exportsheet {
my $key=$uname.':'.$udom.':'.$stype.':'.$usymb;
my $found='';
if ($oldsheets{$key}) {
- foreach (split(/\_\_\_\&\_\_\_/,$oldsheets{$key})) {
- my ($name,$value)=split(/\_\_\_\=\_\_\_/,$_);
+ foreach (split(/___&\___/,$oldsheets{$key})) {
+ my ($name,$value)=split(/___=___/,$_);
if ($name eq $fn) {
$found=$value;
}
@@ -2252,8 +2176,8 @@ sub exportsheet {
unless ($found) {
&cachedssheets($uname,$udom,&Apache::lonnet::homeserver($uname,$udom));
if ($oldsheets{$key}) {
- foreach (split(/\_\_\_\&\_\_\_/,$oldsheets{$key})) {
- my ($name,$value)=split(/\_\_\_\=\_\_\_/,$_);
+ foreach (split(/___&\___/,$oldsheets{$key})) {
+ my ($name,$value)=split(/___=___/,$_);
if ($name eq $fn) {
$found=$value;
}
@@ -2272,72 +2196,65 @@ sub exportsheet {
#
# 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,$sheetdata);
- @exportarr=&exportdata($thissheet,$sheetdata);
- #
- # 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'});
- }
+ @exportarr=split(/___;___/,$found);
+ return @exportarr;
+ }
+ #
+ # Not cached
+ #
+ my ($sheet)=&makenewsheet($uname,$udom,$stype,$usymb);
+ &readsheet($sheet,$fn);
+ &updatesheet($sheet);
+ &loadrows($sheet);
+ &calcsheet($sheet);
+ @exportarr=&exportdata($sheet);
+ #
+ # 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:'.$sheet->{'udom'}.':'.
+ $sheet->{'uname'}.
+ ':nohist_calculatedsheets_'.
+ $ENV{'request.course.id'}.':'.
+ &Apache::lonnet::escape($key),
+ $sheet->{'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::put('nohist_calculatedsheets',
+ { $key => $newstore,
+ $key.time => $now },
+ $ENV{'course.'.$cid.'.domain'},
+ $ENV{'course.'.$cid.'.num'})
+ } else {
+ &Apache::lonnet::put('nohist_calculatedsheets_'.$sheet->{'cid'},
+ { $key => $newstore,
+ $key.time => $now },
+ $sheet->{'udom'},
+ $sheet->{'uname'})
}
return @exportarr;
}
@@ -2421,12 +2338,17 @@ sub cachedssheets {
sub handler {
my $r=shift;
+ if (! exists($ENV{'form.Status'})) {
+ $ENV{'form.Status'} = 'Active';
+ }
+ # 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;
@@ -2523,7 +2445,7 @@ ENDSCRIPT
}
# Read new sheet or modified worksheet
$r->uri=~/\/(\w+)$/;
- my ($asheet,$asheetdata)=&makenewsheet($aname,$adom,$1,$ENV{'form.usymb'});
+ my ($sheet)=&makenewsheet($aname,$adom,$1,$ENV{'form.usymb'});
#
# If a new formula had been entered, go from work copy
if ($ENV{'form.unewfield'}) {
@@ -2531,24 +2453,19 @@ ENDSCRIPT
$ENV{'form.unewformula'}=~s/\'/\"/g;
$r->print('New formula: '.$ENV{'form.unewfield'}.'='.
$ENV{'form.unewformula'}.'
');
- &setfilename($asheet,$ENV{'form.ufn'});
- &tmpread($asheet,$ENV{'form.unewfield'},$ENV{'form.unewformula'});
+ $sheet->{'filename'} = $ENV{'form.ufn'};
+ &tmpread($sheet,$ENV{'form.unewfield'},$ENV{'form.unewformula'});
} elsif ($ENV{'form.saveas'}) {
- &setfilename($asheet,$ENV{'form.ufn'});
- &tmpread($asheet);
+ $sheet->{'filename'} = $ENV{'form.ufn'};
+ &tmpread($sheet);
} else {
- &readsheet($asheet,$asheetdata,$ENV{'form.ufn'});
+ &readsheet($sheet,$ENV{'form.ufn'});
}
# Print out user information
- unless ($asheetdata->{'sheettype'} eq 'classcalc') {
- $r->print('
User: '.$asheetdata->{'uname'}.
- '
Domain: '.$asheetdata->{'udom'});
-# if (&getcsec($asheet) eq '-1') {
-# $r->print('
'.
-# 'Not a student in this course
');
-# } else {
- $r->print('
Section/Group: '.$asheetdata->{'csec'});
-# }
+ if ($sheet->{'sheettype'} ne 'classcalc') {
+ $r->print('User: '.$sheet->{'uname'}.
+ '
Domain: '.$sheet->{'udom'});
+ $r->print('
Section/Group: '.$sheet->{'csec'});
if ($ENV{'form.usymb'}) {
$r->print('
Assessment: '.
$ENV{'form.usymb'}.'');
@@ -2556,10 +2473,10 @@ ENDSCRIPT
}
#
# Check user permissions
- if (($asheetdata->{'sheettype'} eq 'classcalc' ) ||
- ($asheetdata->{'uname'} ne $ENV{'user.name'} ) ||
- ($asheetdata->{'udom'} ne $ENV{'user.domain'})) {
- unless (&Apache::lonnet::allowed('vgr',$asheetdata->{'cid'})) {
+ if (($sheet->{'sheettype'} eq 'classcalc' ) ||
+ ($sheet->{'uname'} ne $ENV{'user.name'} ) ||
+ ($sheet->{'udom'} ne $ENV{'user.domain'})) {
+ unless (&Apache::lonnet::allowed('vgr',$sheet->{'cid'})) {
$r->print('
Access Permission Denied
'.
'