--- loncom/interface/Attic/lonspreadsheet.pm 2002/10/22 18:54:53 1.123
+++ loncom/interface/Attic/lonspreadsheet.pm 2002/11/05 15:00:27 1.133
@@ -1,5 +1,5 @@
#
-# $Id: lonspreadsheet.pm,v 1.123 2002/10/22 18:54:53 matthew Exp $
+# $Id: lonspreadsheet.pm,v 1.133 2002/11/05 15:00:27 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;
@@ -237,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 = '';
@@ -596,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++;
@@ -754,6 +749,7 @@ parametername should be a string such as
sub MINPARM {
my ($expression) = @_;
my $min = undef;
+ study($expression);
foreach $parameter (keys(%c)) {
next if ($parameter !~ /$expression/);
if ((! defined($min)) || ($min > $c{$parameter})) {
@@ -776,6 +772,7 @@ parametername should be a string such as
sub MAXPARM {
my ($expression) = @_;
my $max = undef;
+ study($expression);
foreach $parameter (keys(%c)) {
next if ($parameter !~ /$expression/);
if ((! defined($min)) || ($max < $c{$parameter})) {
@@ -827,12 +824,15 @@ sub expandnamed {
my $returnvalue = '';
my @matches = ();
$#matches = -1;
+ study $expression;
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) {
@@ -841,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;
}
@@ -915,6 +917,34 @@ sub sett {
$t{'A0'}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.&expandnamed($2)/ge;
}
+sub calc {
+ undef %sheet_values;
+ &sett();
+ my $notfinished=1;
+ my $lastcalc='';
+ my $depth=0;
+ while ($notfinished) {
+ $notfinished=0;
+ foreach (keys(%t)) {
+ #$errorlog .= "$_:".$t{$_};
+ my $old=$sheet_values{$_};
+ $sheet_values{$_}=eval $t{$_};
+ if ($@) {
+ undef %sheet_values;
+ return $_.': '.$@;
+ }
+ if ($sheet_values{$_} ne $old) { $notfinished=1; $lastcalc=$_; }
+ #$errorlog .= ":".$sheet_values{$_}."\n";
+ }
+ $depth++;
+ if ($depth>100) {
+ undef %sheet_values;
+ return $lastcalc.': Maximum calculation depth exceeded';
+ }
+ }
+ return '';
+}
+
# ------------------------------------------- End of "Inside of the safe space"
ENDDEFS
$safeeval->reval($code);
@@ -922,55 +952,39 @@ ENDDEFS
}
#
-# This is actually used for the student spreadsheet, not the assessment sheet
-# Do not be fooled by the name!
+#
#
sub templaterow {
my $sheet = shift;
my @cols=();
- $cols[0]='<b><font size=+1>Template</font></b>';
+ 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=$sheet->{'f'}->{'template_'.$_};
$fm=~s/[\'\"]/\&\#34;/g;
- push(@cols,"'template_$_','$fm'".'___eq___'.$fm);
+ push(@cols,{ name => 'template_'.$_,
+ formula => $fm,
+ value => $fm });
}
- return @cols;
+ return ($rowlabel,@cols);
}
-
sub outrowassess {
# $n is the current row number
- my $sheet = shift;
- my $n=shift;
- my $csv = $ENV{'form.showcsv'};
+ my ($sheet,$n) = @_;
my @cols=();
+ my $rowlabel='';
if ($n) {
my ($usy,$ufn)=split(/__&&&\__/,$sheet->{'f'}->{'A'.$n});
- if ($sheet->{'rowlabel'}->{$usy}) {
- $cols[0]=$sheet->{'rowlabel'}->{$usy};
- if (! $csv) {
- $cols[0].='<br>'.
- '<select name="sel_'.$n.'" onChange="changesheet('.$n.')">'.
- '<option name="default">Default</option>';
- }
+ if (exists($sheet->{'rowlabel'}->{$usy})) {
+ $rowlabel = $sheet->{'rowlabel'}->{$usy};
} else {
- $cols[0]='';
- }
- if (! $csv) {
- foreach (@{$sheet->{'othersheets'}}) {
- $cols[0].='<option name="'.$_.'"';
- if ($ufn eq $_) {
- $cols[0].=' selected';
- }
- $cols[0].='>'.$_.'</option>';
- }
- $cols[0].='</select>';
+ $rowlabel = '';
}
} else {
- $cols[0]='<b><font size=+1>Export</font></b>';
+ $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',
@@ -978,19 +992,25 @@ sub outrowassess {
'n','o','p','q','r','s','t','u','v','w','x','y','z') {
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;
+ return ($rowlabel,@cols);
}
sub outrow {
- my $sheet=shift;
- my $n=shift;
+ my ($sheet,$n)=@_;
my @cols=();
+ my $rowlabel;
if ($n) {
- $cols[0]=$sheet->{'rowlabel'}->{$sheet->{'f'}->{'A'.$n}};
+ $rowlabel = $sheet->{'rowlabel'}->{$sheet->{'f'}->{'A'.$n}};
} else {
- $cols[0]='<b><font size=+1>Export</font></b>';
+ 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',
@@ -998,42 +1018,17 @@ sub outrow {
'n','o','p','q','r','s','t','u','v','w','x','y','z') {
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;
+ return ($rowlabel,@cols);
}
# ------------------------------------------------ Add or change formula values
-sub update_values {
- my $sheet = shift;
- %{$sheet->{'safe'}->varglob('sheet_values')}=%{$sheet->{'values'}};
- return undef;
-}
-
-sub setvalues {
- my $sheet=shift;
- my ($values) = @_;
- $values = {} if (! defined($values));
- if (! ref($values)) {
- my %tmp = @_;
- $values = \%tmp;
- }
- $sheet->{'values'} = $values;
- %{$sheet->{'safe'}->varglob('sheet_values')}=%{$sheet->{'values'}};
- return undef;
-}
-
sub setformulas {
- my $sheet=shift;
- my ($formulas) = @_;
- $formulas = {} if (! defined($formulas));
- if (! ref($formulas)) {
- my %tmp = @_;
- $formulas = \%tmp;
- }
- $sheet->{'f'} = $formulas;
+ my ($sheet)=shift;
%{$sheet->{'safe'}->varglob('f')}=%{$sheet->{'f'}};
- return undef;
}
# ------------------------------------------------ Add or change formula values
@@ -1060,52 +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;
- &setvalues($sheet,undef);
- $sheet->{'safe'}->reval('&sett();');
- my %t = %{$sheet->{'safe'}->varglob('t')};
- my $notfinished=1;
- my $lastcalc='';
- my $depth=0;
- while ($notfinished) {
- $notfinished=0;
- foreach (keys(%t)) {
- my $old=$sheet->{'values'}->{$_};
- $sheet->{'values'}->{$_}=$sheet->{'safe'}->reval($t{$_}.';');
- if ($@) {
- &setvalues($sheet,undef);
- return $_.': '.$@;
- }
- if ($sheet->{'values'}->{$_} ne $old) {
- $notfinished=1;
- $lastcalc=$_;
- }
- }
- if ($notfinished) {
- %{$sheet->{'safe'}->varglob('sheet_values')} =
- %{$sheet->{'values'}};
- }
-
- $depth++;
- if ($depth>100) {
- &setvalues($sheet,undef);
- return $lastcalc.': Maximum calculation depth exceeded';
- }
- }
- return ;
+ 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;
@@ -1119,7 +1096,11 @@ sub exportdata {
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'});
+ if (exists($sheet->{'values'}->{$_.'0'})) {
+ push(@exportarray,$sheet->{'values'}->{$_.'0'});
+ } else {
+ push(@exportarray,'');
+ }
}
return @exportarray;
}
@@ -1132,174 +1113,291 @@ 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<tr><td><b><font size=+1>$n</font></b></td>";
+sub get_row {
+ my ($sheet,$n) = @_;
+ my ($rowlabel,@rowdata);
+ if ($n eq '-') {
+ ($rowlabel,@rowdata) = &templaterow($sheet);
+ } elsif ($sheet->{'sheettype'} eq 'studentcalc') {
+ ($rowlabel,@rowdata) = &outrowassess($sheet,$n);
} else {
- $rowdata.="\n".'"'.$n.'"';
+ ($rowlabel,@rowdata) = &outrow($sheet,$n);
}
- my $showf=0;
+ return ($rowlabel,@rowdata);
+}
+
+########################################################################
+########################################################################
+sub sort_indicies {
+ my $sheet = shift;
#
- # Determine how many pink (uneditable) cells there are in this sheet.
- my $maxred=1;
- my $sheettype=$sheet->{'sheettype'};
- if ($sheettype eq 'studentcalc') {
- $maxred=26;
- } elsif ($sheettype eq 'assesscalc') {
- $maxred=1;
- } else {
- $maxred=26;
- }
- $maxred=1 if (&getfa($sheet,$n)=~/^[\~\-]/);
+ # Sort the rows in some manner
#
- # Get the proper row
- my @rowdata;
- if ($n eq '-') {
- @rowdata = &templaterow($sheet);
- $n=-1;
- $dataflag=1;
- } elsif ($sheettype eq 'studentcalc') {
- @rowdata = &outrowassess($sheet,$n);
- } else {
- @rowdata = &outrow($sheet,$n);
- }
- #
- foreach (@rowdata) {
- 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='<font size=+2 color='.$bgcolor.'>#</font>';
- }
- $rowdata.='<td bgcolor='.$bgcolor.'>';
- if ($ENV{'request.role'} =~ /^st\./) {
- $rowdata.=$vl;
- } else {
- $rowdata.='<a href="javascript:celledit('.$fm.');">'.
- $vl.'</a>';
- }
- $rowdata.='</td>';
- } else {
- $rowdata.='<td bgcolor='.$bgcolor.'> '.$vl.' </td>';
- }
- } else {
- $rowdata.=',"'.$vl.'"';
+ my @sortby=();
+ my @sortidx=();
+ for (my $row=1;$row<=$sheet->{'maxrow'};$row++) {
+ push (@sortby, $sheet->{'safe'}->reval('$f{"A'.$row.'"}'));
+ push (@sortidx, $row);
+ }
+ @sortidx=sort { lc($sortby[$a]) cmp lc($sortby[$b]); } @sortidx;
+ return @sortidx;
+}
+
+########################################################################
+########################################################################
+
+sub html_editable_cell {
+ my ($cell,$bgcolor) = @_;
+ my $result;
+ my ($name,$formula,$value);
+ if (defined($cell)) {
+ $name = $cell->{'name'};
+ $formula = $cell->{'formula'};
+ $value = $cell->{'value'};
+ }
+ $name = '' if (! defined($name));
+ $formula = '' if (! defined($formula));
+ if (! defined($value)) {
+ $value = '<font color="'.$bgcolor.'">#</font>';
+ if ($formula ne '') {
+ $value = '<i>undefined value</i>';
}
- $showf++;
- } # End of foreach($safeval...)
- if ($ENV{'form.showall'} || ($dataflag)) {
- return $rowdata.($ENV{'form.showcsv'}?'':'</tr>');
- } else {
- return '';
}
+ if ($value =~ /^\s*$/ ) {
+ $value = '<font color="'.$bgcolor.'">#</font>';
+ }
+ $result .= '<a href="javascript:celledit(\''.
+ $name.'\',\''.$formula.'\');">'.$value.'</a>';
+ return $result;
+}
+
+sub html_uneditable_cell {
+ my ($cell,$bgcolor) = @_;
+ my $value = (defined($cell) ? $cell->{'value'} : '');
+ return ' '.$value.' ';
}
-# ------------------------------------------------------------- Print out sheet
+########################################################################
+########################################################################
-sub outsheet {
- 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
+sub outsheet_html {
+ my ($sheet,$r) = @_;
+ my ($num_uneditable,$realm,$row_type);
if ($sheet->{'sheettype'} eq 'assesscalc') {
- $maxred=1;
- $realm='Assessment';
+ $num_uneditable = 1;
+ $realm = 'Assessment';
+ $row_type = 'Item';
} elsif ($sheet->{'sheettype'} eq 'studentcalc') {
- $maxred=26;
- $realm='User';
- }
- #
- # Column label
- my $tabledata;
- if ($ENV{'form.showcsv'}) {
- $tabledata='<pre>';
- } else {
- $tabledata='<table border=2><tr><th colspan=2 rowspan=2>'.
- '<font size=+2>'.$realm.'</font></th>'.
- '<td bgcolor=#FFDDDD colspan='.$maxred.
- '><b><font size=+1>Import</font></b></td>'.
- '<td colspan='.(52-$maxred).
- '><b><font size=+1>Calculations</font></b></td></tr><tr>';
- 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.='<td bgcolor="#FFDDDD">';
- } else {
- $tabledata.='<td>';
- }
- $tabledata.="<b><font size=+1>$_</font></b></td>";
+ $num_uneditable = 26;
+ $realm = 'User';
+ $row_type = 'Assessment';
+ } elsif ($sheet->{'sheettype'} eq 'classcalc') {
+ $num_uneditable = 26;
+ $realm = 'Course';
+ $row_type = 'Student';
+ } else {
+ return; # error
+ }
+ ####################################
+ # Print out header table
+ ####################################
+ my $num_left = 52-$num_uneditable;
+ my $tabledata =<<"END";
+<table border="2">
+<tr>
+ <th colspan="1" rowspan="2"><font size="+2">$realm</font></th>
+ <td bgcolor="#FFDDDD" colspan="$num_uneditable">
+ <b><font size="+1">Import</font></b></td>
+ <td colspan="$num_left">
+ <b><font size="+1">Calculations</font></b></td>
+</tr><tr>
+END
+ my $label_num = 0;
+ foreach (split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz')){
+ if ($label_num<$num_uneditable) {
+ $tabledata.='<td bgcolor="#FFDDDD">';
+ } else {
+ $tabledata.='<td>';
}
- $tabledata.='</tr>'.&rown($sheet,'-').
- &rown($sheet,0);
+ $tabledata.="<b><font size=+1>$_</font></b></td>";
+ $label_num++;
}
+ $tabledata.="</tr>\n";
$r->print($tabledata);
- #
- # Prepare to output rows
- my $row;
- #
- my @sortby=();
- my @sortidx=();
- for ($row=1;$row<=$sheet->{'maxrow'};$row++) {
- push (@sortby, $sheet->{'safe'}->reval('$f{"A'.$row.'"}'));
- push (@sortidx, $row-1);
+ ####################################
+ # Print out template row
+ ####################################
+ my ($rowlabel,@rowdata) = &get_row($sheet,'-');
+ my $row_html = '<tr><td>'.&format_html_rowlabel($rowlabel).'</td>';
+ my $num_cols_output = 0;
+ foreach my $cell (@rowdata) {
+ if ($num_cols_output++ < $num_uneditable) {
+ $row_html .= '<td bgcolor="#FFDDDD">';
+ $row_html .= &html_uneditable_cell($cell,'#FFDDDD');
+ } else {
+ $row_html .= '<td bgcolor="#EOFFDD">';
+ $row_html .= &html_editable_cell($cell,'#E0FFDD');
+ }
+ $row_html .= '</td>';
}
- @sortidx=sort { lc($sortby[$a]) cmp lc($sortby[$b]); } @sortidx;
- #
- # Determine the type of child spreadsheets
- my $what='Student';
- if ($sheet->{'sheettype'} eq 'assesscalc') {
- $what='Item';
- } elsif ($sheet->{'sheettype'} eq 'studentcalc') {
- $what='Assessment';
+ $row_html.= "</tr>\n";
+ $r->print($row_html);
+ ####################################
+ # Print out summary/export row
+ ####################################
+ my ($rowlabel,@rowdata) = &get_row($sheet,'0');
+ my $rowcount = 0;
+ $row_html = '<tr><td>'.&format_html_rowlabel($rowlabel).'</td>';
+ $num_cols_output = 0;
+ foreach my $cell (@rowdata) {
+ if ($num_cols_output++ < 26) {
+ $row_html .= '<td bgcolor="#CCCCFF">';
+ $row_html .= &html_editable_cell($cell,'#CCCCFF');
+ } else {
+ $row_html .= '<td bgcolor="#DDCCFF">';
+ $row_html .= &html_uneditable_cell(undef,'#CCCCFF');
+ }
+ $row_html .= '</td>';
}
+ $row_html.= "</tr>\n";
+ $r->print($row_html);
+ $r->print('</table>');
+ ####################################
+ # 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".'<tr><td><b><font size=+1>'.$rownum.
+ '</font></b></td>';
+ #
+ if ($sheet->{'sheettype'} eq 'classcalc') {
+ $row_html.='<td>'.&format_html_rowlabel($rowlabel).'</td>';
+ # Output links for each student?
+ # Nope, that is already done for us in format_html_rowlabel (for now)
+ } elsif ($sheet->{'sheettype'} eq 'studentcalc') {
+ $row_html.='<td>'.&format_html_rowlabel($rowlabel);
+ $row_html.= '<br>'.
+ '<select name="sel_'.$rownum.'" '.
+ 'onChange="changesheet('.$rownum.')">'.
+ '<option name="default">Default</option>';
+ foreach (@{$sheet->{'othersheets'}}) {
+ $row_html.='<option name="'.$_.'"';
+ #if ($ufn eq $_) {
+ # $row_html.=' selected';
+ #}
+ $row_html.='>'.$_.'</option>';
+ }
+ $row_html.='</select></td>';
+ } elsif ($sheet->{'sheettype'} eq 'assesscalc') {
+ $row_html.='<td>'.&format_html_rowlabel($rowlabel).'</td>';
+ }
+ #
+ my $shown_cells = 0;
+ foreach my $cell (@rowdata) {
+ my $value = $cell->{'value'};
+ my $formula = $cell->{'formula'};
+ my $cellname = $cell->{'name'};
+ #
+ my $bgcolor;
+ if ($shown_cells && ($shown_cells/5 == int($shown_cells/5))) {
+ $bgcolor = $defaultbg.'99';
+ } else {
+ $bgcolor = $defaultbg.'DD';
+ }
+ $bgcolor='#FFDDDD' if ($shown_cells < $num_uneditable);
+ #
+ $row_html.='<td bgcolor='.$bgcolor.'>';
+ if ($shown_cells < $num_uneditable) {
+ $row_html .= &html_uneditable_cell($cell,$bgcolor);
+ } else {
+ $row_html .= &html_editable_cell($cell,$bgcolor);
+ }
+ $row_html.='</td>';
+ $shown_cells++;
+ }
+ if ($row_html) {
+ if ($rows_output % 25 == 0) {
$r->print("</table>\n<br>\n");
$r->rflush();
- $r->print('<table border=2><tr><td> <td>'.$what.'</td>');
- $r->print('<td>'.
+ $r->print('<table border=2>'.
+ '<tr><td> <td>'.$row_type.'</td>'.
+ '<td>'.
join('</td><td>',
(split(//,'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.
'abcdefghijklmnopqrstuvwxyz'))).
"</td></tr>\n");
}
- $n++;
- $r->print($thisrow);
+ $rows_output++;
+ $r->print($row_html);
}
}
- $r->print($ENV{'form.showcsv'}?'</pre>':'</table>');
+ #
+ $r->print('</table>');
+ #
+ # Debugging code (be sure to uncomment errorlog code in safe space):
+ #
+ # $r->print("\n<pre>");
+ # $r->print(&geterrorlog($sheet));
+ # $r->print("\n</pre>");
+ return 1;
}
-#
-# ----------------------------------------------- Read list of available sheets
-#
+sub outsheet_csv {
+ my ($sheet,$r) = @_;
+ my $csvdata = '';
+ my @Values;
+ ####################################
+ # Prepare to output rows
+ ####################################
+ my @Rows = &sort_indicies($sheet);
+ #
+ # Loop through the rows and output them one at a time
+ my $rows_output=0;
+ foreach my $rownum (@Rows) {
+ my ($rowlabel,@rowdata) = &get_row($sheet,$rownum);
+ push (@Values,&format_csv_rowlabel($rowlabel));
+ foreach my $cell (@rowdata) {
+ push (@Values,'"'.$cell->{'value'}.'"');
+ }
+ $csvdata.= join(',',@Values)."\n";
+ @Values = ();
+ }
+ #
+ $r->print('<pre>'.$csvdata."\n</pre>");
+ #
+ return 1;
+}
+
+sub outsheet_excel {
+ my ($sheet,$r) = @_;
+}
+
+sub outsheet_xml {
+ my ($sheet,$r) = @_;
+}
+
+sub outsheet {
+ my ($r,$sheet)=@_;
+ if (exists($ENV{'form.showcsv'})) {
+ &outsheet_csv($sheet,$r);
+# } elsif (exists($ENV{'form.excel'})) {
+# &outsheet_excel($sheet,$r);
+# } elsif (exists($ENV{'form.xml'})) {
+# &outsheet_xml($sheet,$r);
+ } else {
+ &outsheet_html($sheet,$r);
+ }
+}
+
+########################################################################
+########################################################################
sub othersheets {
my ($sheet,$stype)=@_;
$stype = $sheet->{'sheettype'} if (! defined($stype));
@@ -1317,7 +1415,6 @@ sub othersheets {
return @alternatives;
}
-
#
# -------------------------------------- Parse a spreadsheet
#
@@ -1381,7 +1478,8 @@ sub readsheet {
my $fstring='';
if ($fstring=$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}) {
my %tmp = split(/___;___/,$fstring);
- &setformulas($sheet,\%tmp);
+ $sheet->{'f'} = \%tmp;
+ &setformulas($sheet);
} else {
# Not cached, need to read
my %f=();
@@ -1416,7 +1514,8 @@ sub readsheet {
}
# Cache and set
$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f);
- &setformulas($sheet,\%f);
+ $sheet->{'f'}=\%f;
+ &setformulas($sheet);
}
}
@@ -1470,31 +1569,19 @@ sub writesheet {
# Cache new sheet
$spreadsheets{$cnum.'_'.$cdom.'_'.$stype.'_'.$fn}=join('___;___',%f);
# Write sheet
- my $sheetdata='';
foreach (keys(%f)) {
- unless ($f{$_} eq 'import') {
- $sheetdata.=&Apache::lonnet::escape($_).'='.
- &Apache::lonnet::escape($f{$_}).'&';
- }
+ delete($f{$_}) if ($f{$_} eq 'import');
}
- $sheetdata=~s/\&$//;
- my $reply=&Apache::lonnet::reply('put:'.$cdom.':'.$cnum.':'.$fn.':'.
- $sheetdata,$chome);
+ my $reply = &Apache::lonnet::put($fn,\%f,$cdom,$cnum);
if ($reply eq 'ok') {
- $reply=&Apache::lonnet::reply('put:'.$cdom.':'.$cnum.':'.
- $stype.'_spreadsheets:'.
- &Apache::lonnet::escape($fn).
- '='.$ENV{'user.name'}.'@'.
- $ENV{'user.domain'},
- $chome);
+ $reply = &Apache::lonnet::put($stype.'_spreadsheets',
+ {$fn => $ENV{'user.name'}.'@'.$ENV{'user.domain'}},
+ $cdom,$cnum);
if ($reply eq 'ok') {
if ($makedef) {
- return &Apache::lonnet::reply('put:'.$cdom.':'.$cnum.
- ':environment:'.
- 'spreadsheet_default_'.
- $stype.'='.
- &Apache::lonnet::escape($fn),
- $chome);
+ return &Apache::lonnet::put('environment',
+ {'spreadsheet_default_'.$stype => $fn },
+ $cdom,$cnum);
}
return $reply;
}
@@ -1547,7 +1634,7 @@ sub tmpread {
}
}
if ($nform eq 'changesheet') {
- $fo{'A'.$nfield}=(split(/\_\_\&\&\&\_\_/,$fo{'A'.$nfield}))[0];
+ $fo{'A'.$nfield}=(split(/__&&&\__/,$fo{'A'.$nfield}))[0];
unless ($ENV{'form.sel_'.$nfield} eq 'Default') {
$fo{'A'.$nfield}.='__&&&__'.$ENV{'form.sel_'.$nfield};
}
@@ -1562,7 +1649,8 @@ sub tmpread {
} else {
if ($nfield) { $fo{$nfield}=$nform; }
}
- &setformulas($sheet,\%fo);
+ $sheet->{'f'}=\%fo;
+ &setformulas($sheet);
}
##################################################
@@ -1640,6 +1728,76 @@ sub parmval {
return &Apache::lonnet::metadata($fn,$rwhat.'.default');
}
+
+##################################################################
+## Row label formatting routines ##
+##################################################################
+sub format_html_rowlabel {
+ my $rowlabel = shift;
+ return '' if ($rowlabel eq '');
+ my ($type,$labeldata) = split(':',$rowlabel,2);
+ my $result = '';
+ if ($type eq 'symb') {
+ my ($symb,$uname,$udom,$title) = split(':',$labeldata);
+ $symb = &Apache::lonnet::unescape($symb);
+ $result = '<a href="/adm/assesscalc?usymb='.$symb.
+ '&uname='.$uname.'&udom='.$udom.'">'.$title.'</a>';
+ } elsif ($type eq 'student') {
+ my ($sname,$sdom,$fullname,$section,$id) = split(':',$labeldata);
+ $result ='<a href="/adm/studentcalc?uname='.$sname.
+ '&udom='.$sdom.'">';
+ $result.=$section.' '.$id." ".$fullname.'</a>';
+ } elsif ($type eq 'parameter') {
+ $result = $labeldata;
+ } else {
+ $result = '<b><font size=+1>'.$rowlabel.'</font></b>';
+ }
+ return $result;
+}
+
+sub format_csv_rowlabel {
+ my $rowlabel = shift;
+ return '' if ($rowlabel eq '');
+ my ($type,$labeldata) = split(':',$rowlabel,2);
+ my $result = '';
+ if ($type eq 'symb') {
+ my ($symb,$uname,$udom,$title) = split(':',$labeldata);
+ $symb = &Apache::lonnet::unescape($symb);
+ $result = $title;
+ } elsif ($type eq 'student') {
+ my ($sname,$sdom,$fullname,$section,$id) = split(':',$labeldata);
+ $result = join('","',($sname,$sdom,$fullname,$section,$id));
+ } elsif ($type eq 'parameter') {
+ $labeldata =~ s/<br>/ /g;
+ $result = $labeldata;
+ } else {
+ $result = $rowlabel;
+ }
+ return '"'.$result.'"';
+}
+
+sub format_plain_rowlabel {
+ my $rowlabel = shift;
+ return '' if ($rowlabel eq '');
+ my ($type,$labeldata) = split(':',$rowlabel,2);
+ my $result = '';
+ if ($type eq 'symb') {
+ my ($symb,$uname,$udom,$title) = split(':',$labeldata);
+ $symb = &Apache::lonnet::unescape($symb);
+ $result = $title;
+ } elsif ($type eq 'student') {
+ my ($sname,$sdom,$fullname,$section,$id) = split(':',$labeldata);
+ $result = '"'.
+ join('","',($sname,$sdom,$fullname,$section,$id).'"');
+ } elsif ($type eq 'parameter') {
+ $labeldata =~ s/<br>/ /g;
+ $result = $labeldata;
+ } else {
+ $result = $rowlabel;
+ }
+ return $result;
+}
+
# ---------------------------------------------- Update rows for course listing
sub updateclasssheet {
my ($sheet) = @_;
@@ -1662,17 +1820,9 @@ sub updateclasssheet {
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='<a href="/adm/studentcalc?uname='.$studentName.
- '&udom='.$studentDomain.'">';
- $rowlabel.=$studentSection.' '.$id." ".$fullname;
- $rowlabel.='</a>';
- }
- $currentlist{$student}=$rowlabel;
+ $currentlist{$student}=join(':',('student',$studentName,
+ $studentDomain,$fullname,
+ $studentSection,$id));
}
}
#
@@ -1700,73 +1850,60 @@ sub updateclasssheet {
}
#
# New and unknown keys
- foreach (sort keys(%currentlist)) {
- unless ($existing{$_}) {
+ foreach my $student (sort keys(%currentlist)) {
+ unless ($existing{$student}) {
$changed=1;
$sheet->{'maxrow'}++;
- $f{'A'.$sheet->{'maxrow'}}=$_;
+ $f{'A'.$sheet->{'maxrow'}}=$student;
}
}
if ($changed) {
- &setformulas($sheet,\%f);
+ $sheet->{'f'} = \%f;
+ &setformulas($sheet,%f);
}
#
- $sheet->{'rowlabel'} = \%currentlist;
- &setrowlabels($sheet);
+ &setrowlabels($sheet,\%currentlist);
}
# ----------------------------------- Update rows for student and assess sheets
sub updatestudentassesssheet {
my ($sheet) = @_;
+ #
my %bighash;
- my $stype=$sheet->{'sheettype'};
- my $uname=$sheet->{'uname'};
- my $udom =$sheet->{'udom'};
+ #
+ my $stype = $sheet->{'sheettype'};
+ my $uname = $sheet->{'uname'};
+ my $udom = $sheet->{'udom'};
$sheet->{'rowlabel'} = {};
- if ($updatedata
- {$ENV{'request.course.fn'}.'_'.$stype.'_'.$uname.'_'.$udom}) {
- %{$sheet->{'rowlabel'}}=split(/___;___/,
- $updatedata{$ENV{'request.course.fn'}.
- '_'.$stype.'_'.$uname.'_'.$udom});
+ my $identifier =$sheet->{'coursefilename'}.'_'.$stype.'_'.$uname.'_'.$udom;
+ if ($updatedata{$identifier}) {
+ %{$sheet->{'rowlabel'}}=split(/___;___/,$updatedata{$identifier});
} else {
# Tie hash
- tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
+ tie(%bighash,'GDBM_File',$sheet->{'coursefilename'}.'.db',
&GDBM_READER(),0640);
if (! tied(%bighash)) {
return 'Could not access course data';
}
# Get all assessments
- my %allkeys=('timestamp' =>
- 'Timestamp of Last Transaction<br>timestamp',
- 'subnumber' =>
- 'Number of Submissions<br>subnumber',
- 'tutornumber' =>
- 'Number of Tutor Responses<br>tutornumber',
- 'totalpoints' =>
- 'Total Points Granted<br>totalpoints');
- my $adduserstr='';
- if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})){
- $adduserstr='&uname='.$uname.'&udom='.$udom;
- }
- my %allassess;
- if (! $ENV{'form.showcsv'}) {
- %allassess =
- ('_feedback' =>'<a href="/adm/assesscalc?usymb=_feedback'.
- $adduserstr.'">Feedback</a>',
- '_evaluation' =>'<a href="/adm/assesscalc?usymb=_evaluation'.
- $adduserstr.'">Evaluation</a>',
- '_tutoring' =>'<a href="/adm/assesscalc?usymb=_tutoring'.
- $adduserstr.'">Tutoring</a>',
- '_discussion' =>'<a href="/adm/assesscalc?usymb=_discussion'.
- $adduserstr.'">Discussion</a>'
- );
- } else {
- %allassess =
- ('_feedback' => "Feedback",
- '_evaluation' => "Evaluation",
- '_tutoring' => "Tutoring",
- '_discussion' => "Discussion",
- );
+ #
+ # parameter_labels is used in the assessment sheets to provide labels
+ # for the parameters.
+ my %parameter_labels=
+ ('timestamp' =>
+ 'parameter:Timestamp of Last Transaction<br>timestamp',
+ 'subnumber' =>
+ 'parameter:Number of Submissions<br>subnumber',
+ 'tutornumber' =>
+ 'parameter:Number of Tutor Responses<br>tutornumber',
+ 'totalpoints' =>
+ 'parameter:Total Points Granted<br>totalpoints');
+ #
+ # assesslist holds the descriptions of all assessments
+ my %assesslist;
+ foreach ('Feedback','Evaluation','Tutoring','Discussion') {
+ my $symb = '_'.lc($_);
+ $assesslist{$symb} = join(':',('symb',$symb,$uname,$udom,$_));
}
while (($_,undef) = each(%bighash)) {
next if ($_!~/^src\_(\d+)\.(\d+)$/);
@@ -1778,13 +1915,8 @@ sub updatestudentassesssheet {
my $symb=
&Apache::lonnet::declutter($bighash{'map_id_'.$mapid}).
'___'.$resid.'___'.&Apache::lonnet::declutter($srcf);
- if (! $ENV{'form.showcsv'}) {
- $allassess{$symb}=
- '<a href="/adm/assesscalc?usymb='.$symb.$adduserstr.'">'.
- $bighash{'title_'.$id}.'</a>';
- } else {
- $allassess{$symb}=$bighash{'title_'.$id};
- }
+ $assesslist{$symb}='symb:'.&Apache::lonnet::escape($symb).':'
+ .$uname.':'.$udom.':'.$bighash{'title_'.$id};
next if ($stype ne 'assesscalc');
foreach my $key (split(/\,/,
&Apache::lonnet::metadata($srcf,'keys')
@@ -1797,22 +1929,24 @@ sub updatestudentassesssheet {
&Apache::lonnet::metadata($srcf,$key.'.name');
}
$display.='<br>'.$key;
- $allkeys{$key}=$display;
+ $parameter_labels{$key}='parameter:'.$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
+ # %parameter_labels has a list of storage and parameter displays by
+ # unikey
+ # %assesslist has a list of all resource, by symb
#
if ($stype eq 'assesscalc') {
- $sheet->{'rowlabel'} = \%allkeys;
+ $sheet->{'rowlabel'} = \%parameter_labels;
} elsif ($stype eq 'studentcalc') {
- $sheet->{'rowlabel'} = \%allassess;
+ $sheet->{'rowlabel'} = \%assesslist;
}
- $updatedata{$ENV{'request.course.fn'}.'_'.$stype.'_'.$uname.'_'.$udom}=
- join('___;___',%{$sheet->{'rowlabel'}});
+ $updatedata{$sheet->{'coursefilename'}.'_'.$stype.'_'
+ .$uname.'_'.$udom}=
+ join('___;___',%{$sheet->{'rowlabel'}});
# Get current from cache
}
# Find discrepancies between the course row table and this
@@ -1849,9 +1983,9 @@ sub updatestudentassesssheet {
}
}
if ($changed) {
- &setformulas($sheet,\%f);
+ $sheet->{'f'} = \%f;
+ &setformulas($sheet);
}
- &setrowlabels($sheet);
#
undef %existing;
}
@@ -1879,7 +2013,7 @@ sub loadstudent {
my $row=$1;
next if (($f{$_}=~/^[\!\~\-]/) || ($row==0));
my ($usy,$ufn)=split(/__&&&\__/,$f{$_});
- @assessdata=&exportsheet($sheet->{'uname'},
+ @assessdata=&exportsheet($sheet,$sheet->{'uname'},
$sheet->{'udom'},
'assesscalc',$usy,$ufn);
my $index=0;
@@ -1901,7 +2035,8 @@ sub loadstudent {
}
$cachedassess='';
undef %cachedstores;
- &setformulas($sheet,\%f);
+ $sheet->{'f'} = \%f;
+ &setformulas($sheet);
&setconstants($sheet,\%c);
}
@@ -1935,8 +2070,8 @@ ENDPOP
next if ($_!~/^A(\d+)/);
my $row=$1;
next if (($f{$_}=~/^[\!\~\-]/) || ($row==0));
- my @studentdata=&exportsheet(split(/\:/,$f{$_}),
- 'studentcalc');
+ my ($sname,$sdom) = split(':',$f{$_});
+ my @studentdata=&exportsheet($sheet,$sname,$sdom,'studentcalc');
undef %userrdatas;
$now++;
$r->print('<script>popwin.document.popremain.remaining.value="'.
@@ -1947,7 +2082,7 @@ ENDPOP
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]) {
+ if (defined($studentdata[$index])) {
my $col=$_;
if ($studentdata[$index]=~/\D/) {
$c{$col.$row}="'".$studentdata[$index]."'";
@@ -1957,11 +2092,12 @@ ENDPOP
unless ($col eq 'A') {
$f{$col.$row}='import';
}
- $index++;
- }
+ }
+ $index++;
}
}
- &setformulas($sheet,\%f);
+ $sheet->{'f'}=\%f;
+ &setformulas($sheet);
&setconstants($sheet,\%c);
$r->print('<script>popwin.close()</script>');
$r->rflush();
@@ -2066,21 +2202,21 @@ sub loadassessment {
if (tie(%parmhash,'GDBM_File',
$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{$_},$sheet);
- $c{$_}=$val;
- $c{$f{$_}}=$val;
+ foreach my $cell (keys(%f)) {
+ next if ($cell !~ /^A/);
+ next if ($f{$cell} =~/^[\!\~\-]/);
+ if ($f{$cell}=~/^parameter/) {
+ if (defined($thisassess{$f{$cell}})) {
+ my $val = &parmval($f{$cell},$sheet);
+ $c{$cell} = $val;
+ $c{$f{$cell}} = $val;
}
} else {
- my $key=$f{$_};
+ my $key=$f{$cell};
my $ckey=$key;
$key=~s/^stores\_/resource\./;
$key=~s/\_/\./g;
- $c{$_}=$returnhash{$key};
+ $c{$cell}=$returnhash{$key};
$c{$ckey}=$returnhash{$key};
}
}
@@ -2178,10 +2314,17 @@ sub forcedrecalc {
}
# ============================================================== Export handler
+# exportsheet
+# returns the export row for a spreadsheet.
+#
sub exportsheet {
- my ($uname,$udom,$stype,$usymb,$fn)=@_;
+ my ($sheet,$uname,$udom,$stype,$usymb,$fn)=@_;
+ $uname = $uname || $sheet->{'uname'};
+ $udom = $udom || $sheet->{'udom'};
+ $stype = $stype || $sheet->{'sheettype'};
my @exportarr=();
- if (defined($usymb) && ($usymb=~/^\_(\w+)/) && (!$fn)) {
+ if (defined($usymb) && ($usymb=~/^\_(\w+)/) &&
+ (!defined($fn) || $fn eq '')) {
$fn='default_'.$1;
}
#
@@ -2198,7 +2341,7 @@ sub exportsheet {
}
}
unless ($found) {
- &cachedssheets($uname,$udom,&Apache::lonnet::homeserver($uname,$udom));
+ &cachedssheets($sheet,$uname,$udom);
if ($oldsheets{$key}) {
foreach (split(/___&\___/,$oldsheets{$key})) {
my ($name,$value)=split(/___=___/,$_);
@@ -2226,53 +2369,55 @@ sub exportsheet {
#
# Not cached
#
- my ($sheet)=&makenewsheet($uname,$udom,$stype,$usymb);
- &readsheet($sheet,$fn);
- &updatesheet($sheet);
- &loadrows($sheet);
- &calcsheet($sheet);
- @exportarr=&exportdata($sheet);
+ my ($newsheet)=&makenewsheet($uname,$udom,$stype,$usymb);
+ &readsheet($newsheet,$fn);
+ &updatesheet($newsheet);
+ &loadrows($newsheet);
+ &calcsheet($newsheet);
+ @exportarr=&exportdata($newsheet);
+ ##
+ ## Store now
+ ##
#
- # Store now
+ # load in the old value
#
- 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;
+ if ($stype eq 'studentcalc') {
+ my @tmp = &Apache::lonnet::get('nohist_calculatedsheets',
+ [$key],
+ $sheet->{'cdom'},$sheet->{'cnum'});
+ if ($tmp[0]!~/^error/) {
+ %currentlystored = @tmp;
+ }
+ } else {
+ my @tmp = &Apache::lonnet::get('nohist_calculatedsheets_'.
+ $sheet->{'cid'},[$key],
+ $sheet->{'udom'},$sheet->{'uname'});
+ if ($tmp[0]!~/^error/) {
+ %currentlystored = @tmp;
}
}
+ #
+ # Add the new line
+ #
$currentlystored{$fn}=join('___;___',@exportarr);
#
+ # Stick everything back together
+ #
my $newstore='';
foreach (keys(%currentlystored)) {
if ($newstore) { $newstore.='___&___'; }
$newstore.=$_.'___=___'.$currentlystored{$_};
}
my $now=time;
+ #
+ # Store away the new value
+ #
if ($stype eq 'studentcalc') {
&Apache::lonnet::put('nohist_calculatedsheets',
{ $key => $newstore,
$key.time => $now },
- $ENV{'course.'.$cid.'.domain'},
- $ENV{'course.'.$cid.'.num'})
+ $sheet->{'cdom'},$sheet->{'cnum'});
} else {
&Apache::lonnet::put('nohist_calculatedsheets_'.$sheet->{'cid'},
{ $key => $newstore,
@@ -2290,17 +2435,11 @@ sub exportsheet {
sub expirationdates {
undef %expiredates;
my $cid=$ENV{'request.course.id'};
- my $reply=&Apache::lonnet::reply('dump:'.
- $ENV{'course.'.$cid.'.domain'}.':'.
- $ENV{'course.'.$cid.'.num'}.
- ':nohist_expirationdates',
- $ENV{'course.'.$cid.'.home'});
- unless ($reply=~/^error\:/) {
- foreach (split(/\&/,$reply)) {
- my ($name,$value)=split(/\=/,$_);
- $expiredates{&Apache::lonnet::unescape($name)}
- =&Apache::lonnet::unescape($value);
- }
+ my @tmp = &Apache::lonnet::dump('nohist_expirationdates',
+ $ENV{'course.'.$cid.'.domain'},
+ $ENV{'course.'.$cid.'.num'});
+ if (lc($tmp[0])!~/^error/){
+ %expiredates = @tmp;
}
}
@@ -2311,16 +2450,13 @@ sub expirationdates {
sub cachedcsheets {
my $cid=$ENV{'request.course.id'};
- my $reply=&Apache::lonnet::reply('dump:'.
- $ENV{'course.'.$cid.'.domain'}.':'.
- $ENV{'course.'.$cid.'.num'}.
- ':nohist_calculatedsheets',
- $ENV{'course.'.$cid.'.home'});
- unless ($reply=~/^error\:/) {
- foreach ( split(/\&/,$reply)) {
- my ($name,$value)=split(/\=/,$_);
- $oldsheets{&Apache::lonnet::unescape($name)}
- =&Apache::lonnet::unescape($value);
+ my @tmp = &Apache::lonnet::dump('nohist_calculatedsheets',
+ $ENV{'course.'.$cid.'.domain'},
+ $ENV{'course.'.$cid.'.num'});
+ if ($tmp[0] !~ /^error/) {
+ my %StupidTempHash = @tmp;
+ while (my ($key,$value) = each %StupidTempHash) {
+ $oldsheets{$key} = $value;
}
}
}
@@ -2331,22 +2467,21 @@ sub cachedcsheets {
#
sub cachedssheets {
- my ($sname,$sdom,$shome)=@_;
- unless (($loadedcaches{$sname.'_'.$sdom}) || ($shome eq 'no_host')) {
- my $cid=$ENV{'request.course.id'};
- my $reply=&Apache::lonnet::reply('dump:'.$sdom.':'.$sname.
- ':nohist_calculatedsheets_'.
- $ENV{'request.course.id'},
- $shome);
- unless ($reply=~/^error\:/) {
- foreach ( split(/\&/,$reply)) {
- my ($name,$value)=split(/\=/,$_);
- $oldsheets{&Apache::lonnet::unescape($name)}
- =&Apache::lonnet::unescape($value);
+ my ($sheet,$uname,$udom) = @_;
+ $uname = $uname || $sheet->{'uname'};
+ $udom = $udom || $sheet->{'udom'};
+ if (! $loadedcaches{$sheet->{'uname'}.'_'.$sheet->{'udom'}}) {
+ my @tmp = &Apache::lonnet::dump('nohist_calculatedsheets',
+ $sheet->{'udom'},
+ $sheet->{'uname'});
+ if ($tmp[0] !~ /^error/) {
+ my %StupidTempHash = @tmp;
+ while (my ($key,$value) = each %StupidTempHash) {
+ $oldsheets{$key} = $value;
+ }
+ $loadedcaches{$sheet->{'uname'}.'_'.$sheet->{'udom'}}=1;
}
}
- $loadedcaches{$sname.'_'.$sdom}=1;
- }
}
# ===================================================== Calculated sheets cache
@@ -2561,7 +2696,7 @@ ENDSCRIPT
} elsif ($sheet->{'sheettype'} eq 'studentcalc') {
$r->print("Loading previously calculated assessment sheets ...\n");
$r->rflush();
- &cachedssheets($sheet->{'uname'},$sheet->{'udom'},$sheet->{'uhome'});
+ &cachedssheets($sheet);
}
# Update sheet, load rows
$r->print("Loaded sheet(s), updating rows ...<br>\n");
@@ -2609,7 +2744,7 @@ ENDSCRIPT
} else {
unless ($ENV{'form.userselhidden'}) {
unless
- ($ENV{'course.'.$ENV{'request.course.id'}.'.hideemptyrows'} eq 'yes') {
+ ($ENV{'course.'.$sheet->{'cid'}.'.hideemptyrows'} eq 'yes') {
$r->print(' checked');
$ENV{'form.showall'}=1;
}