summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config-db/ODLX/ConfigDB.pm71
-rw-r--r--config-db/ODLX/MetaDB/Base.pm14
-rw-r--r--config-db/ODLX/MetaDB/DBI.pm28
3 files changed, 57 insertions, 56 deletions
diff --git a/config-db/ODLX/ConfigDB.pm b/config-db/ODLX/ConfigDB.pm
index aa9625d3..3ddd79e8 100644
--- a/config-db/ODLX/ConfigDB.pm
+++ b/config-db/ODLX/ConfigDB.pm
@@ -20,13 +20,13 @@ use Exporter;
my @accessExports = qw(
connectConfigDB disconnectConfigDB
- fetchVendorOSesByFilter fetchVendorOSesByID fetchAllVendorOSIDsOfSystem
- fetchSystemsByFilter fetchSystemsByID fetchAllSystemIDsOfClient
- fetchAllSystemIDsOfGroup
- fetchClientsByFilter fetchClientsByID fetchAllClientIDsOfSystem
- fetchAllClientIDsOfGroup
- fetchGroupsByFilter fetchGroupsByID fetchAllGroupIDsOfClient
- fetchAllGroupIDsOfSystem
+ fetchVendorOSesByFilter fetchVendorOSesByID fetchVendorOSIDsOfSystem
+ fetchSystemsByFilter fetchSystemsByID fetchSystemIDsOfClient
+ fetchSystemIDsOfGroup
+ fetchClientsByFilter fetchClientsByID fetchClientIDsOfSystem
+ fetchClientIDsOfGroup
+ fetchGroupsByFilter fetchGroupsByID fetchGroupIDsOfClient
+ fetchGroupIDsOfSystem
);
my @manipulationExports = qw(
addVendorOS removeVendorOS changeVendorOS
@@ -192,6 +192,7 @@ sub fetchSystemsByFilter
my @systems
= $confDB->{'meta-db'}->fetchSystemsByFilter($filter, $resultCols);
+print scalar(@systems)."\n";
return wantarray() ? @systems : shift @systems;
}
@@ -205,28 +206,28 @@ sub fetchSystemsByID
return wantarray() ? @systems : shift @systems;
}
-sub fetchAllSystemIDsOfVendorOS
+sub fetchSystemIDsOfVendorOS
{
my $confDB = shift;
my $vendorOSID = shift;
- return $confDB->{'meta-db'}->fetchAllSystemIDsOfVendorOS($vendorOSID);
+ return $confDB->{'meta-db'}->fetchSystemIDsOfVendorOS($vendorOSID);
}
-sub fetchAllSystemIDsOfClient
+sub fetchSystemIDsOfClient
{
my $confDB = shift;
my $clientID = shift;
- return $confDB->{'meta-db'}->fetchAllSystemIDsOfClient($clientID);
+ return $confDB->{'meta-db'}->fetchSystemIDsOfClient($clientID);
}
-sub fetchAllSystemIDsOfGroup
+sub fetchSystemIDsOfGroup
{
my $confDB = shift;
my $groupID = shift;
- return $confDB->{'meta-db'}->fetchAllSystemIDsOfClient($groupID);
+ return $confDB->{'meta-db'}->fetchSystemIDsOfClient($groupID);
}
sub fetchClientsByFilter
@@ -248,20 +249,20 @@ sub fetchClientsByID
return wantarray() ? @clients : shift @clients;
}
-sub fetchAllClientIDsOfSystem
+sub fetchClientIDsOfSystem
{
my $confDB = shift;
my $systemID = shift;
- return $confDB->{'meta-db'}->fetchAllClientIDsOfSystem($systemID);
+ return $confDB->{'meta-db'}->fetchClientIDsOfSystem($systemID);
}
-sub fetchAllClientIDsOfGroup
+sub fetchClientIDsOfGroup
{
my $confDB = shift;
my $groupID = shift;
- return $confDB->{'meta-db'}->fetchAllClientIDsOfGroup($groupID);
+ return $confDB->{'meta-db'}->fetchClientIDsOfGroup($groupID);
}
sub fetchGroupsByFilter
@@ -285,20 +286,20 @@ sub fetchGroupsByID
return wantarray() ? @groups : shift @groups;
}
-sub fetchAllGroupIDsOfSystem
+sub fetchGroupIDsOfSystem
{
my $confDB = shift;
my $systemID = shift;
- return $confDB->{'meta-db'}->fetchAllGroupIDsOfSystem($systemID);
+ return $confDB->{'meta-db'}->fetchGroupIDsOfSystem($systemID);
}
-sub fetchAllGroupIDsOfClient
+sub fetchGroupIDsOfClient
{
my $confDB = shift;
my $clientID = shift;
- return $confDB->{'meta-db'}->fetchAllGroupIDsOfClient($clientID);
+ return $confDB->{'meta-db'}->fetchGroupIDsOfClient($clientID);
}
################################################################################
@@ -348,7 +349,7 @@ sub addSystemIDsToVendorOS
my $newSystemIDs = _aref(shift);
my @systemIDs
- = $confDB->{'meta-db'}->fetchAllSystemIDsOfVendorOS($vendorOSID);
+ = $confDB->{'meta-db'}->fetchSystemIDsOfVendorOS($vendorOSID);
push @systemIDs, @$newSystemIDs;
return setSystemIDsOfVendorOS($confDB, $vendorOSID, \@systemIDs);
}
@@ -363,7 +364,7 @@ sub removeSystemIDsFromVendorOS
@toBeRemoved{@$removedSystemIDs} = ();
my @systemIDs
= grep { !exists $toBeRemoved{$_} }
- $confDB->{'meta-db'}->fetchAllSystemIDsOfVendorOS($vendorOSID);
+ $confDB->{'meta-db'}->fetchSystemIDsOfVendorOS($vendorOSID);
return setSystemIDsOfVendorOS($confDB, $vendorOSID, \@systemIDs);
}
@@ -410,7 +411,7 @@ sub addClientIDsToSystem
my $systemID = shift;
my $newClientIDs = _aref(shift);
- my @clientIDs = $confDB->{'meta-db'}->fetchAllClientIDsOfSystem($systemID);
+ my @clientIDs = $confDB->{'meta-db'}->fetchClientIDsOfSystem($systemID);
push @clientIDs, @$newClientIDs;
return setClientIDsOfSystem($confDB, $systemID, \@clientIDs);
}
@@ -425,7 +426,7 @@ sub removeClientIDsFromSystem
@toBeRemoved{@$removedClientIDs} = ();
my @clientIDs
= grep { !exists $toBeRemoved{$_} }
- $confDB->{'meta-db'}->fetchAllClientIDsOfSystem($systemID);
+ $confDB->{'meta-db'}->fetchClientIDsOfSystem($systemID);
return setClientIDsOfSystem($confDB, $systemID, \@clientIDs);
}
@@ -447,7 +448,7 @@ sub addGroupIDsToSystem
my $systemID = shift;
my $newGroupIDs = _aref(shift);
- my @groupIDs = $confDB->{'meta-db'}->fetchAllGroupIDsOfSystem($systemID);
+ my @groupIDs = $confDB->{'meta-db'}->fetchGroupIDsOfSystem($systemID);
push @groupIDs, @$newGroupIDs;
return setGroupIDsOfSystem($confDB, $systemID, \@groupIDs);
}
@@ -462,7 +463,7 @@ sub removeGroupIDsFromSystem
@toBeRemoved{@$toBeRemovedGroupIDs} = ();
my @groupIDs
= grep { !exists $toBeRemoved{$_} }
- $confDB->{'meta-db'}->fetchAllGroupIDsOfSystem($systemID);
+ $confDB->{'meta-db'}->fetchGroupIDsOfSystem($systemID);
return setGroupIDsOfSystem($confDB, $systemID, \@groupIDs);
}
@@ -509,7 +510,7 @@ sub addSystemIDsToClient
my $clientID = shift;
my $newSystemIDs = _aref(shift);
- my @systemIDs = $confDB->{'meta-db'}->fetchAllSystemIDsOfClient($clientID);
+ my @systemIDs = $confDB->{'meta-db'}->fetchSystemIDsOfClient($clientID);
push @systemIDs, @$newSystemIDs;
return setSystemIDsOfClient($confDB, $clientID, \@systemIDs);
}
@@ -524,7 +525,7 @@ sub removeSystemIDsFromClient
@toBeRemoved{@$removedSystemIDs} = ();
my @systemIDs
= grep { !exists $toBeRemoved{$_} }
- $confDB->{'meta-db'}->fetchAllSystemIDsOfClient($clientID);
+ $confDB->{'meta-db'}->fetchSystemIDsOfClient($clientID);
return setSystemIDsOfClient($confDB, $clientID, \@systemIDs);
}
@@ -546,7 +547,7 @@ sub addGroupIDsToClient
my $clientID = shift;
my $newGroupIDs = _aref(shift);
- my @groupIDs = $confDB->{'meta-db'}->fetchAllGroupIDsOfClient($clientID);
+ my @groupIDs = $confDB->{'meta-db'}->fetchGroupIDsOfClient($clientID);
push @groupIDs, @$newGroupIDs;
return setGroupIDsOfClient($confDB, $clientID, \@groupIDs);
}
@@ -561,7 +562,7 @@ sub removeGroupIDsFromClient
@toBeRemoved{@$toBeRemovedGroupIDs} = ();
my @groupIDs
= grep { !exists $toBeRemoved{$_} }
- $confDB->{'meta-db'}->fetchAllGroupIDsOfClient($clientID);
+ $confDB->{'meta-db'}->fetchGroupIDsOfClient($clientID);
return setGroupIDsOfClient($confDB, $clientID, \@groupIDs);
}
@@ -608,7 +609,7 @@ sub addClientIDsToGroup
my $groupID = shift;
my $newClientIDs = _aref(shift);
- my @clientIDs = $confDB->{'meta-db'}->fetchAllClientIDsOfGroup($groupID);
+ my @clientIDs = $confDB->{'meta-db'}->fetchClientIDsOfGroup($groupID);
push @clientIDs, @$newClientIDs;
return setClientIDsOfGroup($confDB, $groupID, \@clientIDs);
}
@@ -623,7 +624,7 @@ sub removeClientIDsFromGroup
@toBeRemoved{@$removedClientIDs} = ();
my @clientIDs
= grep { !exists $toBeRemoved{$_} }
- $confDB->{'meta-db'}->fetchAllClientIDsOfGroup($groupID);
+ $confDB->{'meta-db'}->fetchClientIDsOfGroup($groupID);
return setClientIDsOfGroup($confDB, $groupID, \@clientIDs);
}
@@ -645,7 +646,7 @@ sub addSystemIDsToGroup
my $groupID = shift;
my $newSystemIDs = _aref(shift);
- my @systemIDs = $confDB->{'meta-db'}->fetchAllSystemIDsOfGroup($groupID);
+ my @systemIDs = $confDB->{'meta-db'}->fetchSystemIDsOfGroup($groupID);
push @systemIDs, @$newSystemIDs;
return setSystemIDsOfGroup($confDB, $groupID, \@systemIDs);
}
@@ -660,7 +661,7 @@ sub removeSystemIDsFromGroup
@toBeRemoved{@$removedSystemIDs} = ();
my @systemIDs
= grep { !exists $toBeRemoved{$_} }
- $confDB->{'meta-db'}->fetchAllSystemIDsOfGroup($groupID);
+ $confDB->{'meta-db'}->fetchSystemIDsOfGroup($groupID);
return setSystemIDsOfGroup($confDB, $groupID, \@systemIDs);
}
diff --git a/config-db/ODLX/MetaDB/Base.pm b/config-db/ODLX/MetaDB/Base.pm
index 0f7fcbdc..f386dfc3 100644
--- a/config-db/ODLX/MetaDB/Base.pm
+++ b/config-db/ODLX/MetaDB/Base.pm
@@ -237,15 +237,15 @@ sub fetchSystemsById
{
}
-sub fetchAllSystemIDsOfVendorOS
+sub fetchSystemIDsOfVendorOS
{
}
-sub fetchAllSystemIDsOfClient
+sub fetchSystemIDsOfClient
{
}
-sub fetchAllSystemIDsOfGroup
+sub fetchSystemIDsOfGroup
{
}
@@ -257,11 +257,11 @@ sub fetchClientsById
{
}
-sub fetchAllClientIDsOfSystem
+sub fetchClientIDsOfSystem
{
}
-sub fetchAllClientIDsOfGroup
+sub fetchClientIDsOfGroup
{
}
@@ -273,11 +273,11 @@ sub fetchGroupsById
{
}
-sub fetchAllGroupIDsOfClient
+sub fetchGroupIDsOfClient
{
}
-sub fetchAllGroupIDsOfSystem
+sub fetchGroupIDsOfSystem
{
}
diff --git a/config-db/ODLX/MetaDB/DBI.pm b/config-db/ODLX/MetaDB/DBI.pm
index a2f101d6..acf8b3c4 100644
--- a/config-db/ODLX/MetaDB/DBI.pm
+++ b/config-db/ODLX/MetaDB/DBI.pm
@@ -132,7 +132,7 @@ sub fetchSystemsById
return $self->fetchSystemsByFilter({'id' => $id}, $resultCols);
}
-sub fetchAllSystemIDsOfVendorOS
+sub fetchSystemIDsOfVendorOS
{
my $self = shift;
my $vendorOSID = shift;
@@ -143,7 +143,7 @@ sub fetchAllSystemIDsOfVendorOS
return $self->_doSelect($sql, 'id');
}
-sub fetchAllSystemIDsOfClient
+sub fetchSystemIDsOfClient
{
my $self = shift;
my $clientID = shift;
@@ -154,7 +154,7 @@ sub fetchAllSystemIDsOfClient
return $self->_doSelect($sql, 'system_id');
}
-sub fetchAllSystemIDsOfGroup
+sub fetchSystemIDsOfGroup
{
my $self = shift;
my $groupID = shift;
@@ -190,7 +190,7 @@ sub fetchClientsById
return $self->fetchClientsByFilter({'id' => $id}, $resultCols);
}
-sub fetchAllClientIDsOfSystem
+sub fetchClientIDsOfSystem
{
my $self = shift;
my $systemID = shift;
@@ -201,7 +201,7 @@ sub fetchAllClientIDsOfSystem
return $self->_doSelect($sql, 'system_id');
}
-sub fetchAllClientIDsOfGroup
+sub fetchClientIDsOfGroup
{
my $self = shift;
my $groupID = shift;
@@ -237,7 +237,7 @@ sub fetchGroupsById
return $self->fetchGroupsByFilter({'id' => $id}, $resultCols);
}
-sub fetchAllGroupIDsOfSystem
+sub fetchGroupIDsOfSystem
{
my $self = shift;
my $systemID = shift;
@@ -248,7 +248,7 @@ sub fetchAllGroupIDsOfSystem
return $self->_doSelect($sql, 'group_id');
}
-sub fetchAllGroupIDsOfClient
+sub fetchGroupIDsOfClient
{
my $self = shift;
my $clientID = shift;
@@ -472,7 +472,7 @@ sub setSystemIDsOfVendorOS
my $vendorOSID = shift;
my $systemIDs = shift;
- my @currSystems = $self->fetchAllSystemsOfVendorOS($vendorOSID);
+ my @currSystems = $self->fetchSystemsOfVendorOS($vendorOSID);
$self->_updateOneToManyRefAttr('system', $vendorOSID, $systemIDs,
'vendor_os_id', \@currSystems);
}
@@ -508,7 +508,7 @@ sub setClientIDsOfSystem
my $systemID = shift;
my $clientIDs = shift;
- my @currClients = $self->fetchAllClientIDsOfSystem($systemID);
+ my @currClients = $self->fetchClientIDsOfSystem($systemID);
$self->_updateRefTable('client_system_ref', $systemID, $clientIDs,
'system_id', 'client_id', \@currClients);
}
@@ -519,7 +519,7 @@ sub setGroupIDsOfSystem
my $systemID = shift;
my $groupIDs = shift;
- my @currGroups = $self->fetchAllGroupIDsOfSystem($systemID);
+ my @currGroups = $self->fetchGroupIDsOfSystem($systemID);
$self->_updateRefTable('grop_system_ref', $systemID, $groupIDs,
'system_id', 'group_id', \@currGroups);
}
@@ -555,7 +555,7 @@ sub setSystemIDsOfClient
my $clientID = shift;
my $systemIDs = shift;
- my @currSystems = $self->fetchAllSystemsOfClient($clientID);
+ my @currSystems = $self->fetchSystemsOfClient($clientID);
$self->_updateRefTable('client_system_ref', $clientID, $systemIDs,
'client_id', 'system_id', \@currSystems);
}
@@ -566,7 +566,7 @@ sub setGroupIDsOfClient
my $clientID = shift;
my $groupIDs = shift;
- my @currGroups = $self->fetchAllGroupsOfClient($clientID);
+ my @currGroups = $self->fetchGroupsOfClient($clientID);
$self->_updateRefTable('group_client_ref', $clientID, $groupIDs,
'client_id', 'group_id', \@currGroups);
}
@@ -602,7 +602,7 @@ sub setClientIDsOfGroup
my $groupID = shift;
my $clientIDs = shift;
- my @currClients = $self->fetchAllClientsOfGroup($groupID);
+ my @currClients = $self->fetchClientsOfGroup($groupID);
$self->_updateRefTable('group_client_ref', $groupID, $clientIDs,
'group_id', 'client_id', \@currClients);
}
@@ -613,7 +613,7 @@ sub setSystemIDsOfGroup
my $groupID = shift;
my $systemIDs = shift;
- my @currSystems = $self->fetchAllSystemsOfGroup($groupID);
+ my @currSystems = $self->fetchSystemsOfGroup($groupID);
$self->_updateRefTable('group_system_ref', $groupID, $systemIDs,
'group_id', 'system_id', \@currSystems);
}
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-06-10 23:01:17 +0200