--- loncom/interface/Attic/lonspreadsheet.pm 2002/09/05 14:38:57 1.107
+++ loncom/interface/Attic/lonspreadsheet.pm 2002/10/16 16:35:42 1.117
@@ -1,5 +1,5 @@
#
-# $Id: lonspreadsheet.pm,v 1.107 2002/09/05 14:38:57 matthew Exp $
+# $Id: lonspreadsheet.pm,v 1.117 2002/10/16 16:35:42 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -26,16 +26,6 @@
# 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,12/11,12/12,12/15,12/16,12/18,12/19,12/30,
-# 01/01/01,02/01,03/01,19/01,20/01,22/01,
-# 03/05,03/08,03/10,03/12,03/13,03/15,03/17,
-# 03/19,03/20,03/21,03/27,04/05,04/09,
-# 07/09,07/14,07/21,09/01,09/10,9/11,9/12,9/13,9/14,9/17,
-# 10/16,10/17,10/20,11/05,11/28,12/27 Gerd Kortemeyer
-# 01/14/02 Matthew
-# 02/04/02 Matthew
-
# POD required stuff:
=head1 NAME
@@ -54,7 +44,6 @@ not the grades of their peers. The spre
offering the ability to use Perl code to manipulate data, as well as many
built-in functions.
-
=head2 Functions available to user of lonspreadsheet
=over 4
@@ -73,6 +62,11 @@ use GDBM_File;
use HTML::TokeParser;
use Apache::lonhtmlcommon;
#
+# Caches for coursewide information
+#
+my %Section;
+
+#
# Caches for previously calculated spreadsheets
#
@@ -167,7 +161,7 @@ $chome= '';
$cnum = '';
$cdom = '';
$cid = '';
-$cfn = '';
+$coursefilename = '';
# symb
@@ -863,7 +857,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{$_}=~/^\!/) {
@@ -1012,168 +1006,48 @@ ENDDEFS
}
# ------------------------------------------------ Add or change formula values
-
sub setformulas {
my ($safeeval,%f)=@_;
%{$safeeval->varglob('f')}=%f;
}
# ------------------------------------------------ Add or change formula values
-
sub setconstants {
my ($safeeval,%c)=@_;
%{$safeeval->varglob('c')}=%c;
}
# --------------------------------------------- Set names of other spreadsheets
-
sub setothersheets {
my ($safeeval,@os)=@_;
@{$safeeval->varglob('os')}=@os;
}
# ------------------------------------------------ Add or change formula values
-
sub setrowlabels {
my ($safeeval,%rowlabel)=@_;
%{$safeeval->varglob('rowlabel')}=%rowlabel;
}
# ------------------------------------------------------- Calculate spreadsheet
-
sub calcsheet {
my $safeeval=shift;
return $safeeval->reval('&calc();');
}
-# ------------------------------------------------------------------ Get values
-
-sub getvalues {
- my $safeeval=shift;
- return $safeeval->reval('%sheet_values');
-}
-
# ---------------------------------------------------------------- Get formulas
-
sub getformulas {
my $safeeval=shift;
return %{$safeeval->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 getcfn {
- my $safeeval=shift;
- return $safeeval->reval('$cfn');
-}
-
-# ----------------------------------------------------------- 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');
-}
-
# ------------------------------------------------------------- Export of A-row
-
sub exportdata {
my $safeeval=shift;
return $safeeval->reval('&exportrowa()');
@@ -1189,7 +1063,7 @@ sub exportdata {
# --------------------------------------------- Produce output row n from sheet
sub rown {
- my ($safeeval,$n)=@_;
+ my ($safeeval,$n,$sheetdata)=@_;
my $defaultbg;
my $rowdata='';
my $dataflag=0;
@@ -1206,7 +1080,7 @@ sub rown {
my $showf=0;
my $proc;
my $maxred=1;
- my $sheettype=&gettype($safeeval);
+ my $sheettype=$sheetdata->{'sheettype'};
if ($sheettype eq 'studentcalc') {
$proc='&outrowassess';
$maxred=26;
@@ -1237,8 +1111,14 @@ sub rown {
if ($vl eq '') {
$vl='#';
}
- $rowdata.='