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

start to merge the disable attribute checkin

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8617 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav
2011-01-11 19:31:27 +00:00
parent 0f2d1aa0ca
commit a00247706b
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2616,18 +2616,9 @@ sub getAllEntries
. " WHERE " . q(`disable`) . " is NULL or " . q(`disable`) . " in ('0','no','NO','No','nO')");
} else {
if ($xcatcfg =~ /^DB2:/) { #for DB2
my $qstring =
"SELECT * FROM "
. $self->{tabname}
. " WHERE \"disable\" is NULL OR \"disable\" LIKE '0' OR \"disable\" LIKE 'no' OR \"disable\" LIKE 'NO' OR \"disable\" LIKE 'nO' ";
$query = $self->{dbh}->prepare($qstring);
} else { # for other dbs
$query = $self->{dbh}->prepare('SELECT * FROM '
. $self->{tabname}
. " WHERE \"disable\" is NULL or \"disable\" in ('','0','no','NO','No','nO')");
}
}
}
@@ -3220,11 +3211,7 @@ sub getAttribs
if ($xcatcfg =~ /^mysql:/) { #for mysql
$statement .= "(" . q(`disable`) . " is NULL or " . q(`disable`) . " in ('0','no','NO','No','nO'))";
} else {
if ($xcatcfg =~ /^DB2:/) { #for DB2
$statement .= "(\"disable\" is NULL OR \"disable\" LIKE '0' OR \"disable\" LIKE 'no' OR \"disable\" LIKE 'NO' OR \"disable\" LIKE 'No' OR \"disable\" LIKE 'nO')";
} else { # for other dbs
$statement .= "(\"disable\" is NULL or \"disable\" in ('0','no','NO','No','nO'))";
}
}
#print "This is my statement: $statement \n";
my $query = $self->{dbh}->prepare($statement);