loncom/interface/lonspreadsheet.pm - diff

Return to lonspreadsheet.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/Attic/lonspreadsheet.pm between versions 1.140 and 1.151

version 1.140, 2002/11/15 18:19:10	version 1.151, 2002/12/02 16:39:30
Line 965 sub templaterow {	Line 965 sub templaterow {
'N','O','P','Q','R','S','T','U','V','W','X','Y','Z',	'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',	'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') {	'n','o','p','q','r','s','t','u','v','w','x','y','z') {
my $fm=$sheet->{'f'}->{'template_'.$_};
$fm=~s/[\'\"]/\&\#34;/g;
push(@cols,{ name => 'template_'.$_,	push(@cols,{ name => 'template_'.$_,
formula => $fm,	formula => $sheet->{'f'}->{'template_'.$_},
value => $fm });	value => $sheet->{'f'}->{'template_'.$_} });
}	}
return ($rowlabel,@cols);	return ($rowlabel,@cols);
}	}
Line 993 sub outrowassess {	Line 991 sub outrowassess {
'N','O','P','Q','R','S','T','U','V','W','X','Y','Z',	'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',	'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') {	'n','o','p','q','r','s','t','u','v','w','x','y','z') {
my $fm=$sheet->{'f'}->{$_.$n};
$fm=~s/[\'\"]/\&\#34;/g;
push(@cols,{ name => $_.$n,	push(@cols,{ name => $_.$n,
formula => $fm,	formula => $sheet->{'f'}->{$_.$n},
value => $sheet->{'values'}->{$_.$n}});	value => $sheet->{'values'}->{$_.$n}});
}	}
return ($rowlabel,@cols);	return ($rowlabel,@cols);
Line 1019 sub outrow {	Line 1015 sub outrow {
'N','O','P','Q','R','S','T','U','V','W','X','Y','Z',	'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',	'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') {	'n','o','p','q','r','s','t','u','v','w','x','y','z') {
my $fm=$sheet->{'f'}->{$_.$n};
$fm=~s/[\'\"]/\&\#34;/g;
push(@cols,{ name => $_.$n,	push(@cols,{ name => $_.$n,
formula => $fm,	formula => $sheet->{'f'}->{$_.$n},
value => $sheet->{'values'}->{$_.$n}});	value => $sheet->{'values'}->{$_.$n}});
}	}
return ($rowlabel,@cols);	return ($rowlabel,@cols);
Line 1149 sub exportdata {	Line 1143 sub exportdata {


sub update_student_sheet{	sub update_student_sheet{
my ($sheet,$c) = @_;	my ($sheet,$r,$c) = @_;
# Load in the studentcalc sheet	# Load in the studentcalc sheet
&readsheet($sheet,'default_studentcalc');	&readsheet($sheet,'default_studentcalc');
# Determine the structure (contained assessments, etc) of the sheet	# Determine the structure (contained assessments, etc) of the sheet
Line 1157 sub update_student_sheet{	Line 1151 sub update_student_sheet{
# Load in the cached sheets for this student	# Load in the cached sheets for this student
&cachedssheets($sheet);	&cachedssheets($sheet);
# Load in the (possibly cached) data from the assessment sheets	# Load in the (possibly cached) data from the assessment sheets
&loadstudent($sheet,$c);	&loadstudent($sheet,$r,$c);
# Compute the sheet	# Compute the sheet
&calcsheet($sheet);	&calcsheet($sheet);
}	}
Line 1186 sub get_row {	Line 1180 sub get_row {
########################################################################	########################################################################
sub sort_indicies {	sub sort_indicies {
my $sheet = shift;	my $sheet = shift;
#
# Sort the rows in some manner
#
my @sortby=();
my @sortidx=();	my @sortidx=();
# Skip row 0	#
for (my $row=1;$row<=$sheet->{'maxrow'};$row++) {	if ($sheet->{'sheettype'} eq 'classcalc') {
push (@sortby, $sheet->{'safe'}->reval('$f{"A'.$row.'"}'));	my @sortby=(undef);
push (@sortidx, $row);	# Skip row 0
	for (my $row=1;$row<=$sheet->{'maxrow'};$row++) {
	my (undef,$sname,$sdom,$fullname,$section,$id) =
	split(':',$sheet->{'rowlabel'}->{$sheet->{'f'}->{'A'.$row}});
	push (@sortby, lc($fullname));
	push (@sortidx, $row);
	}
	@sortidx = sort { $sortby[$a] cmp $sortby[$b]; } @sortidx;
	} elsif ($sheet->{'sheettype'} eq 'studentcalc') {
	my @sortby1=(undef);
	my @sortby2=(undef);
	# Skip row 0
	for (my $row=1;$row<=$sheet->{'maxrow'};$row++) {
	my (undef,$symb,$uname,$udom,$mapid,$resid,$title) =
	split(':',$sheet->{'rowlabel'}->{$sheet->{'f'}->{'A'.$row}});
	$symb = &Apache::lonnet::unescape($symb);
	my ($sequence) = ($symb =~ /\/([^\/]*\.sequence)/);
	if ($sequence eq '') {
	$sequence = $symb;
	}
	push (@sortby1, $sequence);
	push (@sortby2, $title);
	push (@sortidx, $row);
	}
	@sortidx = sort { $sortby1[$a] cmp $sortby1[$b] \|\|
	$sortby2[$a] cmp $sortby2[$b] } @sortidx;
	} else {
	my @sortby=(undef);
	# Skip row 0
	for (my $row=1;$row<=$sheet->{'maxrow'};$row++) {
	push (@sortby, $sheet->{'safe'}->reval('$f{"A'.$row.'"}'));
	push (@sortidx, $row);
	}
	@sortidx = sort { $sortby[$a] cmp $sortby[$b]; } @sortidx;
}	}
@sortidx=sort { lc($sortby[$a]) cmp lc($sortby[$b]); } @sortidx;
return @sortidx;	return @sortidx;
}	}

Line 1229 sub html_editable_cell {	Line 1251 sub html_editable_cell {
if ($value =~ /^\s*$/ ) {	if ($value =~ /^\s*$/ ) {
$value = '<font color="'.$bgcolor.'">#</font>';	$value = '<font color="'.$bgcolor.'">#</font>';
}	}
	&Apache::lonnet::logthis($name.' formula = '.$formula) if ($formula);
	$formula =~ s/</\</g;
	$formula =~ s/>/\>/g;
	$formula =~ s/\&/\&/g;
	$formula =~ s/\"/\"/g;
	$formula =~ s/\'/\"/g;
$formula =~ s/\n/\\n/gs;	$formula =~ s/\n/\\n/gs;
$result .= '<a href="javascript:celledit(\''.	&Apache::lonnet::logthis($name.' formula = '.$formula) if ($formula);
$name.'\',\''.$formula.'\');">'.$value.'</a>';	$result .= "<a href=\"javascript:celledit(\'".
	$name."','".$formula."');\">".$value."</a>";
	&Apache::lonnet::logthis('result = '.$result) if ($formula);
return $result;	return $result;
}	}

Line 1289 END	Line 1319 END
# Print out template row	# Print out template row
####################################	####################################
my ($rowlabel,@rowdata) = &get_row($sheet,'-');	my ($rowlabel,@rowdata) = &get_row($sheet,'-');
my $row_html = '<tr><td>'.&format_html_rowlabel($rowlabel).'</td>';	my $row_html = '<tr><td>'.&format_html_rowlabel($sheet,$rowlabel).'</td>';
my $num_cols_output = 0;	my $num_cols_output = 0;
foreach my $cell (@rowdata) {	foreach my $cell (@rowdata) {
if ($num_cols_output++ < $num_uneditable) {	if ($num_cols_output++ < $num_uneditable) {
Line 1307 END	Line 1337 END
# Print out summary/export row	# Print out summary/export row
####################################	####################################
my ($rowlabel,@rowdata) = &get_row($sheet,'0');	my ($rowlabel,@rowdata) = &get_row($sheet,'0');
$row_html = '<tr><td>'.&format_html_rowlabel($rowlabel).'</td>';	$row_html = '<tr><td>'.&format_html_rowlabel($sheet,$rowlabel).'</td>';
$num_cols_output = 0;	$num_cols_output = 0;
foreach my $cell (@rowdata) {	foreach my $cell (@rowdata) {
if ($num_cols_output++ < 26) {	if ($num_cols_output++ < 26) {
Line 1332 END	Line 1362 END
foreach my $rownum (@Rows) {	foreach my $rownum (@Rows) {
my ($rowlabel,@rowdata) = &get_row($sheet,$rownum);	my ($rowlabel,@rowdata) = &get_row($sheet,$rownum);
next if ($rowlabel =~ /^\s*$/);	next if ($rowlabel =~ /^\s*$/);
	next if (($sheet->{'sheettype'} eq 'assesscalc') &&
	(! $ENV{'form.showall'}) &&
	($rowdata[0]->{'value'} =~ /^\s*$/));
	if (! $ENV{'form.showall'} &&
	$sheet->{'sheettype'} =~ /^(studentcalc\|classcalc)$/) {
	my $row_is_empty = 1;
	foreach my $cell (@rowdata) {
	if ($cell->{'value'} !~ /^\s*$/) {
	$row_is_empty = 0;
	last;
	}
	}
	next if ($row_is_empty);
	}
#	#
my $defaultbg='#E0FF';	my $defaultbg='#E0FF';
#	#
Line 1339 END	Line 1383 END
'</font></b></td>';	'</font></b></td>';
#	#
if ($sheet->{'sheettype'} eq 'classcalc') {	if ($sheet->{'sheettype'} eq 'classcalc') {
$row_html.='<td>'.&format_html_rowlabel($rowlabel).'</td>';	$row_html.='<td>'.&format_html_rowlabel($sheet,$rowlabel).'</td>';
# Output links for each student?	# Output links for each student?
# Nope, that is already done for us in format_html_rowlabel (for now)	# Nope, that is already done for us in format_html_rowlabel (for now)
} elsif ($sheet->{'sheettype'} eq 'studentcalc') {	} elsif ($sheet->{'sheettype'} eq 'studentcalc') {
$row_html.='<td>'.&format_html_rowlabel($rowlabel);	$row_html.='<td>'.&format_html_rowlabel($sheet,$rowlabel);
$row_html.= '<br>'.	$row_html.= '<br>'.
'<select name="sel_'.$rownum.'" '.	'<select name="sel_'.$rownum.'" '.
'onChange="changesheet('.$rownum.')">'.	'onChange="changesheet('.$rownum.')">'.
Line 1357 END	Line 1401 END
}	}
$row_html.='</select></td>';	$row_html.='</select></td>';
} elsif ($sheet->{'sheettype'} eq 'assesscalc') {	} elsif ($sheet->{'sheettype'} eq 'assesscalc') {
$row_html.='<td>'.&format_html_rowlabel($rowlabel).'</td>';	$row_html.='<td>'.&format_html_rowlabel($sheet,$rowlabel).'</td>';
}	}
#	#
my $shown_cells = 0;	my $shown_cells = 0;
Line 1427 sub outsheet_csv {	Line 1471 sub outsheet_csv {
foreach my $rownum (@Rows) {	foreach my $rownum (@Rows) {
my ($rowlabel,@rowdata) = &get_row($sheet,$rownum);	my ($rowlabel,@rowdata) = &get_row($sheet,$rownum);
next if ($rowlabel =~ /^\s*$/);	next if ($rowlabel =~ /^\s*$/);
push (@Values,&format_csv_rowlabel($rowlabel));	push (@Values,&format_csv_rowlabel($sheet,$rowlabel));
foreach my $cell (@rowdata) {	foreach my $cell (@rowdata) {
push (@Values,'"'.$cell->{'value'}.'"');	push (@Values,'"'.$cell->{'value'}.'"');
}	}
Line 1488 A link to the spreadsheet will be availa	Line 1532 A link to the spreadsheet will be availa
END	END
$r->rflush();	$r->rflush();
my $starttime = time;	my $starttime = time;
foreach (keys(%f)) {	foreach my $rownum (&sort_indicies($sheet)) {
next if ($_!~/^A(\d+)/ \|\| $1 == 0 \|\| ($f{$_}=~/^[!~-]/));
$count++;	$count++;
my ($sname,$sdom) = split(':',$f{$_});	my ($sname,$sdom) = split(':',$f{'A'.$rownum});
my $student_excel_worksheet=$workbook->addworksheet($sname.'@'.$sdom);	my $student_excel_worksheet=$workbook->addworksheet($sname.'@'.$sdom);
# Create a new spreadsheet	# Create a new spreadsheet
my $studentsheet = &makenewsheet($sname,$sdom,'studentcalc',undef);	my $studentsheet = &makenewsheet($sname,$sdom,'studentcalc',undef);
# Read in the spreadsheet definition	# Read in the spreadsheet definition
&update_student_sheet($studentsheet,$c);	&update_student_sheet($studentsheet,$r,$c);
# Stuff the sheet into excel	# Stuff the sheet into excel
&export_sheet_as_excel($studentsheet,$student_excel_worksheet);	&export_sheet_as_excel($studentsheet,$student_excel_worksheet);
my $totaltime = int((time - $starttime) / $count * $sheet->{'maxrow'});	my $totaltime = int((time - $starttime) / $count * $sheet->{'maxrow'});
Line 1597 sub export_sheet_as_excel {	Line 1640 sub export_sheet_as_excel {
# Write the summary/export row #	# Write the summary/export row #
####################################	####################################
my ($rowlabel,@rowdata) = &get_row($sheet,'0');	my ($rowlabel,@rowdata) = &get_row($sheet,'0');
my $label = &format_excel_rowlabel($rowlabel);	my $label = &format_excel_rowlabel($sheet,$rowlabel);
$cols_output = 0;	$cols_output = 0;
$worksheet->write($rows_output,$cols_output++,$label);	$worksheet->write($rows_output,$cols_output++,$label);
foreach my $cell (@rowdata) {	foreach my $cell (@rowdata) {
Line 1612 sub export_sheet_as_excel {	Line 1655 sub export_sheet_as_excel {
# Loop through the rows and output them one at a time	# Loop through the rows and output them one at a time
foreach my $rownum (@Rows) {	foreach my $rownum (@Rows) {
my ($rowlabel,@rowdata) = &get_row($sheet,$rownum);	my ($rowlabel,@rowdata) = &get_row($sheet,$rownum);
next if ($rowlabel =~ /^\s*$/);	next if ($rowlabel =~ /^[\s]*$/);
$cols_output = 0;	$cols_output = 0;
my $label = &format_excel_rowlabel($rowlabel);	my $label = &format_excel_rowlabel($sheet,$rowlabel);
	if ( ! $ENV{'form.showall'} &&
	$sheet->{'sheettype'} =~ /^(studentcalc\|classcalc)$/) {
	my $row_is_empty = 1;
	foreach my $cell (@rowdata) {
	if ($cell->{'value'} !~ /^\s*$/) {
	$row_is_empty = 0;
	last;
	}
	}
	next if ($row_is_empty);
	}
$worksheet->write($rows_output,$cols_output++,$label);	$worksheet->write($rows_output,$cols_output++,$label);
if (ref($label)) {	if (ref($label)) {
$cols_output = (scalar(@$label));	$cols_output = (scalar(@$label));
Line 1641 sub outsheet_xml {	Line 1695 sub outsheet_xml {
## Outsheet - calls other outsheet_* functions	## Outsheet - calls other outsheet_* functions
##	##
sub outsheet {	sub outsheet {
my ($r,$sheet)=@_;	my ($sheet,$r)=@_;
if (! exists($ENV{'form.output'})) {	if (! exists($ENV{'form.output'})) {
$ENV{'form.output'} = 'HTML';	$ENV{'form.output'} = 'HTML';
}	}
Line 1753 sub readsheet {	Line 1807 sub readsheet {
if ($fh=Apache::File->new($includedir.'/'.$dfn)) {	if ($fh=Apache::File->new($includedir.'/'.$dfn)) {
$sheetxml=join('',<$fh>);	$sheetxml=join('',<$fh>);
} else {	} else {
$sheetxml='<field row="0" col="A">"Error"</field>';	# $sheetxml='<field row="0" col="A">"Error"</field>';
	$sheetxml='<field row="0" col="A"></field>';
}	}
%f=%{&parse_sheet(\$sheetxml)};	%f=%{&parse_sheet(\$sheetxml)};
} elsif($fn=~/\/*\.spreadsheet$/) {	} elsif($fn=~/\/*\.spreadsheet$/) {
Line 1999 sub parmval {	Line 2054 sub parmval {
## Row label formatting routines ##	## Row label formatting routines ##
##################################################################	##################################################################
sub format_html_rowlabel {	sub format_html_rowlabel {
	my $sheet = shift;
my $rowlabel = shift;	my $rowlabel = shift;
return '' if ($rowlabel eq '');	return '' if ($rowlabel eq '');
my ($type,$labeldata) = split(':',$rowlabel,2);	my ($type,$labeldata) = split(':',$rowlabel,2);
my $result = '';	my $result = '';
if ($type eq 'symb') {	if ($type eq 'symb') {
my ($symb,$uname,$udom,$mapid,$resid,$title) = split(':',$labeldata);	my ($symb,$mapid,$resid,$title) = split(':',$labeldata);
$symb = &Apache::lonnet::unescape($symb);	$symb = &Apache::lonnet::unescape($symb);
$result = '<a href="/adm/assesscalc?usymb='.$symb.	$result = '<a href="/adm/assesscalc?usymb='.$symb.
'&uname='.$uname.'&udom='.$udom.	'&uname='.$sheet->{'uname'}.'&udom='.$sheet->{'udom'}.
'&mapid='.$mapid.'&resid='.$resid.'">'.$title.'</a>';	'&mapid='.$mapid.'&resid='.$resid.'">'.$title.'</a>';
} elsif ($type eq 'student') {	} elsif ($type eq 'student') {
my ($sname,$sdom,$fullname,$section,$id) = split(':',$labeldata);	my ($sname,$sdom,$fullname,$section,$id) = split(':',$labeldata);
	if ($fullname =~ /^\s*$/) {
	$fullname = $sname.'@'.$sdom;
	}
$result ='<a href="/adm/studentcalc?uname='.$sname.	$result ='<a href="/adm/studentcalc?uname='.$sname.
'&udom='.$sdom.'">';	'&udom='.$sdom.'">';
$result.=$section.' '.$id." ".$fullname.'</a>';	$result.=$section.' '.$id." ".$fullname.'</a>';
Line 2023 sub format_html_rowlabel {	Line 2082 sub format_html_rowlabel {
}	}

sub format_csv_rowlabel {	sub format_csv_rowlabel {
	my $sheet = shift;
my $rowlabel = shift;	my $rowlabel = shift;
return '' if ($rowlabel eq '');	return '' if ($rowlabel eq '');
my ($type,$labeldata) = split(':',$rowlabel,2);	my ($type,$labeldata) = split(':',$rowlabel,2);
my $result = '';	my $result = '';
if ($type eq 'symb') {	if ($type eq 'symb') {
my ($symb,$uname,$udom,$mapid,$resid,$title) = split(':',$labeldata);	my ($symb,$mapid,$resid,$title) = split(':',$labeldata);
$symb = &Apache::lonnet::unescape($symb);	$symb = &Apache::lonnet::unescape($symb);
$result = $title;	$result = $title;
} elsif ($type eq 'student') {	} elsif ($type eq 'student') {
Line 2044 sub format_csv_rowlabel {	Line 2104 sub format_csv_rowlabel {
}	}

sub format_excel_rowlabel {	sub format_excel_rowlabel {
	my $sheet = shift;
my $rowlabel = shift;	my $rowlabel = shift;
return '' if ($rowlabel eq '');	return '' if ($rowlabel eq '');
my ($type,$labeldata) = split(':',$rowlabel,2);	my ($type,$labeldata) = split(':',$rowlabel,2);
my $result = '';	my $result = '';
if ($type eq 'symb') {	if ($type eq 'symb') {
my ($symb,$uname,$udom,$mapid,$resid,$title) = split(':',$labeldata);	my ($symb,$mapid,$resid,$title) = split(':',$labeldata);
$symb = &Apache::lonnet::unescape($symb);	$symb = &Apache::lonnet::unescape($symb);
$result = $title;	$result = $title;
} elsif ($type eq 'student') {	} elsif ($type eq 'student') {
Line 2161 sub get_student_rowlabels {	Line 2222 sub get_student_rowlabels {
my %assesslist;	my %assesslist;
foreach ('Feedback','Evaluation','Tutoring','Discussion') {	foreach ('Feedback','Evaluation','Tutoring','Discussion') {
my $symb = '_'.lc($_);	my $symb = '_'.lc($_);
$assesslist{$symb} = join(':',('symb',$symb,$uname,$udom,0,0,$_));	$assesslist{$symb} = join(':',('symb',$symb,0,0,$_));
}	}
#	#
while (my ($key,$srcf) = each(%course_db)) {	while (my ($key,$srcf) = each(%course_db)) {
Line 2174 sub get_student_rowlabels {	Line 2235 sub get_student_rowlabels {
&Apache::lonnet::declutter($course_db{'map_id_'.$mapid}).	&Apache::lonnet::declutter($course_db{'map_id_'.$mapid}).
'___'.$resid.'___'.&Apache::lonnet::declutter($srcf);	'___'.$resid.'___'.&Apache::lonnet::declutter($srcf);
$assesslist{$symb}='symb:'.&Apache::lonnet::escape($symb).':'	$assesslist{$symb}='symb:'.&Apache::lonnet::escape($symb).':'
.$uname.':'.$udom.':'.$mapid.':'.$resid.':'.	.$mapid.':'.$resid.':'.$course_db{'title_'.$id};
$course_db{'title_'.$id};
}	}
}	}
untie(%course_db);	untie(%course_db);
Line 2263 sub updatestudentassesssheet {	Line 2323 sub updatestudentassesssheet {
$sheet->{'maxrow'} = 0;	$sheet->{'maxrow'} = 0;
my %existing=();	my %existing=();
# Now obsolete rows	# Now obsolete rows
while (my ($cell, $formula) = each (%f)) {	foreach my $cell (keys(%f)) {
	my $formula = $f{$cell};
next if ($cell !~ /^A(\d+)/);	next if ($cell !~ /^A(\d+)/);
$sheet->{'maxrow'} = $1 if ($1 > $sheet->{'maxrow'});	$sheet->{'maxrow'} = $1 if ($1 > $sheet->{'maxrow'});
my ($usy,$ufn)=split(/__&&&\__/,$formula);	my ($usy,$ufn)=split(/__&&&\__/,$formula);
Line 2311 sub loadstudent{	Line 2372 sub loadstudent{
undef @tmp;	undef @tmp;
#	#
my @assessdata=();	my @assessdata=();
while (my ($cell,$value) = each (%formulas)) {	foreach my $cell (keys(%formulas)) {
	my $value = $formulas{$cell};
if(defined($c) && ($c->aborted())) {	if(defined($c) && ($c->aborted())) {
last;	last;
}	}
Line 2323 sub loadstudent{	Line 2385 sub loadstudent{
$sheet->{'udom'},	$sheet->{'udom'},
'assesscalc',$usy,$ufn,$r);	'assesscalc',$usy,$ufn,$r);
my $index=0;	my $index=0;
foreach ('A','B','C','D','E','F','G','H','I','J','K','L','M',	foreach my $col ('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') {	'N','O','P','Q','R','S','T','U','V','W','X','Y','Z') {
if (defined($assessdata[$index])) {	if (defined($assessdata[$index])) {
my $col=$_;
if ($assessdata[$index]=~/\D/) {	if ($assessdata[$index]=~/\D/) {
$constants{$col.$row}="'".$assessdata[$index]."'";	$constants{$col.$row}="'".$assessdata[$index]."'";
} else {	} else {
$constants{$col.$row}=$assessdata[$index];	$constants{$col.$row}=$assessdata[$index];
}	}
unless ($col eq 'A') {	$formulas{$col.$row}='import' if ($col ne 'A');
$formulas{$col.$row}='import';
}
}	}
$index++;	$index++;
}	}
Line 2597 sub loadrows {	Line 2656 sub loadrows {

sub checkthis {	sub checkthis {
my ($keyname,$time)=@_;	my ($keyname,$time)=@_;
return ($time<$expiredates{$keyname});	if (! exists($expiredates{$keyname})) {
	return 0;
	} else {
	return ($time<$expiredates{$keyname});
	}
}	}

sub forcedrecalc {	sub forcedrecalc {
Line 2631 sub forcedrecalc {	Line 2694 sub forcedrecalc {
#	#
sub exportsheet {	sub exportsheet {
my ($sheet,$uname,$udom,$stype,$usymb,$fn,$r)=@_;	my ($sheet,$uname,$udom,$stype,$usymb,$fn,$r)=@_;
	my $flag = 0;
$uname = $uname \|\| $sheet->{'uname'};	$uname = $uname \|\| $sheet->{'uname'};
$udom = $udom \|\| $sheet->{'udom'};	$udom = $udom \|\| $sheet->{'udom'};
$stype = $stype \|\| $sheet->{'sheettype'};	$stype = $stype \|\| $sheet->{'sheettype'};
Line 2699 sub exportsheet {	Line 2763 sub exportsheet {
[$key],	[$key],
$sheet->{'cdom'},$sheet->{'cnum'});	$sheet->{'cdom'},$sheet->{'cnum'});
if ($tmp[0]!~/^error/) {	if ($tmp[0]!~/^error/) {
%currentlystored = @tmp;	# We only got one key, so we will access it directly.
	foreach (split('___&___',$tmp[1])) {
	my ($key,$value) = split('___=___',$_);
	$key = '' if (! defined($key));
	$currentlystored{$key} = $value;
	}
}	}
} else {	} else {
my @tmp = &Apache::lonnet::get('nohist_calculatedsheets_'.	my @tmp = &Apache::lonnet::get('nohist_calculatedsheets_'.
$sheet->{'cid'},[$key],	$sheet->{'cid'},[$key],
$sheet->{'udom'},$sheet->{'uname'});	$sheet->{'udom'},$sheet->{'uname'});
if ($tmp[0]!~/^error/) {	if ($tmp[0]!~/^error/) {
%currentlystored = @tmp;	# We only got one key, so we will access it directly.
	foreach (split('___&___',$tmp[1])) {
	my ($key,$value) = split('___=___',$_);
	$key = '' if (! defined($key));
	$currentlystored{$key} = $value;
	}
}	}
}	}
#	#
Line 2725 sub exportsheet {	Line 2799 sub exportsheet {
#	#
# Store away the new value	# Store away the new value
#	#
	my $timekey = $key.'.time';
if ($stype eq 'studentcalc') {	if ($stype eq 'studentcalc') {
&Apache::lonnet::put('nohist_calculatedsheets',	my $result = &Apache::lonnet::put('nohist_calculatedsheets',
{ $key => $newstore,	{ $key => $newstore,
$key.time => $now },	$timekey => $now },
$sheet->{'cdom'},$sheet->{'cnum'});	$sheet->{'cdom'},
} else {	$sheet->{'cnum'});
&Apache::lonnet::put('nohist_calculatedsheets_'.$sheet->{'cid'},	} else {
{ $key => $newstore,	my $result = &Apache::lonnet::put('nohist_calculatedsheets_'.$sheet->{'cid'},
$key.time => $now },	{ $key => $newstore,
$sheet->{'udom'},	$timekey => $now },
$sheet->{'uname'})	$sheet->{'udom'},
	$sheet->{'uname'});
}	}
return @exportarr;	return @exportarr;
}	}
Line 2914 sub handler {	Line 2990 sub handler {

function celledit(cellname,cellformula) {	function celledit(cellname,cellformula) {
var edit_text = '';	var edit_text = '';
	// cellformula may contain less-than and greater-than symbols, so
	// we need to escape them?
edit_text +='<html><head><title>Cell Edit Window</title></head><body>';	edit_text +='<html><head><title>Cell Edit Window</title></head><body>';
edit_text += '<form name="editwinform">';	edit_text += '<form name="editwinform">';
edit_text += '<center><h3>Cell '+cellname+'</h3>';	edit_text += '<center><h3>Cell '+cellname+'</h3>';
Line 3115 ENDSCRIPT	Line 3193 ENDSCRIPT
# Write the modified worksheet	# Write the modified worksheet
$r->print('<b>Current sheet:</b> '.$sheet->{'filename'}.'</p>');	$r->print('<b>Current sheet:</b> '.$sheet->{'filename'}.'</p>');
&tmpwrite($sheet);	&tmpwrite($sheet);
if ($sheet->{'sheettype'} eq 'studentcalc') {	if ($sheet->{'sheettype'} eq 'assesscalc') {
$r->print('<p>Show rows with empty A column: ');	$r->print('<p>Show rows with empty A column: ');
} else {	} else {
$r->print('<p>Show empty rows: ');	$r->print('<p>Show empty rows: ');
Line 3147 ENDSCRIPT	Line 3225 ENDSCRIPT
}	}
$r->print('>'.$mode.'</option>'."\n");	$r->print('>'.$mode.'</option>'."\n");
}	}
if ($sheet->{'sheettype'} eq 'classcalc') {	#
$r->print('<option value="recursive excel"');	# Mulit-sheet excel takes too long and does not work at all for large
if ($ENV{'form.output'} eq 'recursive excel') {	# classes. Future inclusion of this option may be possible with the
$r->print(' selected ');	# Spreadsheet::WriteExcel::Big and speed improvements.
}	#
$r->print(">Multi-Sheet Excel</option>\n");	# if ($sheet->{'sheettype'} eq 'classcalc') {
}	# $r->print('<option value="recursive excel"');
	# if ($ENV{'form.output'} eq 'recursive excel') {
	# $r->print(' selected ');
	# }
	# $r->print(">Multi-Sheet Excel</option>\n");
	# }
$r->print("</select>\n");	$r->print("</select>\n");
#	#
if ($sheet->{'sheettype'} eq 'classcalc') {	if ($sheet->{'sheettype'} eq 'classcalc') {
Line 3171 ENDSCRIPT	Line 3254 ENDSCRIPT
#value='Insert Row Bottom'><br>	#value='Insert Row Bottom'><br>
#ENDINSERTBUTTONS	#ENDINSERTBUTTONS
# Print out sheet	# Print out sheet
&outsheet($r,$sheet);	&outsheet($sheet,$r);
$r->print('</form></body></html>');	$r->print('</form></body></html>');
# Done	# Done
return OK;	return OK;

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.140
changed lines
	Added in v.1.151