version 1.70, 2006/09/03 00:39:57
|
version 1.71, 2006/09/03 00:45:51
|
Line 172 sub filename {
|
Line 172 sub filename {
|
$newfilename = 'default_'.$self->{'type'}; |
$newfilename = 'default_'.$self->{'type'}; |
} |
} |
} |
} |
if ($newfilename !~ /\w/ || $newfilename =~ /^\W*$/) { |
if ($newfilename eq &mt('LON-CAPA Standard')) { |
$newfilename = 'default_'.$self->{'type'}; |
undef($newfilename); |
} |
} else { |
if ($newfilename !~ /^default\.$self->{'type'}$/ && |
if ($newfilename !~ /\w/ || $newfilename =~ /^\W*$/) { |
$newfilename !~ /^\/res\/(.*)spreadsheet$/) { |
$newfilename = 'default_'.$self->{'type'}; |
if ($newfilename !~ /_$self->{'type'}$/) { |
} |
$newfilename =~ s/[\s_]*$//; |
if ($newfilename !~ /^default\.$self->{'type'}$/ && |
$newfilename .= '_'.$self->{'type'}; |
$newfilename !~ /^\/res\/(.*)spreadsheet$/) { |
} |
if ($newfilename !~ /_$self->{'type'}$/) { |
} |
$newfilename =~ s/[\s_]*$//; |
|
$newfilename .= '_'.$self->{'type'}; |
|
} |
|
} |
|
} |
$self->{'filename'} = $newfilename; |
$self->{'filename'} = $newfilename; |
return; |
return; |
} |
} |
Line 1684 sub load {
|
Line 1688 sub load {
|
# Load the spreadsheet definition file from the save file |
# Load the spreadsheet definition file from the save file |
my %tmphash = &Apache::lonnet::dump($filename,$cdom,$cnum); |
my %tmphash = &Apache::lonnet::dump($filename,$cdom,$cnum); |
my ($tmp) = keys(%tmphash); |
my ($tmp) = keys(%tmphash); |
if ($tmp !~ /^(con_lost|error|no_such_host)/i) { |
if (%tmphash |
|
&& $tmp !~ /^(con_lost|error|no_such_host)/i) { |
while (my ($cell,$formula) = each(%tmphash)) { |
while (my ($cell,$formula) = each(%tmphash)) { |
$formulas->{$cell}=$formula; |
$formulas->{$cell}=$formula; |
} |
} |
Line 1881 sub othersheets {
|
Line 1886 sub othersheets {
|
my ($stype) = @_; |
my ($stype) = @_; |
$stype = $self->{'type'} if (! defined($stype) || $stype !~ /calc$/); |
$stype = $self->{'type'} if (! defined($stype) || $stype !~ /calc$/); |
# |
# |
my @alternatives=(); |
my @alternatives=(&mt('Default'), &mt('LON-CAPA Standard')); |
my %results=&Apache::lonnet::dump($stype.'_spreadsheets', |
my %results=&Apache::lonnet::dump($stype.'_spreadsheets', |
$self->{'cdom'}, $self->{'cnum'}); |
$self->{'cdom'}, $self->{'cnum'}); |
my ($tmp) = keys(%results); |
my ($tmp) = keys(%results); |
if ($tmp =~ /^(con_lost|error|no_such_host)/i ) { |
if (%results |
@alternatives = (&mt('Default')); |
&& $tmp =~ /^(con_lost|error|no_such_host)/i ) { |
} else { |
push(@alternatives, sort(keys(%results))); |
@alternatives = (&mt('Default'), sort (keys(%results))); |
|
} |
} |
return @alternatives; |
return @alternatives; |
} |
} |