--- loncom/interface/Attic/lonspreadsheet.pm 2002/10/21 17:59:36 1.119
+++ loncom/interface/Attic/lonspreadsheet.pm 2002/11/04 22:35:45 1.132
@@ -1,5 +1,5 @@
#
-# $Id: lonspreadsheet.pm,v 1.119 2002/10/21 17:59:36 matthew Exp $
+# $Id: lonspreadsheet.pm,v 1.132 2002/11/04 22:35:45 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -122,19 +122,16 @@ my $tmpdir;
##
sub mask {
my ($lower,$upper)=@_;
-
- $lower=~/([A-Za-z]|\*)(\d+|\*)/;
- my $la=$1;
- my $ld=$2;
-
- $upper=~/([A-Za-z]|\*)(\d+|\*)/;
- my $ua=$1;
- my $ud=$2;
+ $upper = $lower if (! defined($upper));
+ #
+ my ($la,$ld) = ($lower=~/([A-Za-z]|\*)(\d+|\*)/);
+ my ($ua,$ud) = ($upper=~/([A-Za-z]|\*)(\d+|\*)/);
+ #
my $alpha='';
my $num='';
-
+ #
if (($la eq '*') || ($ua eq '*')) {
- $alpha='[A-Za-z]';
+ $alpha='[A-Za-z]';
} else {
if (($la=~/[A-Z]/) && ($ua=~/[A-Z]/) ||
($la=~/[a-z]/) && ($ua=~/[a-z]/)) {
@@ -188,8 +185,8 @@ sub mask {
}
$num.=')';
} else {
- if ($lda[$#lda]!=$uda[$#uda]) {
- $num.='['.$lda[$#lda].'-'.$uda[$#uda].']';
+ if ($lda[-1]!=$uda[-1]) {
+ $num.='['.$lda[-1].'-'.$uda[-1].']';
}
}
}
@@ -197,8 +194,6 @@ sub mask {
return '^'.$alpha.$num."\$";
}
-
-
sub initsheet {
my $safeeval = new Safe(shift);
my $safehole = new Safe::Hole;
@@ -208,7 +203,6 @@ sub initsheet {
$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
@@ -238,12 +232,11 @@ undef %c; # Holds the constants for a sh
# 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.
+#$errorlog = '';
$maxrow = 0;
$sheettype = '';
@@ -597,7 +590,8 @@ compute the average of the items in the
#-------------------------------------------------------
sub MEAN {
my $mask=mask(@_);
- my $sum=0; my $num=0;
+ my $sum=0;
+ my $num=0;
foreach (grep /$mask/,keys(%sheet_values)) {
$sum+=$sheet_values{$_};
$num++;
@@ -834,9 +828,11 @@ sub expandnamed {
foreach $parameter (keys(%c)) {
push @matches,$parameter if ($parameter =~ /$expression/);
}
- if ($#matches == 0) {
+ if (scalar(@matches) == 0) {
+ $returnvalue = 'unmatched parameter: '.$parameter;
+ } elsif (scalar(@matches) == 1) {
$returnvalue = '$c{\''.$matches[0].'\'}';
- } elsif ($#matches > 0) {
+ } elsif (scalar(@matches) > 0) {
# more than one match. Look for a concise one
$returnvalue = "'non-unique parameter name : $expression'";
foreach (@matches) {
@@ -845,7 +841,9 @@ sub expandnamed {
}
}
} else {
- $returnvalue = "'bad parameter name : $expression'";
+ # There was a negative number of matches, which indicates
+ # something is wrong with reality. Better warn the user.
+ $returnvalue = 'bizzare parameter: '.$parameter;
}
return $returnvalue;
}
@@ -928,6 +926,7 @@ sub calc {
while ($notfinished) {
$notfinished=0;
foreach (keys(%t)) {
+ #$errorlog .= "$_:".$t{$_};
my $old=$sheet_values{$_};
$sheet_values{$_}=eval $t{$_};
if ($@) {
@@ -935,6 +934,7 @@ sub calc {
return $_.': '.$@;
}
if ($sheet_values{$_} ne $old) { $notfinished=1; $lastcalc=$_; }
+ #$errorlog .= ":".$sheet_values{$_}."\n";
}
$depth++;
if ($depth>100) {
@@ -945,95 +945,86 @@ sub calc {
return '';
}
+# ------------------------------------------- End of "Inside of the safe space"
+ENDDEFS
+ $safeeval->reval($code);
+ return $safeeval;
+}
+
#
-# 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;
+sub templaterow {
+ my $sheet = shift;
my @cols=();
- if ($n) {
- my ($usy,$ufn)=split(/__&&&\__/,$f{'A'.$n});
- if ($rowlabel{$usy}) {
- $cols[0]=$rowlabel{$usy}.' '.
- '';
- } else {
- $cols[0]='Export';
- }
+ my $rowlabel = '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{$_.$n};
+ my $fm=$sheet->{'f'}->{'template_'.$_};
$fm=~s/[\'\"]/\&\#34;/g;
- push(@cols,"'$_$n','$fm'".'___eq___'.$sheet_values{$_.$n});
+ push(@cols,{ name => 'template_'.$_,
+ formula => $fm,
+ value => $fm });
}
- return @cols;
+ return ($rowlabel,@cols);
}
-sub outrow {
- my $n=shift;
+sub outrowassess {
+ # $n is the current row number
+ my ($sheet,$n) = @_;
my @cols=();
+ my $rowlabel='';
if ($n) {
- $cols[0]=$rowlabel{$f{'A'.$n}};
+ my ($usy,$ufn)=split(/__&&&\__/,$sheet->{'f'}->{'A'.$n});
+ if (exists($sheet->{'rowlabel'}->{$usy})) {
+ $rowlabel = $sheet->{'rowlabel'}->{$usy};
+ } else {
+ $rowlabel = '';
+ }
} else {
- $cols[0]='Export';
+ $rowlabel = 'Export';
}
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{$_.$n};
+ my $fm=$sheet->{'f'}->{$_.$n};
$fm=~s/[\'\"]/\&\#34;/g;
- push(@cols,"'$_$n','$fm'".'___eq___'.$sheet_values{$_.$n});
+ push(@cols,{ name => $_.$n,
+ formula => $fm,
+ value => $sheet->{'values'}->{$_.$n}});
}
- return @cols;
-}
-
-sub exportrowa {
- my @exportarray=();
- 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') {
- push(@exportarray,$sheet_values{$_.'0'});
- }
- return @exportarray;
+ return ($rowlabel,@cols);
}
-sub templaterow {
+sub outrow {
+ my ($sheet,$n)=@_;
my @cols=();
- $cols[0]='Template';
+ my $rowlabel;
+ if ($n) {
+ $rowlabel = $sheet->{'rowlabel'}->{$sheet->{'f'}->{'A'.$n}};
+ } else {
+ if ($sheet->{'sheettype'} eq 'classcalc') {
+ $rowlabel = 'Summary';
+ } else {
+ $rowlabel = 'Export';
+ }
+ }
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_'.$_};
+ my $fm=$sheet->{'f'}->{$_.$n};
$fm=~s/[\'\"]/\&\#34;/g;
- push(@cols,"'template_$_','$fm'".'___eq___'.$fm);
+ push(@cols,{ name => $_.$n,
+ formula => $fm,
+ value => $sheet->{'values'}->{$_.$n}});
}
- return @cols;
-}
-
-
-# ------------------------------------------- End of "Inside of the safe space"
-ENDDEFS
- $safeeval->reval($code);
- return $safeeval;
+ return ($rowlabel,@cols);
}
-
# ------------------------------------------------ Add or change formula values
sub setformulas {
my ($sheet)=shift;
@@ -1043,6 +1034,12 @@ sub setformulas {
# ------------------------------------------------ Add or change formula values
sub setconstants {
my ($sheet)=shift;
+ my ($constants) = @_;
+ if (! ref($constants)) {
+ my %tmp = @_;
+ $constants = \%tmp;
+ }
+ $sheet->{'constants'} = $constants;
return %{$sheet->{'safe'}->varglob('c')}=%{$sheet->{'constants'}};
}
@@ -1058,21 +1055,34 @@ sub setothersheets {
# ------------------------------------------------ Add or change formula values
sub setrowlabels {
my $sheet=shift;
- %{$sheet->{'safe'}->varglob('rowlabel')}=%{$sheet->{'rowlabel'}};
+ my ($rowlabel) = @_;
+ if (! ref($rowlabel)) {
+ my %tmp = @_;
+ $rowlabel = \%tmp;
+ }
+ $sheet->{'rowlabel'}=$rowlabel;
}
# ------------------------------------------------------- Calculate spreadsheet
sub calcsheet {
my $sheet=shift;
- return $sheet->{'safe'}->reval('&calc();');
+ my $result = $sheet->{'safe'}->reval('&calc();');
+ %{$sheet->{'values'}} = %{$sheet->{'safe'}->varglob('sheet_values')};
+ return $result;
}
# ---------------------------------------------------------------- Get formulas
+# Return a copy of the formulas
sub getformulas {
my $sheet = shift;
return %{$sheet->{'safe'}->varglob('f')};
}
+sub geterrorlog {
+ my $sheet = shift;
+ return ${$sheet->{'safe'}->varglob('errorlog')};
+}
+
# ----------------------------------------------------- Get value of $f{'A'.$n}
sub getfa {
my $sheet = shift;
@@ -1083,10 +1093,18 @@ sub getfa {
# ------------------------------------------------------------- Export of A-row
sub exportdata {
my $sheet=shift;
- return $sheet->{'safe'}->reval('&exportrowa()');
+ my @exportarray=();
+ 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 (exists($sheet->{'values'}->{$_.'0'})) {
+ push(@exportarray,$sheet->{'values'}->{$_.'0'});
+ } else {
+ push(@exportarray,'');
+ }
+ }
+ return @exportarray;
}
-
# ========================================================== End of Spreadsheet
# =============================================================================
@@ -1095,169 +1113,273 @@ sub exportdata {
#
# --------------------------------------------- Produce output row n from sheet
-sub rown {
- my ($sheet,$n)=@_;
- my $defaultbg;
- my $rowdata='';
- my $dataflag=0;
- unless ($n eq '-') {
- $defaultbg=((($n-1)/5)==int(($n-1)/5))?'#E0E0':'#FFFF';
- } else {
- $defaultbg='#E0FF';
- }
- unless ($ENV{'form.showcsv'}) {
- $rowdata.="\n
$n
";
- } else {
- $rowdata.="\n".'"'.$n.'"';
- }
- my $showf=0;
- my $proc;
- my $maxred=1;
- my $sheettype=$sheet->{'sheettype'};
- if ($sheettype eq 'studentcalc') {
- $proc='&outrowassess';
- $maxred=26;
- } else {
- $proc='&outrow';
- }
- if ($sheettype eq 'assesscalc') {
- $maxred=1;
- } else {
- $maxred=26;
- }
- if (&getfa($sheet,$n)=~/^[\~\-]/) { $maxred=1; }
+sub get_row {
+ my ($sheet,$n) = @_;
+ my ($rowlabel,@rowdata);
if ($n eq '-') {
- $proc='&templaterow';
- $n=-1;
- $dataflag=1;
- }
- foreach ($sheet->{'safe'}->reval($proc.'('.$n.')')) {
- my $bgcolor=$defaultbg.((($showf-1)/5==int(($showf-1)/5))?'99':'DD');
- my ($fm,$vl)=split(/\_\_\_eq\_\_\_/,$_);
- if ((($vl ne '') || ($vl eq '0')) &&
- (($showf==1) || ($sheettype ne 'studentcalc'))) { $dataflag=1; }
- if ($showf==0) { $vl=$_; }
- unless ($ENV{'form.showcsv'}) {
- if ($showf<=$maxred) { $bgcolor='#FFDDDD'; }
- if (($n==0) && ($showf<=26)) { $bgcolor='#CCCCFF'; }
- if (($showf>$maxred) || ((!$n) && ($showf>0))) {
- if ($vl eq '') {
- $vl='#';
- }
- $rowdata.='
');
+ ####################################
+ # Prepare to output rows
+ ####################################
+ my @Rows = &sort_indicies($sheet);
#
# Loop through the rows and output them one at a time
- my $n=0;
- 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'})) {
+ my $rows_output=0;
+ foreach my $rownum (@Rows) {
+ my ($rowlabel,@rowdata) = &get_row($sheet,$rownum);
+ #
+ my $defaultbg='#E0FF';
+ #
+ my $row_html ="\n".'
';
+ # Output links for each student?
+ # Nope, that is already done for us in format_rowlabel (for now)
+ } elsif ($sheet->{'sheettype'} eq 'studentcalc') {
+ $row_html.='
The server encountered an internal error or
misconfiguration and was unable to complete
your request.
Please contact the server administrator at
root@localhost to inform them of the time this error occurred,
and the actions you performed just before this error.
More information about this error may be available
in the server error log.