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

Use the correct key value when the getting info

Browse Source 
from the DB.  It is not always "node" even when
the type of object is "node".

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@335 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
nott 2008-01-28 13:06:39 +00:00
parent fb28b71c71
commit f69c8fbda1
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
perl-xCAT-2.0/xCAT/DBobjUtils.pm
View File

@ -207,7 +207,7 @@ sub getobjdefs
my $attr = $this_attr->{attr_name};
# skip the key attr ???
if ($attr eq $objkey)
if ($attr eq $objkey)
{
next;
}
@ -225,7 +225,6 @@ sub getobjdefs
# if the object value is not the value we need
# to match then try the next only_if value
# ndebug
next
if (
!grep(/$check_value/, $objhash{$objname}{$check_attr}));
@ -294,8 +293,7 @@ sub getobjdefs
# attr val is defined
if (ref($ent) and defined $ent->{$tabattr})
{
$objhash{$objname}{$attr} = $ent->{$tabattr};
$objhash{$objname}{$attr} = $ent->{$tabattr};
}
$thistable->commit;
@ -307,7 +305,6 @@ sub getobjdefs
{
# look up attr values
my @rows = xCAT::DBobjUtils->getDBtable($lookup_table);
if (defined(@rows))
{
@ -315,10 +312,11 @@ sub getobjdefs
foreach (@rows)
{
if ($_->{$objkey} eq $objname)
if ($_->{$lookup_attr} eq $objname)
{
$objhash{$objname}{$attr} = $_->{$tabattr};
$objhash{$objname}{$attr} = $_->{$tabattr};
}
}
}