--- loncom/interface/spreadsheet/Spreadsheet.pm 2005/09/01 21:47:14 1.55
+++ loncom/interface/spreadsheet/Spreadsheet.pm 2006/03/05 21:35:10 1.64
@@ -1,5 +1,5 @@
#
-# $Id: Spreadsheet.pm,v 1.55 2005/09/01 21:47:14 albertel Exp $
+# $Id: Spreadsheet.pm,v 1.64 2006/03/05 21:35:10 bowersj2 Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -213,16 +213,8 @@ course environment. Returns 0 otherwise
sub is_default {
my $self = shift;
# Check to find out if we are the default spreadsheet (filenames match)
- my $default_filename = '';
- my %tmphash = &Apache::lonnet::get('environment',
- ['spreadsheet_default_'.
- $self->{'type'}],
- $self->{'cdom'},
- $self->{'cnum'});
- my ($tmp) = keys(%tmphash);
- if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
- $default_filename = $tmphash{'spreadsheet_default_'.$self->{'type'}};
- }
+ my $default_filename = $env{'course.'.$self->{'cid'}.
+ '.spreadsheet_default_'.$self->{'type'}};
if ($default_filename =~ /^\s*$/) {
$default_filename = 'default_'.$self->{'type'};
}
@@ -386,10 +378,12 @@ Calls the system EXT function to determi
#-------------------------------------------------------
sub EXT {
- my ($parameter) = @_;
+ my ($parameter,$specific_symb) = @_;
return '' if (! defined($parameter) || $parameter eq '');
$parameter =~ s/^parameter\./resource\./;
- my $value = &Apache::lonnet::EXT($parameter,$symb,$domain,$name,$usection);
+ if ($specific_symb eq '') { $specific_symb = $symb; }
+ my $value = &Apache::lonnet::EXT($parameter,$specific_symb,$domain,$name,
+ $usection);
return $value;
}
@@ -705,7 +699,7 @@ sub get_values {
}
return \@values;
} else {
- $num = '(\d+)';
+ $num = '([1-9]\d*)';
}
if (($la eq '*') || ($ua eq '*')) {
$alpha='[A-z]';
@@ -728,7 +722,7 @@ sub calc {
$notfinished=0;
while (my ($cell,$value) = each(%t)) {
my $old=$sheet_values{$cell};
- $sheet_values{$cell}=eval $value;
+ #$sheet_values{$cell}=eval $value;
# $errorlog .= $cell.' = '.$old.'->'.$sheet_values{$cell}."\n";
if ($@) {
undef %sheet_values;
@@ -814,7 +808,7 @@ sub expandnamed {
$result.=$thissum.'+';
}
$result=~s/\+$//;
- return $result;
+ return '('.$result.')';
} else {
return 0;
}
@@ -1201,12 +1195,19 @@ sub display {
last;
}
}
+ $self->{outputmode} = $outputmode;
if ($outputmode eq 'html') {
$self->compute($r);
$self->outsheet_html($r);
} elsif ($outputmode eq 'htmlclasslist') {
# No computation neccessary... This is kludgy
$self->outsheet_htmlclasslist($r);
+ } elsif ($outputmode eq 'source') {
+ # No computation necessary. Rumor has it that this is some
+ # sort of kludge w.r.t. not "computing". It's also
+ # a bit of of a kludge that we call "outsheet_html" and
+ # let the 'outputmode' cause the outputting of source.
+ $self->outsheet_html($r);
} elsif ($outputmode eq 'excel') {
$self->compute($r);
$self->outsheet_excel($r);
@@ -1246,10 +1247,12 @@ sub html_export_row {
foreach my $cell (@rowdata) {
if ($cell->{'name'} =~ /^[A-Z]/) {
$row_html .= '<td bgcolor="'.$color.'">'.
- &html_editable_cell($cell,$color,$allowed).'</td>';
+ &html_editable_cell($cell,$color,$allowed,
+ $self->{outputmode} eq 'source').'</td>';
} else {
$row_html .= '<td bgcolor="#DDCCFF">'.
- &html_editable_cell($cell,'#DDCCFF',$allowed).'</td>';
+ &html_editable_cell($cell,'#DDCCFF',$allowed,
+ $self->{outputmode} eq 'source').'</td>';
}
}
return $row_html;
@@ -1269,14 +1272,15 @@ sub html_template_row {
&html_uneditable_cell($cell,'#FFDDDD',$allowed).'</td>';
} else {
$row_html .= '<td bgcolor="#EOFFDD">'.
- &html_editable_cell($cell,'#EOFFDD',$allowed).'</td>';
+ &html_editable_cell($cell,'#EOFFDD',$allowed,
+ $self->{outputmode} eq 'source').'</td>';
}
}
return $row_html;
}
sub html_editable_cell {
- my ($cell,$bgcolor,$allowed) = @_;
+ my ($cell,$bgcolor,$allowed,$showsource) = @_;
my $result;
my ($name,$formula,$value);
if (defined($cell)) {
@@ -1286,7 +1290,15 @@ sub html_editable_cell {
}
$name = '' if (! defined($name));
$formula = '' if (! defined($formula));
- if (! defined($value)) {
+ if ($showsource)
+ {
+ if (!defined($formula) || $formula =~ /^\s*$/) {
+ $value = '<font color="'.$bgcolor.'">#</font>';
+ } else {
+ $value = &HTML::Entities::encode($formula, '<>&"');
+ }
+ }
+ elsif (! defined($value)) {
$value = '<font color="'.$bgcolor.'">#</font>';
if ($formula ne '') {
$value = '<i>undefined value</i>';
@@ -1339,7 +1351,8 @@ sub html_row {
$row_html .= &html_uneditable_cell($cell,'#FFDDDD');
} else {
$row_html .= '<td bgcolor="#EOFFDD">';
- $row_html .= &html_editable_cell($cell,'#E0FFDD',$allowed);
+ $row_html .= &html_editable_cell($cell,'#E0FFDD',$allowed,
+ $self->{outputmode} eq 'source');
}
$row_html .= '</td>';
}
@@ -1363,6 +1376,8 @@ sub output_options {
description => 'HTML'},
{value => 'excel',
description => 'Excel'},
+ {value => 'source',
+ description => 'Show Source'},
# {value => 'xml',
# description => 'XML'},
{value => 'csv',
@@ -1631,7 +1646,7 @@ sub load {
$self->{'row_source'}=$spreadsheets{$cachekey}->{'row_source'};
$self->{'row_numbers'}=$spreadsheets{$cachekey}->{'row_numbers'};
$self->{'maxrow'}=$spreadsheets{$cachekey}->{'maxrow'};
- } else {
+ } else {
# Not cached, need to read
if (! defined($filename)) {
$formulas = $self->load_system_default_sheet();
@@ -1664,24 +1679,33 @@ sub load {
$formulas = $self->load_system_default_sheet();
}
}
- $filename=$self->filename(); # filename may have changed
- $cachekey = join('_',($cnum,$cdom,$stype,$filename));
- if (ref($formulas) eq 'HASH') {
- %{$spreadsheets{$cachekey}->{'formulas'}} = %{$formulas};
- }
$self->formulas($formulas);
$self->set_row_sources();
$self->set_row_numbers();
- if (ref($self->{'row_source'})) {
- %{$spreadsheets{$cachekey}->{'row_source'}} =
- %{$self->{'row_source'}};
- }
- if (ref($self->{'row_numbers'})) {
- %{$spreadsheets{$cachekey}->{'row_numbers'}} =
- %{$self->{'row_numbers'}};
- }
- $spreadsheets{$cachekey}->{'maxrow'} = $self->{'maxrow'};
+ $self->cache_sheet($formulas);
+ }
+}
+
+sub cache_sheet {
+ my $self = shift;
+ my ($formulas) = @_;
+ my $stype = $self->{'type'};
+ my $cnum = $self->{'cnum'};
+ my $cdom = $self->{'cdom'};
+ #
+ my $filename = $self->filename();
+ my $cachekey = join('_',($cnum,$cdom,$stype,$filename));
+
+ if (ref($formulas) eq 'HASH') {
+ %{$spreadsheets{$cachekey}->{'formulas'}} = %{$formulas};
+ }
+ if (ref($self->{'row_source'})) {
+ %{$spreadsheets{$cachekey}->{'row_source'}} =%{$self->{'row_source'}};
+ }
+ if (ref($self->{'row_numbers'})) {
+ %{$spreadsheets{$cachekey}->{'row_numbers'}}=%{$self->{'row_numbers'}};
}
+ $spreadsheets{$cachekey}->{'maxrow'} = $self->{'maxrow'};
}
sub set_row_sources {
@@ -1733,9 +1757,8 @@ sub save {
my $cnum = $self->{'cnum'};
my $cdom = $self->{'cdom'};
my $filename = $self->{'filename'};
- my $cachekey = join('_',($cnum,$cdom,$stype,$filename));
# Cache new sheet
- %{$spreadsheets{$cachekey}->{'formulas'}}=%f;
+ $self->cache_sheet(\%f);
# Write sheet
foreach (keys(%f)) {
delete($f{$_}) if ($f{$_} eq 'import');