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

-Fix BUG on empty criteria searches

Browse Source 
-Accept '=' as a delimeter for convenience (NodeRange will never support assignment of table values, it makes no sense)


git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3981 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2009-08-10 21:09:00 +00:00
parent 82dc8fa9ca
commit f688e3f09f
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
perl-xCAT/xCAT/NodeRange.pm
View File

@ -76,6 +76,9 @@ sub nodesbycriteria {
} elsif ($criteria =~ /[^=]*==/) {
($criteria,$value) = split /==/,$criteria,2;
$matchtype='match';
} elsif ($criteria =~ /[^=]*=/) {
($criteria,$value) = split /=/,$criteria,2;
$matchtype='match';
} elsif ($criteria =~ /[^=]*!~/) {
($criteria,$value) = split /!~/,$criteria,2;
$value =~ s/^\///;
@ -208,7 +211,11 @@ sub expandatom { #TODO: implement table selection as an atom (nodetype.os==rhels
foreach (@allnodeset) {
push @nodes,$_->{node};
}
return @{nodesbycriteria(\@nodes,[$atom])->{$atom}};
my $nbyc = nodesbycriteria(\@nodes,[$atom])->{$atom};
if (defined $nbyc) {
return @$nbyc;
}
return ();
}
if ($atom =~ m/^[0-9]+\z/) { # if only numbers, then add the prefix
my $nodename=$nprefix.$atom.$nsuffix;