diff --git a/catalogue/OcciEnv.cpp b/catalogue/OcciEnv.cpp
index c4c18b1ab6f0acc17637587f8b9648113b927f8f..6d3d54a955cb522fd59239b77d5fa50f19c3532b 100644
--- a/catalogue/OcciEnv.cpp
+++ b/catalogue/OcciEnv.cpp
@@ -66,7 +66,7 @@ oracle::occi::Environment *OcciEnv::operator->() const {
//------------------------------------------------------------------------------
// createConn
//------------------------------------------------------------------------------
-cta::catalogue::OcciConn *OcciEnv::createConn(
+OcciConn *OcciEnv::createConn(
const char *const username,
const char *const password,
const char *const database) {
diff --git a/catalogue/SqliteCatalogue.cpp b/catalogue/SqliteCatalogue.cpp
index ba1afddf45ee74f394be8fbdded612596f45ebe4..397b78c0bf23bd66b3e3a417bc88b69609d729a7 100644
--- a/catalogue/SqliteCatalogue.cpp
+++ b/catalogue/SqliteCatalogue.cpp
@@ -25,10 +25,13 @@
#include <sqlite3.h>
#include <time.h>
+namespace cta {
+namespace catalogue {
+
//------------------------------------------------------------------------------
// constructor
//------------------------------------------------------------------------------
-cta::catalogue::SqliteCatalogue::SqliteCatalogue():
+SqliteCatalogue::SqliteCatalogue():
m_conn(":memory:"),
m_nextArchiveFileId(1) {
createDbSchema();
@@ -37,7 +40,7 @@ cta::catalogue::SqliteCatalogue::SqliteCatalogue():
//------------------------------------------------------------------------------
// createSchema
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::createDbSchema() {
+void SqliteCatalogue::createDbSchema() {
const SqliteCatalogueSchema schema;
m_conn.enableForeignKeys();
m_conn.execNonQuery(schema.sql);
@@ -46,13 +49,13 @@ void cta::catalogue::SqliteCatalogue::createDbSchema() {
//------------------------------------------------------------------------------
// destructor
//------------------------------------------------------------------------------
-cta::catalogue::SqliteCatalogue::~SqliteCatalogue() {
+SqliteCatalogue::~SqliteCatalogue() {
}
//------------------------------------------------------------------------------
// createBootstrapAdminAndHostNoAuth
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::createBootstrapAdminAndHostNoAuth(
+void SqliteCatalogue::createBootstrapAdminAndHostNoAuth(
const common::dataStructures::SecurityIdentity &cliIdentity,
const common::dataStructures::UserIdentity &user,
const std::string &hostName,
@@ -64,7 +67,7 @@ void cta::catalogue::SqliteCatalogue::createBootstrapAdminAndHostNoAuth(
//------------------------------------------------------------------------------
// createAdminUser
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::createAdminUser(
+void SqliteCatalogue::createAdminUser(
const common::dataStructures::SecurityIdentity &cliIdentity,
const common::dataStructures::UserIdentity &user,
const std::string &comment) {
@@ -115,13 +118,13 @@ void cta::catalogue::SqliteCatalogue::createAdminUser(
//------------------------------------------------------------------------------
// deleteAdminUser
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::deleteAdminUser(const common::dataStructures::UserIdentity &user) {}
+void SqliteCatalogue::deleteAdminUser(const common::dataStructures::UserIdentity &user) {}
//------------------------------------------------------------------------------
// getAdminUsers
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::AdminUser>
- cta::catalogue::SqliteCatalogue::getAdminUsers() const {
+ SqliteCatalogue::getAdminUsers() const {
std::list<common::dataStructures::AdminUser> admins;
const char *const sql =
"SELECT "
@@ -182,12 +185,12 @@ std::list<cta::common::dataStructures::AdminUser>
//------------------------------------------------------------------------------
// modifyAdminUserComment
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyAdminUserComment(const common::dataStructures::SecurityIdentity &cliIdentity, const common::dataStructures::UserIdentity &user, const std::string &comment) {}
+void SqliteCatalogue::modifyAdminUserComment(const common::dataStructures::SecurityIdentity &cliIdentity, const common::dataStructures::UserIdentity &user, const std::string &comment) {}
//------------------------------------------------------------------------------
// createAdminHost
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::createAdminHost(
+void SqliteCatalogue::createAdminHost(
const common::dataStructures::SecurityIdentity &cliIdentity,
const std::string &hostName,
const std::string &comment) {
@@ -238,12 +241,12 @@ void cta::catalogue::SqliteCatalogue::createAdminHost(
//------------------------------------------------------------------------------
// deleteAdminHost
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::deleteAdminHost(const std::string &hostName) {}
+void SqliteCatalogue::deleteAdminHost(const std::string &hostName) {}
//------------------------------------------------------------------------------
// getAdminHosts
//------------------------------------------------------------------------------
-std::list<cta::common::dataStructures::AdminHost> cta::catalogue::SqliteCatalogue::getAdminHosts() const {
+std::list<cta::common::dataStructures::AdminHost> SqliteCatalogue::getAdminHosts() const {
std::list<common::dataStructures::AdminHost> hosts;
const char *const sql =
"SELECT "
@@ -303,12 +306,12 @@ std::list<cta::common::dataStructures::AdminHost> cta::catalogue::SqliteCatalogu
//------------------------------------------------------------------------------
// modifyAdminHostComment
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyAdminHostComment(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &hostName, const std::string &comment) {}
+void SqliteCatalogue::modifyAdminHostComment(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &hostName, const std::string &comment) {}
//------------------------------------------------------------------------------
// createStorageClass
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::createStorageClass(
+void SqliteCatalogue::createStorageClass(
const common::dataStructures::SecurityIdentity &cliIdentity,
const std::string &name,
const uint64_t nbCopies,
@@ -363,13 +366,13 @@ void cta::catalogue::SqliteCatalogue::createStorageClass(
//------------------------------------------------------------------------------
// deleteStorageClass
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::deleteStorageClass(const std::string &name) {}
+void SqliteCatalogue::deleteStorageClass(const std::string &name) {}
//------------------------------------------------------------------------------
// getStorageClasses
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::StorageClass>
- cta::catalogue::SqliteCatalogue::getStorageClasses() const {
+ SqliteCatalogue::getStorageClasses() const {
std::list<common::dataStructures::StorageClass> storageClasses;
const char *const sql =
"SELECT "
@@ -431,17 +434,17 @@ std::list<cta::common::dataStructures::StorageClass>
//------------------------------------------------------------------------------
// modifyStorageClassNbCopies
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyStorageClassNbCopies(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t nbCopies) {}
+void SqliteCatalogue::modifyStorageClassNbCopies(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t nbCopies) {}
//------------------------------------------------------------------------------
// modifyStorageClassComment
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyStorageClassComment(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment) {}
+void SqliteCatalogue::modifyStorageClassComment(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment) {}
//------------------------------------------------------------------------------
// createTapePool
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::createTapePool(
+void SqliteCatalogue::createTapePool(
const cta::common::dataStructures::SecurityIdentity &cliIdentity,
const std::string &name,
const uint64_t nbPartialTapes,
@@ -500,13 +503,13 @@ void cta::catalogue::SqliteCatalogue::createTapePool(
//------------------------------------------------------------------------------
// deleteTapePool
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::deleteTapePool(const std::string &name) {}
+void SqliteCatalogue::deleteTapePool(const std::string &name) {}
//------------------------------------------------------------------------------
// getTapePools
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::TapePool>
- cta::catalogue::SqliteCatalogue::getTapePools() const {
+ SqliteCatalogue::getTapePools() const {
std::list<cta::common::dataStructures::TapePool> pools;
const char *const sql =
"SELECT "
@@ -571,22 +574,22 @@ std::list<cta::common::dataStructures::TapePool>
//------------------------------------------------------------------------------
// modifyTapePoolNbPartialTapes
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyTapePoolNbPartialTapes(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t nbPartialTapes) {}
+void SqliteCatalogue::modifyTapePoolNbPartialTapes(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t nbPartialTapes) {}
//------------------------------------------------------------------------------
// modifyTapePoolComment
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyTapePoolComment(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment) {}
+void SqliteCatalogue::modifyTapePoolComment(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment) {}
//------------------------------------------------------------------------------
// setTapePoolEncryption
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::setTapePoolEncryption(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const bool encryptionValue) {}
+void SqliteCatalogue::setTapePoolEncryption(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const bool encryptionValue) {}
//------------------------------------------------------------------------------
// createArchiveRoute
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::createArchiveRoute(
+void SqliteCatalogue::createArchiveRoute(
const common::dataStructures::SecurityIdentity &cliIdentity,
const std::string &storageClassName,
const uint64_t copyNb,
@@ -645,13 +648,13 @@ void cta::catalogue::SqliteCatalogue::createArchiveRoute(
//------------------------------------------------------------------------------
// deleteArchiveRoute
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::deleteArchiveRoute(const std::string &storageClassName, const uint64_t copyNb) {}
+void SqliteCatalogue::deleteArchiveRoute(const std::string &storageClassName, const uint64_t copyNb) {}
//------------------------------------------------------------------------------
// getArchiveRoutes
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::ArchiveRoute>
- cta::catalogue::SqliteCatalogue::getArchiveRoutes() const {
+ SqliteCatalogue::getArchiveRoutes() const {
std::list<common::dataStructures::ArchiveRoute> routes;
const char *const sql =
"SELECT "
@@ -716,17 +719,17 @@ std::list<cta::common::dataStructures::ArchiveRoute>
//------------------------------------------------------------------------------
// modifyArchiveRouteTapePoolName
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyArchiveRouteTapePoolName(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &storageClassName, const uint64_t copyNb, const std::string &tapePoolName) {}
+void SqliteCatalogue::modifyArchiveRouteTapePoolName(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &storageClassName, const uint64_t copyNb, const std::string &tapePoolName) {}
//------------------------------------------------------------------------------
// modifyArchiveRouteComment
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyArchiveRouteComment(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &storageClassName, const uint64_t copyNb, const std::string &comment) {}
+void SqliteCatalogue::modifyArchiveRouteComment(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &storageClassName, const uint64_t copyNb, const std::string &comment) {}
//------------------------------------------------------------------------------
// createLogicalLibrary
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::createLogicalLibrary(
+void SqliteCatalogue::createLogicalLibrary(
const common::dataStructures::SecurityIdentity &cliIdentity,
const std::string &name,
const std::string &comment) {
@@ -777,13 +780,13 @@ void cta::catalogue::SqliteCatalogue::createLogicalLibrary(
//------------------------------------------------------------------------------
// deleteLogicalLibrary
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::deleteLogicalLibrary(const std::string &name) {}
+void SqliteCatalogue::deleteLogicalLibrary(const std::string &name) {}
//------------------------------------------------------------------------------
// getLogicalLibraries
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::LogicalLibrary>
- cta::catalogue::SqliteCatalogue::getLogicalLibraries() const {
+ SqliteCatalogue::getLogicalLibraries() const {
std::list<cta::common::dataStructures::LogicalLibrary> libs;
const char *const sql =
"SELECT "
@@ -844,12 +847,12 @@ std::list<cta::common::dataStructures::LogicalLibrary>
//------------------------------------------------------------------------------
// modifyLogicalLibraryComment
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyLogicalLibraryComment(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment) {}
+void SqliteCatalogue::modifyLogicalLibraryComment(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment) {}
//------------------------------------------------------------------------------
// createTape
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::createTape(
+void SqliteCatalogue::createTape(
const cta::common::dataStructures::SecurityIdentity &cliIdentity,
const std::string &vid,
const std::string &logicalLibraryName,
@@ -960,13 +963,13 @@ void cta::catalogue::SqliteCatalogue::createTape(
//------------------------------------------------------------------------------
// deleteTape
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::deleteTape(const std::string &vid) {}
+void SqliteCatalogue::deleteTape(const std::string &vid) {}
//------------------------------------------------------------------------------
// getTapes
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::Tape>
- cta::catalogue::SqliteCatalogue::getTapes(
+ SqliteCatalogue::getTapes(
const std::string &vid,
const std::string &logicalLibraryName,
const std::string &tapePoolName,
@@ -1072,72 +1075,72 @@ std::list<cta::common::dataStructures::Tape>
//------------------------------------------------------------------------------
// reclaimTape
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::reclaimTape(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid) {}
+void SqliteCatalogue::reclaimTape(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid) {}
//------------------------------------------------------------------------------
// modifyTapeLogicalLibraryName
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyTapeLogicalLibraryName(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &logicalLibraryName) {}
+void SqliteCatalogue::modifyTapeLogicalLibraryName(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &logicalLibraryName) {}
//------------------------------------------------------------------------------
// modifyTapeTapePoolName
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyTapeTapePoolName(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &tapePoolName) {}
+void SqliteCatalogue::modifyTapeTapePoolName(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &tapePoolName) {}
//------------------------------------------------------------------------------
// modifyTapeCapacityInBytes
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyTapeCapacityInBytes(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const uint64_t capacityInBytes) {}
+void SqliteCatalogue::modifyTapeCapacityInBytes(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const uint64_t capacityInBytes) {}
//------------------------------------------------------------------------------
// modifyTapeEncryptionKey
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyTapeEncryptionKey(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &encryptionKey) {}
+void SqliteCatalogue::modifyTapeEncryptionKey(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &encryptionKey) {}
//------------------------------------------------------------------------------
// modifyTapeLabelLog
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyTapeLabelLog(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &drive, const uint64_t timestamp) {}
+void SqliteCatalogue::modifyTapeLabelLog(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &drive, const uint64_t timestamp) {}
//------------------------------------------------------------------------------
// modifyTapeLastWrittenLog
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyTapeLastWrittenLog(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &drive, const uint64_t timestamp) {}
+void SqliteCatalogue::modifyTapeLastWrittenLog(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &drive, const uint64_t timestamp) {}
//------------------------------------------------------------------------------
// modifyTapeLastReadLog
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyTapeLastReadLog(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &drive, const uint64_t timestamp) {}
+void SqliteCatalogue::modifyTapeLastReadLog(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &drive, const uint64_t timestamp) {}
//------------------------------------------------------------------------------
// setTapeBusy
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::setTapeBusy(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const bool busyValue) {}
+void SqliteCatalogue::setTapeBusy(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const bool busyValue) {}
//------------------------------------------------------------------------------
// setTapeFull
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::setTapeFull(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const bool fullValue) {}
+void SqliteCatalogue::setTapeFull(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const bool fullValue) {}
//------------------------------------------------------------------------------
// setTapeDisabled
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::setTapeDisabled(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const bool disabledValue) {}
+void SqliteCatalogue::setTapeDisabled(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const bool disabledValue) {}
//------------------------------------------------------------------------------
// setTapeLbp
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::setTapeLbp(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const bool lbpValue) {}
+void SqliteCatalogue::setTapeLbp(const cta::common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const bool lbpValue) {}
//------------------------------------------------------------------------------
// modifyTapeComment
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyTapeComment(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &comment) {}
+void SqliteCatalogue::modifyTapeComment(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &vid, const std::string &comment) {}
//------------------------------------------------------------------------------
// createRequester
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::createRequester(
+void SqliteCatalogue::createRequester(
const common::dataStructures::SecurityIdentity &cliIdentity,
const cta::common::dataStructures::UserIdentity &user,
const std::string &mountPolicy,
@@ -1192,13 +1195,13 @@ void cta::catalogue::SqliteCatalogue::createRequester(
//------------------------------------------------------------------------------
// deleteRequester
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::deleteRequester(const cta::common::dataStructures::UserIdentity &user) {}
+void SqliteCatalogue::deleteRequester(const cta::common::dataStructures::UserIdentity &user) {}
//------------------------------------------------------------------------------
// getRequesters
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::Requester>
- cta::catalogue::SqliteCatalogue::getRequesters() const {
+ SqliteCatalogue::getRequesters() const {
std::list<common::dataStructures::Requester> users;
const char *const sql =
"SELECT "
@@ -1262,17 +1265,17 @@ std::list<cta::common::dataStructures::Requester>
//------------------------------------------------------------------------------
// modifyRequesterMountPolicy
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyRequesterMountPolicy(const common::dataStructures::SecurityIdentity &cliIdentity, const cta::common::dataStructures::UserIdentity &user, const std::string &mountPolicy) {}
+void SqliteCatalogue::modifyRequesterMountPolicy(const common::dataStructures::SecurityIdentity &cliIdentity, const cta::common::dataStructures::UserIdentity &user, const std::string &mountPolicy) {}
//------------------------------------------------------------------------------
// modifyRequesterComment
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyRequesterComment(const common::dataStructures::SecurityIdentity &cliIdentity, const cta::common::dataStructures::UserIdentity &user, const std::string &comment) {}
+void SqliteCatalogue::modifyRequesterComment(const common::dataStructures::SecurityIdentity &cliIdentity, const cta::common::dataStructures::UserIdentity &user, const std::string &comment) {}
//------------------------------------------------------------------------------
// createMountPolicy
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::createMountPolicy(
+void SqliteCatalogue::createMountPolicy(
const common::dataStructures::SecurityIdentity &cliIdentity,
const std::string &name,
const uint64_t archivePriority,
@@ -1352,13 +1355,13 @@ void cta::catalogue::SqliteCatalogue::createMountPolicy(
//------------------------------------------------------------------------------
// deleteMountPolicy
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::deleteMountPolicy(const std::string &name) {}
+void SqliteCatalogue::deleteMountPolicy(const std::string &name) {}
//------------------------------------------------------------------------------
// getMountPolicies
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::MountPolicy>
- cta::catalogue::SqliteCatalogue::getMountPolicies() const {
+ SqliteCatalogue::getMountPolicies() const {
std::list<cta::common::dataStructures::MountPolicy> policies;
const char *const sql =
"SELECT "
@@ -1439,103 +1442,103 @@ std::list<cta::common::dataStructures::MountPolicy>
//------------------------------------------------------------------------------
// modifyMountPolicyArchivePriority
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyMountPolicyArchivePriority(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t archivePriority) {}
+void SqliteCatalogue::modifyMountPolicyArchivePriority(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t archivePriority) {}
//------------------------------------------------------------------------------
// modifyMountPolicyArchiveMinFilesQueued
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyMountPolicyArchiveMinFilesQueued(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minArchiveFilesQueued) {}
+void SqliteCatalogue::modifyMountPolicyArchiveMinFilesQueued(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minArchiveFilesQueued) {}
//------------------------------------------------------------------------------
// modifyMountPolicyArchiveMinBytesQueued
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyMountPolicyArchiveMinBytesQueued(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t archiveMinBytesQueued) {}
+void SqliteCatalogue::modifyMountPolicyArchiveMinBytesQueued(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t archiveMinBytesQueued) {}
//------------------------------------------------------------------------------
// modifyMountPolicyArchiveMinRequestAge
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyMountPolicyArchiveMinRequestAge(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minArchiveRequestAge) {}
+void SqliteCatalogue::modifyMountPolicyArchiveMinRequestAge(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minArchiveRequestAge) {}
//------------------------------------------------------------------------------
// modifyMountPolicyRetrievePriority
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyMountPolicyRetrievePriority(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t retrievePriority) {}
+void SqliteCatalogue::modifyMountPolicyRetrievePriority(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t retrievePriority) {}
//------------------------------------------------------------------------------
// modifyMountPolicyRetrieveMinFilesQueued
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyMountPolicyRetrieveMinFilesQueued(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minRetrieveFilesQueued) {}
+void SqliteCatalogue::modifyMountPolicyRetrieveMinFilesQueued(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minRetrieveFilesQueued) {}
//------------------------------------------------------------------------------
// modifyMountPolicyRetrieveMinBytesQueued
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyMountPolicyRetrieveMinBytesQueued(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t retrieveMinBytesQueued) {}
+void SqliteCatalogue::modifyMountPolicyRetrieveMinBytesQueued(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t retrieveMinBytesQueued) {}
//------------------------------------------------------------------------------
// modifyMountPolicyRetrieveMinRequestAge
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyMountPolicyRetrieveMinRequestAge(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minRetrieveRequestAge) {}
+void SqliteCatalogue::modifyMountPolicyRetrieveMinRequestAge(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t minRetrieveRequestAge) {}
//------------------------------------------------------------------------------
// modifyMountPolicyMaxDrivesAllowed
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyMountPolicyMaxDrivesAllowed(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t maxDrivesAllowed) {}
+void SqliteCatalogue::modifyMountPolicyMaxDrivesAllowed(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const uint64_t maxDrivesAllowed) {}
//------------------------------------------------------------------------------
// modifyMountPolicyComment
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyMountPolicyComment(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment) {}
+void SqliteCatalogue::modifyMountPolicyComment(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &name, const std::string &comment) {}
//------------------------------------------------------------------------------
// createDedication
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::createDedication(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const cta::common::dataStructures::DedicationType dedicationType,
+void SqliteCatalogue::createDedication(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const cta::common::dataStructures::DedicationType dedicationType,
const std::string &tag, const std::string &vid, const uint64_t fromTimestamp, const uint64_t untilTimestamp,const std::string &comment) {}
//------------------------------------------------------------------------------
// deleteDedication
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::deleteDedication(const std::string &drivename) {}
+void SqliteCatalogue::deleteDedication(const std::string &drivename) {}
//------------------------------------------------------------------------------
// getDedications
//------------------------------------------------------------------------------
-std::list<cta::common::dataStructures::Dedication> cta::catalogue::SqliteCatalogue::getDedications() const { return std::list<cta::common::dataStructures::Dedication>();}
+std::list<cta::common::dataStructures::Dedication> SqliteCatalogue::getDedications() const { return std::list<cta::common::dataStructures::Dedication>();}
//------------------------------------------------------------------------------
// modifyDedicationType
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyDedicationType(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const cta::common::dataStructures::DedicationType dedicationType) {}
+void SqliteCatalogue::modifyDedicationType(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const cta::common::dataStructures::DedicationType dedicationType) {}
//------------------------------------------------------------------------------
// modifyDedicationTag
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyDedicationTag(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const std::string &tag) {}
+void SqliteCatalogue::modifyDedicationTag(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const std::string &tag) {}
//------------------------------------------------------------------------------
// modifyDedicationVid
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyDedicationVid(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const std::string &vid) {}
+void SqliteCatalogue::modifyDedicationVid(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const std::string &vid) {}
//------------------------------------------------------------------------------
// modifyDedicationFrom
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyDedicationFrom(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const uint64_t fromTimestamp) {}
+void SqliteCatalogue::modifyDedicationFrom(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const uint64_t fromTimestamp) {}
//------------------------------------------------------------------------------
// modifyDedicationUntil
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyDedicationUntil(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const uint64_t untilTimestamp) {}
+void SqliteCatalogue::modifyDedicationUntil(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const uint64_t untilTimestamp) {}
//------------------------------------------------------------------------------
// modifyDedicationComment
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::modifyDedicationComment(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const std::string &comment) {}
+void SqliteCatalogue::modifyDedicationComment(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &drivename, const std::string &comment) {}
//------------------------------------------------------------------------------
// createArchiveFile
//------------------------------------------------------------------------------
-uint64_t cta::catalogue::SqliteCatalogue::createArchiveFile(
+uint64_t SqliteCatalogue::createArchiveFile(
const common::dataStructures::ArchiveFile &archiveFile) {
const time_t now = time(NULL);
const char *const sql =
@@ -1592,7 +1595,7 @@ uint64_t cta::catalogue::SqliteCatalogue::createArchiveFile(
//------------------------------------------------------------------------------
// getArchiveFileId
//------------------------------------------------------------------------------
-uint64_t cta::catalogue::SqliteCatalogue::getArchiveFileId(
+uint64_t SqliteCatalogue::getArchiveFileId(
const std::string &diskInstance, const std::string &diskFileId) const {
const char *const sql =
"SELECT "
@@ -1620,7 +1623,7 @@ uint64_t cta::catalogue::SqliteCatalogue::getArchiveFileId(
// getArchiveFiles
//------------------------------------------------------------------------------
std::list<cta::common::dataStructures::ArchiveFile>
- cta::catalogue::SqliteCatalogue::getArchiveFiles(
+ SqliteCatalogue::getArchiveFiles(
const std::string &id,
const std::string &eosid,
const std::string ©nb,
@@ -1681,7 +1684,7 @@ std::list<cta::common::dataStructures::ArchiveFile>
//------------------------------------------------------------------------------
// getArchiveFileSummary
//------------------------------------------------------------------------------
-cta::common::dataStructures::ArchiveFileSummary cta::catalogue::SqliteCatalogue::getArchiveFileSummary(const std::string &id, const std::string &eosid,
+cta::common::dataStructures::ArchiveFileSummary SqliteCatalogue::getArchiveFileSummary(const std::string &id, const std::string &eosid,
const std::string ©nb, const std::string &tapepool, const std::string &vid, const std::string &owner, const std::string &group, const std::string &storageclass, const std::string &path) {
return cta::common::dataStructures::ArchiveFileSummary();
}
@@ -1689,7 +1692,7 @@ cta::common::dataStructures::ArchiveFileSummary cta::catalogue::SqliteCatalogue:
//------------------------------------------------------------------------------
// getArchiveFileById
//------------------------------------------------------------------------------
-cta::common::dataStructures::ArchiveFile cta::catalogue::SqliteCatalogue::
+cta::common::dataStructures::ArchiveFile SqliteCatalogue::
getArchiveFileById(const uint64_t id) {
const char *const sql =
"SELECT "
@@ -1745,12 +1748,12 @@ cta::common::dataStructures::ArchiveFile cta::catalogue::SqliteCatalogue::
//------------------------------------------------------------------------------
// setDriveStatus
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::setDriveStatus(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &driveName, const bool up, const bool force) {}
+void SqliteCatalogue::setDriveStatus(const common::dataStructures::SecurityIdentity &cliIdentity, const std::string &driveName, const bool up, const bool force) {}
//------------------------------------------------------------------------------
// fileWrittenToTape
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteCatalogue::fileWrittenToTape(
+void SqliteCatalogue::fileWrittenToTape(
const cta::common::dataStructures::ArchiveRequest &archiveRequest,
const cta::common::dataStructures::TapeFileLocation &tapeFileLocation) {
}
@@ -1759,7 +1762,7 @@ void cta::catalogue::SqliteCatalogue::fileWrittenToTape(
// prepareForNewFile
//------------------------------------------------------------------------------
cta::common::dataStructures::ArchiveFileQueueCriteria
- cta::catalogue::SqliteCatalogue::prepareForNewFile(
+ SqliteCatalogue::prepareForNewFile(
const std::string &storageClass, const cta::common::dataStructures::UserIdentity &user) {
const common::dataStructures::TapeCopyToPoolMap copyToPoolMap =
getTapeCopyToPoolMap(storageClass);
@@ -1793,7 +1796,7 @@ cta::common::dataStructures::ArchiveFileQueueCriteria
//------------------------------------------------------------------------------
// getTapeCopyToPoolMap
//------------------------------------------------------------------------------
-cta::common::dataStructures::TapeCopyToPoolMap cta::catalogue::SqliteCatalogue::
+cta::common::dataStructures::TapeCopyToPoolMap SqliteCatalogue::
getTapeCopyToPoolMap(const std::string &storageClass) const {
cta::common::dataStructures::TapeCopyToPoolMap copyToPoolMap;
const char *const sql =
@@ -1820,8 +1823,7 @@ cta::common::dataStructures::TapeCopyToPoolMap cta::catalogue::SqliteCatalogue::
//------------------------------------------------------------------------------
// getExpectedNbArchiveRoutes
//------------------------------------------------------------------------------
-uint64_t cta::catalogue::SqliteCatalogue::getExpectedNbArchiveRoutes(
- const std::string &storageClass) const {
+uint64_t SqliteCatalogue::getExpectedNbArchiveRoutes(const std::string &storageClass) const {
uint64_t nbRoutes = 0;
const char *const sql =
"SELECT "
@@ -1843,7 +1845,7 @@ uint64_t cta::catalogue::SqliteCatalogue::getExpectedNbArchiveRoutes(
//------------------------------------------------------------------------------
// getArchiveMountPolicy
//------------------------------------------------------------------------------
-cta::common::dataStructures::MountPolicy cta::catalogue::SqliteCatalogue::
+cta::common::dataStructures::MountPolicy SqliteCatalogue::
getMountPolicyForAUser(const cta::common::dataStructures::UserIdentity &user) const {
const char *const sql =
"SELECT "
@@ -1927,15 +1929,14 @@ cta::common::dataStructures::MountPolicy cta::catalogue::SqliteCatalogue::
//------------------------------------------------------------------------------
// isAdmin
//------------------------------------------------------------------------------
-bool cta::catalogue::SqliteCatalogue::isAdmin(
- const common::dataStructures::SecurityIdentity &cliIdentity) const {
+bool SqliteCatalogue::isAdmin(const common::dataStructures::SecurityIdentity &cliIdentity) const {
return userIsAdmin(cliIdentity.user.name) && hostIsAdmin(cliIdentity.host);
}
//------------------------------------------------------------------------------
// userIsAdmin
//------------------------------------------------------------------------------
-bool cta::catalogue::SqliteCatalogue::userIsAdmin(const std::string &userName)
+bool SqliteCatalogue::userIsAdmin(const std::string &userName)
const {
const char *const sql =
"SELECT "
@@ -1954,7 +1955,7 @@ bool cta::catalogue::SqliteCatalogue::userIsAdmin(const std::string &userName)
//------------------------------------------------------------------------------
// hostIsAdmin
//------------------------------------------------------------------------------
-bool cta::catalogue::SqliteCatalogue::hostIsAdmin(const std::string &hostName)
+bool SqliteCatalogue::hostIsAdmin(const std::string &hostName)
const {
const char *const sql =
"SELECT "
@@ -1969,3 +1970,12 @@ bool cta::catalogue::SqliteCatalogue::hostIsAdmin(const std::string &hostName)
return false;
}
}
+
+//------------------------------------------------------------------------------
+// createTapeFile
+//------------------------------------------------------------------------------
+void SqliteCatalogue::createTapeFile() {
+}
+
+} // namespace catalogue
+} // namespace cta
diff --git a/catalogue/SqliteCatalogue.hpp b/catalogue/SqliteCatalogue.hpp
index 3e6a3e9b4daae2524649d846a92fcac09fd13c81..d1331ef8079bd48c82d210c1c558e4a43d0319a6 100644
--- a/catalogue/SqliteCatalogue.hpp
+++ b/catalogue/SqliteCatalogue.hpp
@@ -249,6 +249,11 @@ protected:
*/
uint64_t createArchiveFile(const common::dataStructures::ArchiveFile &archiveFile);
+ /**
+ * Creates the specified tape file.
+ */
+ void createTapeFile();
+
}; // class SqliteCatalogue
} // namespace catalogue
diff --git a/catalogue/SqliteConn.cpp b/catalogue/SqliteConn.cpp
index 4c82fc45de850234f3a5bcf708916f1f5449988f..57f0bc48f21719144a5593a6be60cf2c3a033ca3 100644
--- a/catalogue/SqliteConn.cpp
+++ b/catalogue/SqliteConn.cpp
@@ -21,10 +21,13 @@
#include "catalogue/SqliteStmt.hpp"
#include "common/exception/Exception.hpp"
+namespace cta {
+namespace catalogue {
+
//------------------------------------------------------------------------------
// constructor
//------------------------------------------------------------------------------
-cta::catalogue::SqliteConn::SqliteConn(const std::string &filename) {
+SqliteConn::SqliteConn(const std::string &filename) {
m_conn = NULL;
if(sqlite3_open(filename.c_str(), &m_conn)) {
sqlite3_close(m_conn);
@@ -38,14 +41,14 @@ cta::catalogue::SqliteConn::SqliteConn(const std::string &filename) {
//------------------------------------------------------------------------------
// destructor
//------------------------------------------------------------------------------
-cta::catalogue::SqliteConn::~SqliteConn() throw() {
+SqliteConn::~SqliteConn() throw() {
close();
}
//------------------------------------------------------------------------------
// close
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteConn::close() {
+void SqliteConn::close() {
std::lock_guard<std::mutex> lock(m_mutex);
if(m_conn != NULL) {
@@ -57,7 +60,7 @@ void cta::catalogue::SqliteConn::close() {
//------------------------------------------------------------------------------
// get
//------------------------------------------------------------------------------
-sqlite3 *cta::catalogue::SqliteConn::get() const {
+sqlite3 *SqliteConn::get() const {
if(NULL == m_conn) {
throw exception::Exception("Failed to get SQLite database connection"
": NULL pointer");
@@ -68,7 +71,7 @@ sqlite3 *cta::catalogue::SqliteConn::get() const {
//------------------------------------------------------------------------------
// enableForeignKeys
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteConn::enableForeignKeys() {
+void SqliteConn::enableForeignKeys() {
try {
execNonQuery("PRAGMA foreign_keys = ON;");
} catch(exception::Exception &ne) {
@@ -82,7 +85,7 @@ void cta::catalogue::SqliteConn::enableForeignKeys() {
//------------------------------------------------------------------------------
// executeNonQuery
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteConn::execNonQuery(const std::string &sql) {
+void SqliteConn::execNonQuery(const std::string &sql) {
int (*callback)(void*,int,char**,char**) = NULL;
void *callbackArg = NULL;
char *errMsg = NULL;
@@ -98,7 +101,7 @@ void cta::catalogue::SqliteConn::execNonQuery(const std::string &sql) {
//------------------------------------------------------------------------------
// createStmt
//------------------------------------------------------------------------------
-cta::catalogue::SqliteStmt *cta::catalogue::SqliteConn::createStmt(
+SqliteStmt *SqliteConn::createStmt(
const std::string &sql) {
std::lock_guard<std::mutex> lock(m_mutex);
@@ -117,3 +120,6 @@ cta::catalogue::SqliteStmt *cta::catalogue::SqliteConn::createStmt(
return new SqliteStmt(sql, stmt);
}
+
+} // namespace catalogue
+} // namespace cta
diff --git a/catalogue/SqliteStmt.cpp b/catalogue/SqliteStmt.cpp
index f3fdb39463b3b997adeb7c3b9d2603eef4a896b7..a94cc69379d3ec78c274de0e2d03ede4b82f4d88 100644
--- a/catalogue/SqliteStmt.cpp
+++ b/catalogue/SqliteStmt.cpp
@@ -21,11 +21,13 @@
#include "catalogue/SqliteStmt.hpp"
#include "common/exception/Exception.hpp"
+namespace cta {
+namespace catalogue {
+
//------------------------------------------------------------------------------
// constructor
//------------------------------------------------------------------------------
-cta::catalogue::SqliteStmt::SqliteStmt(const std::string &sql,
- sqlite3_stmt *const stmt):
+SqliteStmt::SqliteStmt(const std::string &sql, sqlite3_stmt *const stmt):
m_sql(sql),
m_stmt(stmt) {
if(NULL == stmt) {
@@ -39,7 +41,7 @@ cta::catalogue::SqliteStmt::SqliteStmt(const std::string &sql,
//------------------------------------------------------------------------------
// destructor
//------------------------------------------------------------------------------
-cta::catalogue::SqliteStmt::~SqliteStmt() throw() {
+SqliteStmt::~SqliteStmt() throw() {
try {
close(); // Idempotent close() method
} catch(...) {
@@ -50,7 +52,7 @@ cta::catalogue::SqliteStmt::~SqliteStmt() throw() {
//------------------------------------------------------------------------------
// close
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteStmt::close() {
+void SqliteStmt::close() {
std::lock_guard<std::mutex> lock(m_mutex);
if(NULL != m_stmt) {
@@ -62,14 +64,14 @@ void cta::catalogue::SqliteStmt::close() {
//------------------------------------------------------------------------------
// getSql
//------------------------------------------------------------------------------
-const std::string &cta::catalogue::SqliteStmt::getSql() const {
+const std::string &SqliteStmt::getSql() const {
return m_sql;
}
//------------------------------------------------------------------------------
// get
//------------------------------------------------------------------------------
-sqlite3_stmt *cta::catalogue::SqliteStmt::get() const {
+sqlite3_stmt *SqliteStmt::get() const {
if(NULL == m_stmt) {
exception::Exception ex;
ex.getMessage() << __FUNCTION__ << " failed: NULL pointer";
@@ -81,8 +83,7 @@ sqlite3_stmt *cta::catalogue::SqliteStmt::get() const {
//------------------------------------------------------------------------------
// bind
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteStmt::bind(const std::string ¶mName,
- const uint64_t paramValue) {
+void SqliteStmt::bind(const std::string ¶mName, const uint64_t paramValue) {
const int paramIdx = getParamIndex(paramName);
const int bindRc = sqlite3_bind_int64(m_stmt, paramIdx,
(sqlite3_int64)paramValue);
@@ -96,8 +97,7 @@ void cta::catalogue::SqliteStmt::bind(const std::string ¶mName,
//------------------------------------------------------------------------------
// bind
//------------------------------------------------------------------------------
-void cta::catalogue::SqliteStmt::bind(const std::string ¶mName,
- const std::string ¶mValue) {
+void SqliteStmt::bind(const std::string ¶mName, const std::string ¶mValue) {
const int paramIdx = getParamIndex(paramName);
const int bindRc = sqlite3_bind_text(m_stmt, paramIdx, paramValue.c_str(), -1,
SQLITE_TRANSIENT);
@@ -111,7 +111,7 @@ void cta::catalogue::SqliteStmt::bind(const std::string ¶mName,
//------------------------------------------------------------------------------
// step
//------------------------------------------------------------------------------
-int cta::catalogue::SqliteStmt::step() {
+int SqliteStmt::step() {
const int stepRc = sqlite3_step(m_stmt);
// Return the result if sqlite_3_step was sucessful
@@ -129,8 +129,7 @@ int cta::catalogue::SqliteStmt::step() {
//------------------------------------------------------------------------------
// getColumnNameToIdx
//------------------------------------------------------------------------------
-cta::catalogue::ColumnNameToIdx cta::catalogue::SqliteStmt::getColumnNameToIdx()
- const {
+ColumnNameToIdx cta::catalogue::SqliteStmt::getColumnNameToIdx() const {
ColumnNameToIdx nameToIdx;
try {
@@ -157,7 +156,7 @@ cta::catalogue::ColumnNameToIdx cta::catalogue::SqliteStmt::getColumnNameToIdx()
//------------------------------------------------------------------------------
// columnText
//------------------------------------------------------------------------------
-std::string cta::catalogue::SqliteStmt::columnText(const int colIdx) {
+std::string SqliteStmt::columnText(const int colIdx) {
const char *const colValue = (const char *)sqlite3_column_text(m_stmt,
colIdx);
if(NULL == colValue) {
@@ -170,14 +169,14 @@ std::string cta::catalogue::SqliteStmt::columnText(const int colIdx) {
//------------------------------------------------------------------------------
// columnUint64
//------------------------------------------------------------------------------
-uint64_t cta::catalogue::SqliteStmt::columnUint64(const int colIdx) {
+uint64_t SqliteStmt::columnUint64(const int colIdx) {
return (uint64_t)sqlite3_column_int64(m_stmt, colIdx);
}
//------------------------------------------------------------------------------
// getParamIndex
//------------------------------------------------------------------------------
-int cta::catalogue::SqliteStmt::getParamIndex(const std::string ¶mName) {
+int SqliteStmt::getParamIndex(const std::string ¶mName) {
const int index = sqlite3_bind_parameter_index(m_stmt, paramName.c_str());
if(0 == index) {
exception::Exception ex;
@@ -188,3 +187,6 @@ int cta::catalogue::SqliteStmt::getParamIndex(const std::string ¶mName) {
}
return index;
}
+
+} // namespace catalogue
+} // namespace cta