version 1.7, 2003/05/27 20:36:02
|
version 1.8, 2003/05/27 21:17:22
|
Line 142 sub filename {
|
Line 142 sub filename {
|
if (@_) { |
if (@_) { |
my ($newfilename) = @_; |
my ($newfilename) = @_; |
if (! defined($newfilename) || $newfilename eq 'Default' || |
if (! defined($newfilename) || $newfilename eq 'Default' || |
$newfilename !~ /\w/ || $newfilename =~ /\W/) { |
$newfilename !~ /\w/) { |
my %tmphash = &Apache::lonnet::get('environment', |
my %tmphash = &Apache::lonnet::get('environment', |
['spreadsheet_default_'. |
['spreadsheet_default_'. |
$self->{'type'}], |
$self->{'type'}], |
Line 152 sub filename {
|
Line 152 sub filename {
|
if ($tmp !~ /^(con_lost|error|no_such_host)/i) { |
if ($tmp !~ /^(con_lost|error|no_such_host)/i) { |
$newfilename=$tmphash{'spreadsheet_default_'.$self->{'type'}}; |
$newfilename=$tmphash{'spreadsheet_default_'.$self->{'type'}}; |
} |
} |
} |
if (! defined($newfilename) || |
if (! defined($newfilename) || |
$newfilename !~ /\w/ || |
$newfilename !~ /\w/ || |
$newfilename =~ /^\W*$/) { |
$newfilename =~ /^\W*$/) { |
$newfilename = 'default.'.$self->{'type'}; |
$newfilename = 'default.'.$self->{'type'}; |
} |
} else { |
} elsif ($newfilename !~ /^\/res\/.*\.spreadsheet/) { |
my $regexp = '_'.$self->{'type'}.'$'; |
my $regexp = '_'.$self->{'type'}.'$'; |
if ($newfilename !~ /$regexp/) { |
if ($newfilename !~ /$regexp/) { |
$newfilename .= '_'.$self->{'type'}; |
$newfilename .= '_'.$self->{'type'}; |
Line 1497 sub load {
|
Line 1497 sub load {
|
$sheetxml='<field row="0" col="A"></field>'; |
$sheetxml='<field row="0" col="A"></field>'; |
} |
} |
($formulas,undef) = &parse_sheet(\$sheetxml); |
($formulas,undef) = &parse_sheet(\$sheetxml); |
} elsif($self->filename() =~ /^\/*\.spreadsheet$/) { |
} elsif($self->filename() =~ /^\/res\/.*\.spreadsheet$/) { |
# Load a spreadsheet definition file |
# Load a spreadsheet definition file |
my $sheetxml=&Apache::lonnet::getfile |
my $sheetxml=&Apache::lonnet::getfile |
(&Apache::lonnet::filelocation('',$filename)); |
(&Apache::lonnet::filelocation('',$filename)); |
Line 1653 sub temporary {
|
Line 1653 sub temporary {
|
if (@_) { |
if (@_) { |
($self->{'temporary'})= @_; |
($self->{'temporary'})= @_; |
} |
} |
$self->logthis('temporary = '.$self->{'temporary'}); |
|
return $self->{'temporary'}; |
return $self->{'temporary'}; |
} |
} |
|
|