arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

allow underscore in user defined tables and sql file names, note more work needed if want to allow test_x_mysql.pm for a name

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7383 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav 2010-09-08 18:58:59 +00:00
parent 641af9d99c
commit 9a7b4ff7ff
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
perl-xCAT/xCAT/ExtTab.pm
View File

@ -194,17 +194,22 @@ sub get_filelist
my $filename= basename($file); # strip filename
my($name,$ext1) = split '\.', $filename;
my($name,$ext2) = split '\_', $name;
if ($ext2 eq $dbname)
if ($ext2 eq $dbname) # matches the database
{
push @filelist, $file;
}
else
{
if ($ext2 eq "")
if ($ext2 eq "") # no database designated
{
push @filelist, $file;
} else { # if not one of the databases, they just have _ in
# the file name
if ($ext2 ne "db2" && $ext2 ne "mysql" && $ext2 ne "pgsql" && $ext2 ne "sqlite" ) {
push @filelist, $file;
}
}
}
}
$ext2 = "";
$ext1 = "";
}

5
perl-xCAT/xCAT/Table.pm
View File

@ -3626,6 +3626,11 @@ sub get_filelist
if ($ext2 eq "")
{
push @filelist, $file;
} else { # if not one of the databases, they just have _ in
# the file name
if ($ext2 ne "db2" && $ext2 ne "mysql" && $ext2 ne "pgsql" && $ext2 ne "sqlite" ) {
push @filelist, $file;
}
}
}
$ext2 = "";