diff options
author | Norbert Preining <preining@logic.at> | 2009-08-05 15:17:49 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2009-08-05 15:17:49 +0000 |
commit | 272f667ff1987bad105a0f13f0337e9813671862 (patch) | |
tree | ddf08f061cd0aa0c3d5cb8bd2086b1b5e52934fc /Master/tlpkg/TeXLive/TLPDB.pm | |
parent | 036676ef7916ae35aa73e59c91f81ae9272c6ef4 (diff) |
merge the bunch of TLPDBOptionsXXXX and TLPDBSettingXXXX into one hash each
git-svn-id: svn://tug.org/texlive/trunk@14541 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive/TLPDB.pm')
-rw-r--r-- | Master/tlpkg/TeXLive/TLPDB.pm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm index 7f61215f398..e91bea2620d 100644 --- a/Master/tlpkg/TeXLive/TLPDB.pm +++ b/Master/tlpkg/TeXLive/TLPDB.pm @@ -64,7 +64,7 @@ C<TeXLive::TLPDB> -- A database of TeX Live Packages use TeXLive::TLConfig qw($CategoriesRegexp $DefaultCategory $InfraLocation $DatabaseName $MetaCategoriesRegexp $Archive - %TLPDBOptionType %TLPDBSettingType); + %TLPDBOptions %TLPDBSettings); use TeXLive::TLUtils qw(dirname mkdirhier member win32 info debug ddebug tlwarn); use TeXLive::TLPOBJ; @@ -1084,7 +1084,7 @@ sub setting_pkg { my $pkg = shift; my $key = shift; if (@_) { - if ($TLPDBSettingType{$key} eq "l") { + if ($TLPDBSettings{$key}->[0] eq "l") { $self->_set_value_pkg($pkg, "setting_", $key, "@_"); } else { $self->_set_value_pkg($pkg, "setting_", $key, shift); @@ -1092,7 +1092,7 @@ sub setting_pkg { } my $ret = $self->_value_pkg($pkg, "setting_", $key); # check the types of the settings, and if it is a "l" return a list - if ($TLPDBSettingType{$key} eq "l") { + if ($TLPDBSettings{$key}->[0] eq "l") { my @ret; if (defined $ret) { @ret = split(" ", $ret); @@ -1108,7 +1108,7 @@ sub setting { my $self = shift; my $key = shift; if (@_) { - if ($TLPDBSettingType{$key} eq "l") { + if ($TLPDBSettings{$key}->[0] eq "l") { $self->_set_setting_value($key, "@_"); } else { $self->_set_setting_value($key, shift); @@ -1116,7 +1116,7 @@ sub setting { } my $ret = $self->_setting_value($key); # check the types of the settings, and if it is a "l" return a list - if ($TLPDBSettingType{$key} eq "l") { + if ($TLPDBSettings{$key}->[0] eq "l") { my @ret; if (defined $ret) { @ret = split(" ", $ret); @@ -1158,11 +1158,11 @@ sub _keyshash { sub options { my $self = shift; - return ($self->_keyshash('opt_', \%TLPDBOptionType)); + return ($self->_keyshash('opt_', \%TLPDBOptions)); } sub settings { my $self = shift; - return ($self->_keyshash('setting_', \%TLPDBSettingType)); + return ($self->_keyshash('setting_', \%TLPDBSettings)); } =pod |