version 1.518, 2008/04/21 16:30:47
|
version 1.519, 2008/05/01 16:03:34
|
Line 4908 sub scantron_scantab {
|
Line 4908 sub scantron_scantab {
|
domainconfig user, lines are from this file. |
domainconfig user, lines are from this file. |
|
|
Otherwise, fall back to getting lines from the legacy file on the |
Otherwise, fall back to getting lines from the legacy file on the |
local server: /home/httpd/lonTabs/scantronformat.tab |
local server: /home/httpd/lonTabs/default_scantronformat.tab |
|
|
=cut |
=cut |
|
|
Line 4936 sub get_scantronformat_file {
|
Line 4936 sub get_scantronformat_file {
|
} |
} |
} |
} |
if (!$gottab) { |
if (!$gottab) { |
my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab'); |
my @domains = &Apache::lonnet::current_machine_domains(); |
@lines = <$fh>; |
if (grep(/^\Q$cdom\E$/,@domains)) { |
close($fh); |
my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab'); |
|
@lines = <$fh>; |
|
close($fh); |
|
} else { |
|
my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/default_scantronformat.tab'); |
|
@lines = <$fh>; |
|
close($fh); |
|
} |
} |
} |
return @lines; |
return @lines; |
} |
} |