summaryrefslogtreecommitdiffstats
path: root/config-db/OpenSLX/MetaDB/DBI.pm
diff options
context:
space:
mode:
Diffstat (limited to 'config-db/OpenSLX/MetaDB/DBI.pm')
-rw-r--r--config-db/OpenSLX/MetaDB/DBI.pm136
1 files changed, 68 insertions, 68 deletions
diff --git a/config-db/OpenSLX/MetaDB/DBI.pm b/config-db/OpenSLX/MetaDB/DBI.pm
index ad4c12b5..4479ed84 100644
--- a/config-db/OpenSLX/MetaDB/DBI.pm
+++ b/config-db/OpenSLX/MetaDB/DBI.pm
@@ -30,7 +30,7 @@ sub new
confess "Don't call OpenSLX::MetaDB::DBI::new directly!";
}
-sub disconnectConfigDB
+sub disconnect
{
my $self = shift;
@@ -83,7 +83,7 @@ sub _doSelect
return @vals;
}
-sub fetchVendorOSesByFilter
+sub fetchVendorOSByFilter
{
my $self = shift;
my $filter = shift;
@@ -99,7 +99,7 @@ sub fetchVendorOSesByFilter
return $self->_doSelect($sql);
}
-sub fetchVendorOSesByID
+sub fetchVendorOSByID
{
my $self = shift;
my $ids = shift;
@@ -112,14 +112,14 @@ sub fetchVendorOSesByID
return $self->_doSelect($sql);
}
-sub fetchSystemsByFilter
+sub fetchExportByFilter
{
my $self = shift;
my $filter = shift;
my $resultCols = shift;
- $resultCols = '*' unless (defined $resultCols);
- my $sql = "SELECT $resultCols FROM system";
+ $resultCols = '*' unless (defined $resultCols);
+ my $sql = "SELECT $resultCols FROM export";
my $connector;
foreach my $col (keys %$filter) {
$connector = !defined $connector ? 'WHERE' : 'AND';
@@ -128,7 +128,7 @@ sub fetchSystemsByFilter
return $self->_doSelect($sql);
}
-sub fetchSystemsByID
+sub fetchExportByID
{
my $self = shift;
my $ids = shift;
@@ -137,51 +137,29 @@ sub fetchSystemsByID
$resultCols = '*' unless (defined $resultCols);
my $idStr = join ',', @$ids;
return if !length($idStr);
- my $sql = "SELECT $resultCols FROM system WHERE id IN ($idStr)";
+ my $sql = "SELECT $resultCols FROM export WHERE id IN ($idStr)";
return $self->_doSelect($sql);
}
-sub fetchSystemIDsOfVendorOS
+sub fetchExportIDsOfVendorOS
{
my $self = shift;
my $vendorOSID = shift;
my $sql = qq[
- SELECT id FROM system WHERE vendor_os_id = '$vendorOSID'
+ SELECT id FROM export WHERE vendor_os_id = '$vendorOSID'
];
return $self->_doSelect($sql, 'id');
}
-sub fetchSystemIDsOfClient
-{
- my $self = shift;
- my $clientID = shift;
-
- my $sql = qq[
- SELECT system_id FROM client_system_ref WHERE client_id = '$clientID'
- ];
- return $self->_doSelect($sql, 'system_id');
-}
-
-sub fetchSystemIDsOfGroup
-{
- my $self = shift;
- my $groupID = shift;
-
- my $sql = qq[
- SELECT system_id FROM group_system_ref WHERE group_id = '$groupID'
- ];
- return $self->_doSelect($sql, 'system_id');
-}
-
-sub fetchSystemVariantsByFilter
+sub fetchSystemByFilter
{
my $self = shift;
my $filter = shift;
my $resultCols = shift;
$resultCols = '*' unless (defined $resultCols);
- my $sql = "SELECT $resultCols FROM system_variant";
+ my $sql = "SELECT $resultCols FROM system";
my $connector;
foreach my $col (keys %$filter) {
$connector = !defined $connector ? 'WHERE' : 'AND';
@@ -190,7 +168,7 @@ sub fetchSystemVariantsByFilter
return $self->_doSelect($sql);
}
-sub fetchSystemVariantsByID
+sub fetchSystemByID
{
my $self = shift;
my $ids = shift;
@@ -199,22 +177,44 @@ sub fetchSystemVariantsByID
$resultCols = '*' unless (defined $resultCols);
my $idStr = join ',', @$ids;
return if !length($idStr);
- my $sql = "SELECT $resultCols FROM system_variant WHERE id IN ($idStr)";
+ my $sql = "SELECT $resultCols FROM system WHERE id IN ($idStr)";
return $self->_doSelect($sql);
}
-sub fetchSystemVariantIDsOfSystem
+sub fetchSystemIDsOfExport
{
my $self = shift;
- my $systemID = shift;
+ my $exportID = shift;
my $sql = qq[
- SELECT id FROM system_variant WHERE system_id = '$systemID'
+ SELECT id FROM system WHERE export_id = '$exportID'
];
return $self->_doSelect($sql, 'id');
}
-sub fetchClientsByFilter
+sub fetchSystemIDsOfClient
+{
+ my $self = shift;
+ my $clientID = shift;
+
+ my $sql = qq[
+ SELECT system_id FROM client_system_ref WHERE client_id = '$clientID'
+ ];
+ return $self->_doSelect($sql, 'system_id');
+}
+
+sub fetchSystemIDsOfGroup
+{
+ my $self = shift;
+ my $groupID = shift;
+
+ my $sql = qq[
+ SELECT system_id FROM group_system_ref WHERE group_id = '$groupID'
+ ];
+ return $self->_doSelect($sql, 'system_id');
+}
+
+sub fetchClientByFilter
{
my $self = shift;
my $filter = shift;
@@ -230,7 +230,7 @@ sub fetchClientsByFilter
return $self->_doSelect($sql);
}
-sub fetchClientsByID
+sub fetchClientByID
{
my $self = shift;
my $ids = shift;
@@ -265,7 +265,7 @@ sub fetchClientIDsOfGroup
return $self->_doSelect($sql, 'client_id');
}
-sub fetchGroupsByFilter
+sub fetchGroupByFilter
{
my $self = shift;
my $filter = shift;
@@ -281,7 +281,7 @@ sub fetchGroupsByFilter
return $self->_doSelect($sql);
}
-sub fetchGroupsByID
+sub fetchGroupByID
{
my $self = shift;
my $ids = shift;
@@ -526,6 +526,31 @@ sub changeVendorOS
return $self->_doUpdate('vendor_os', $vendorOSIDs, $valRows);
}
+sub addExport
+{
+ my $self = shift;
+ my $valRows = shift;
+
+ return $self->_doInsert('export', $valRows);
+}
+
+sub removeExport
+{
+ my $self = shift;
+ my $exportIDs = shift;
+
+ return $self->_doDelete('export', $exportIDs);
+}
+
+sub changeExport
+{
+ my $self = shift;
+ my $exportIDs = shift;
+ my $valRows = shift;
+
+ return $self->_doUpdate('export', $exportIDs, $valRows);
+}
+
sub addSystem
{
my $self = shift;
@@ -573,31 +598,6 @@ sub setGroupIDsOfSystem
'system_id', 'group_id', \@currGroups);
}
-sub addSystemVariant
-{
- my $self = shift;
- my $valRows = shift;
-
- return $self->_doInsert('system_variant', $valRows);
-}
-
-sub removeSystemVariant
-{
- my $self = shift;
- my $systemVariantIDs = shift;
-
- return $self->_doDelete('system_variant', $systemVariantIDs);
-}
-
-sub changeSystemVariant
-{
- my $self = shift;
- my $systemVariantIDs = shift;
- my $valRows = shift;
-
- return $self->_doUpdate('system_variant', $systemVariantIDs, $valRows);
-}
-
sub addClient
{
my $self = shift;