diff --git a/middletier/cta/AdminHost.hpp b/middletier/cta/AdminHost.hpp
index a7ffdc6c94a28d9dcbb14f3cf8b31ad23126c21a..404a7e29be6b8663d29992d1a4706179e153035c 100644
--- a/middletier/cta/AdminHost.hpp
+++ b/middletier/cta/AdminHost.hpp
@@ -21,7 +21,10 @@ public:
* Constructor.
*
* @param name The network name of the administration host.
- * @param creator The identity of the user that created the administration host.
+ * @param creator The identity of the user that created the administration
+ * host.
+ * @param creationTime The absolute time at which the admin host entry was
+ * created.
* @param comment The comment describing the administration host.
*/
AdminHost(
diff --git a/middletier/cta/AdminUser.hpp b/middletier/cta/AdminUser.hpp
index 2a7dc0526c7a9370e6d6ff0f9ffe20290378ed6c..e069058f247d8a3e9ffe8c290e394c6f0183f171 100644
--- a/middletier/cta/AdminUser.hpp
+++ b/middletier/cta/AdminUser.hpp
@@ -22,6 +22,8 @@ public:
*
* @param user The identity of the administrator.
* @param creator The identity of the user that created the administrator.
+ * @param creationTime The absolute time at which the admin user entry was
+ * created.
* @param comment The comment describing the administrator.
*/
AdminUser(
diff --git a/middletier/cta/ArchivalJob.hpp b/middletier/cta/ArchivalJob.hpp
index f0b278ea636947e97310f8f577b55d30f47d65b3..2d1444c7a3379cb0f27ec86831a0da82467d8d98 100644
--- a/middletier/cta/ArchivalJob.hpp
+++ b/middletier/cta/ArchivalJob.hpp
@@ -26,6 +26,8 @@ public:
* @param srcUrl The URL of the source file.
* @param dstPath The full path of the destination file within the archive.
* @param creator The identity of the user that created the job.
+ * @param creationTime The absolute time at which the archival job was
+ * vreated.
*/
ArchivalJob(
const ArchivalJobState::Enum state,
diff --git a/middletier/cta/EosRemoteStorage.hpp b/middletier/cta/EosRemoteStorage.hpp
index 17d2bd4a4ed5297f4c777d3d30fb32dab9bb1525..b0977cd76a976c42034015b937af323526da6e07 100644
--- a/middletier/cta/EosRemoteStorage.hpp
+++ b/middletier/cta/EosRemoteStorage.hpp
@@ -26,8 +26,8 @@ public:
/**
* Renames the specified remote file to the specified new name.
*
- * @oldRemoteFile The current URL of teh remote file.
- * @newRemoteFile The new URL of teh remote file.
+ * @param remoteFile The current URL of the remote file.
+ * @param newRemoteFile The new URL of the remote file.
*/
void rename(const std::string &remoteFile,
const std::string &newRemoteFile);
diff --git a/middletier/cta/FileSystemNode.hpp b/middletier/cta/FileSystemNode.hpp
index 3a9517ae3704b48aeee65575378bf720f642fbfa..2250f86c6259ed82501d1eaf57be1995c49bfa87 100644
--- a/middletier/cta/FileSystemNode.hpp
+++ b/middletier/cta/FileSystemNode.hpp
@@ -21,7 +21,7 @@ public:
/**
* Constructor.
*
- * @param The storage classes used in the file system.
+ * @param storageclasses The storage classes used in the file system.
* @param entry The description of the node in the form of a DirectoryEntry.
*/
FileSystemNode(FileSystemStorageClasses &storageclasses,
@@ -73,7 +73,7 @@ public:
* This method takes ownership of the specified node even in the event of the
* method throwing an exception.
*
- * @param node The node to be added.
+ * @param child The child node to be added.
*/
void addChild(FileSystemNode *const child);
diff --git a/middletier/cta/FileSystemStorageClasses.hpp b/middletier/cta/FileSystemStorageClasses.hpp
index 00c4037798d42d77ce6477b54af19f12ed8ff3f9..ca299cb38df7aab3073b94c44a89a934b07827e1 100644
--- a/middletier/cta/FileSystemStorageClasses.hpp
+++ b/middletier/cta/FileSystemStorageClasses.hpp
@@ -33,8 +33,6 @@ public:
/**
* Deletes the specified storage class.
*
- * @param requester The identity of the user requesting the deletion of the
- * storage class.
* @param name The name of the storage class.
*/
void deleteStorageClass(const std::string &name);
@@ -42,7 +40,6 @@ public:
/**
* Gets the current list of storage classes in lexicographical order.
*
- * @param requester The identity of the user requesting the list.
* @return The current list of storage classes in lexicographical order.
*/
std::list<StorageClass> getStorageClasses() const;
diff --git a/middletier/cta/MiddleTierAdmin.hpp b/middletier/cta/MiddleTierAdmin.hpp
index 264e97c7e6f01897392104d66a2a06e3651b97f4..80ed9592c1ec91a1c613af73448ff9a37e88c593 100644
--- a/middletier/cta/MiddleTierAdmin.hpp
+++ b/middletier/cta/MiddleTierAdmin.hpp
@@ -81,7 +81,6 @@ public:
* @param requester The identity of the user requesting the deletion of the
* administration host.
* @param hostName The network name of the administration host.
- * @param comment The comment describing the administration host.
*/
virtual void deleteAdminHost(
const SecurityIdentity &requester,
@@ -247,7 +246,7 @@ public:
* @param requester The identity of the user requesting the creation of the
* tape.
* @param vid The volume identifier of the tape.
- * @param logicalLibrary The name of the logical library to which the tape
+ * @param logicalLibraryName The name of the logical library to which the tape
* belongs.
* @param tapePoolName The name of the tape pool to which the tape belongs.
* @param capacityInBytes The capacity of the tape.
diff --git a/middletier/cta/RemoteStorage.hpp b/middletier/cta/RemoteStorage.hpp
index b969b7daefe9a5b48f2cb2217897b5693055aeb5..e7aecb06451f64face2095708ff988b6d89bd8bf 100644
--- a/middletier/cta/RemoteStorage.hpp
+++ b/middletier/cta/RemoteStorage.hpp
@@ -26,8 +26,8 @@ public:
/**
* Renames the specified remote file to the specified new name.
*
- * @oldRemoteFile The current URL of teh remote file.
- * @newRemoteFile The new URL of teh remote file.
+ * @param remoteFile The current URL of the remote file.
+ * @param newRemoteFile The new URL of the remote file.
*/
virtual void rename(const std::string &remoteFile,
const std::string &newRemoteFile) = 0;
diff --git a/middletier/cta/RetrievalFileTransfer.hpp b/middletier/cta/RetrievalFileTransfer.hpp
index a73f6c38940dea8f66d70082e6409762b428736e..13e0c18a091523ae5b4cb16b4a4ff31ec3a768ee 100644
--- a/middletier/cta/RetrievalFileTransfer.hpp
+++ b/middletier/cta/RetrievalFileTransfer.hpp
@@ -27,7 +27,7 @@ public:
/**
* Constructor.
*
- * @param tapeFileLocation The location of the source tape file.
+ * @param tapeFile The location of the source tape file.
* @param id The identifier of the file transfer.
* @param userRequestId The identifier of the associated user request.
* @param copyNb The copy number.
diff --git a/middletier/cta/RetrievalJob.hpp b/middletier/cta/RetrievalJob.hpp
index d2b424e20929b37d5f8d9cf7e65c17a0e31d4f3f..92f4762455cbc26aba79b10704466e147b83a20d 100644
--- a/middletier/cta/RetrievalJob.hpp
+++ b/middletier/cta/RetrievalJob.hpp
@@ -26,6 +26,7 @@ public:
* @param srcPath The full path of the source file within the archive.
* @param dstUrl The URL of the destination file.
* @param creator The identity of the user that created the job.
+ * @param creationTime The absolute time when the retrieval job was created.
*/
RetrievalJob(
const RetrievalJobState::Enum state,
diff --git a/middletier/cta/SqliteMiddleTierAdmin.cpp b/middletier/cta/SqliteMiddleTierAdmin.cpp
index 3376d078d105b67eb00ec80b0efd766fe3a59ed7..fb97587986fe0a1613ac72eb700ad378a4dc4684 100644
--- a/middletier/cta/SqliteMiddleTierAdmin.cpp
+++ b/middletier/cta/SqliteMiddleTierAdmin.cpp
@@ -8,8 +8,8 @@
//------------------------------------------------------------------------------
// constructor
//------------------------------------------------------------------------------
-cta::SqliteMiddleTierAdmin::SqliteMiddleTierAdmin(Vfs &vfs, SqliteDatabase &sqlite_db):
- m_sqlite_db(sqlite_db), m_vfs(vfs) {
+cta::SqliteMiddleTierAdmin::SqliteMiddleTierAdmin(Vfs &vfs, SqliteDatabase &db):
+ m_vfs(vfs), m_db(db) {
}
//------------------------------------------------------------------------------
@@ -25,7 +25,7 @@ void cta::SqliteMiddleTierAdmin::createAdminUser(
const SecurityIdentity &requester,
const UserIdentity &user,
const std::string &comment) {
- m_sqlite_db.insertAdminUser(requester, user, comment);
+ m_db.insertAdminUser(requester, user, comment);
}
//------------------------------------------------------------------------------
@@ -34,7 +34,7 @@ void cta::SqliteMiddleTierAdmin::createAdminUser(
void cta::SqliteMiddleTierAdmin::deleteAdminUser(
const SecurityIdentity &requester,
const UserIdentity &user) {
- m_sqlite_db.deleteAdminUser(requester, user);
+ m_db.deleteAdminUser(requester, user);
}
//------------------------------------------------------------------------------
@@ -42,7 +42,7 @@ void cta::SqliteMiddleTierAdmin::deleteAdminUser(
//------------------------------------------------------------------------------
std::list<cta::AdminUser> cta::SqliteMiddleTierAdmin::getAdminUsers(
const SecurityIdentity &requester) const {
- return m_sqlite_db.selectAllAdminUsers(requester);
+ return m_db.selectAllAdminUsers(requester);
}
//------------------------------------------------------------------------------
@@ -52,7 +52,7 @@ void cta::SqliteMiddleTierAdmin::createAdminHost(
const SecurityIdentity &requester,
const std::string &hostName,
const std::string &comment) {
- m_sqlite_db.insertAdminHost(requester, hostName, comment);
+ m_db.insertAdminHost(requester, hostName, comment);
}
//------------------------------------------------------------------------------
@@ -61,7 +61,7 @@ void cta::SqliteMiddleTierAdmin::createAdminHost(
void cta::SqliteMiddleTierAdmin::deleteAdminHost(
const SecurityIdentity &requester,
const std::string &hostName) {
- m_sqlite_db.deleteAdminHost(requester, hostName);
+ m_db.deleteAdminHost(requester, hostName);
}
//------------------------------------------------------------------------------
@@ -69,7 +69,7 @@ void cta::SqliteMiddleTierAdmin::deleteAdminHost(
//------------------------------------------------------------------------------
std::list<cta::AdminHost> cta::SqliteMiddleTierAdmin::getAdminHosts(
const SecurityIdentity &requester) const {
- return m_sqlite_db.selectAllAdminHosts(requester);
+ return m_db.selectAllAdminHosts(requester);
}
//------------------------------------------------------------------------------
@@ -78,7 +78,7 @@ std::list<cta::AdminHost> cta::SqliteMiddleTierAdmin::getAdminHosts(
void cta::SqliteMiddleTierAdmin::createStorageClass(
const SecurityIdentity &requester, const std::string &name,
const uint16_t nbCopies, const std::string &comment) {
- m_sqlite_db.insertStorageClass(requester, name, nbCopies, comment);
+ m_db.insertStorageClass(requester, name, nbCopies, comment);
}
//------------------------------------------------------------------------------
@@ -87,7 +87,7 @@ void cta::SqliteMiddleTierAdmin::createStorageClass(
void cta::SqliteMiddleTierAdmin::deleteStorageClass(const SecurityIdentity &requester,
const std::string &name) {
m_vfs.checkStorageClassIsNotInUse(requester, name, "/");
- m_sqlite_db.deleteStorageClass(requester, name);
+ m_db.deleteStorageClass(requester, name);
}
//------------------------------------------------------------------------------
@@ -95,7 +95,7 @@ void cta::SqliteMiddleTierAdmin::deleteStorageClass(const SecurityIdentity &requ
//------------------------------------------------------------------------------
std::list<cta::StorageClass> cta::SqliteMiddleTierAdmin::getStorageClasses(
const SecurityIdentity &requester) const {
- return m_sqlite_db.selectAllStorageClasses(requester);
+ return m_db.selectAllStorageClasses(requester);
}
//------------------------------------------------------------------------------
@@ -106,7 +106,7 @@ void cta::SqliteMiddleTierAdmin::createTapePool(
const std::string &name,
const uint32_t nbPartialTapes,
const std::string &comment) {
- m_sqlite_db.insertTapePool(requester, name, nbPartialTapes, comment);
+ m_db.insertTapePool(requester, name, nbPartialTapes, comment);
}
//------------------------------------------------------------------------------
@@ -114,7 +114,7 @@ void cta::SqliteMiddleTierAdmin::createTapePool(
//------------------------------------------------------------------------------
void cta::SqliteMiddleTierAdmin::deleteTapePool(const SecurityIdentity &requester,
const std::string &name) {
- m_sqlite_db.deleteTapePool(requester, name);
+ m_db.deleteTapePool(requester, name);
}
//------------------------------------------------------------------------------
@@ -122,7 +122,7 @@ void cta::SqliteMiddleTierAdmin::deleteTapePool(const SecurityIdentity &requeste
//------------------------------------------------------------------------------
std::list<cta::TapePool> cta::SqliteMiddleTierAdmin::getTapePools(
const SecurityIdentity &requester) const {
- return m_sqlite_db.selectAllTapePools(requester);
+ return m_db.selectAllTapePools(requester);
}
//------------------------------------------------------------------------------
@@ -134,7 +134,7 @@ void cta::SqliteMiddleTierAdmin::createArchivalRoute(
const uint16_t copyNb,
const std::string &tapePoolName,
const std::string &comment) {
- return m_sqlite_db.insertArchivalRoute(requester, storageClassName, copyNb, tapePoolName, comment);
+ return m_db.insertArchivalRoute(requester, storageClassName, copyNb, tapePoolName, comment);
}
//------------------------------------------------------------------------------
@@ -144,7 +144,7 @@ void cta::SqliteMiddleTierAdmin::deleteArchivalRoute(
const SecurityIdentity &requester,
const std::string &storageClassName,
const uint16_t copyNb) {
- return m_sqlite_db.deleteArchivalRoute(requester, storageClassName, copyNb);
+ return m_db.deleteArchivalRoute(requester, storageClassName, copyNb);
}
//------------------------------------------------------------------------------
@@ -152,7 +152,7 @@ void cta::SqliteMiddleTierAdmin::deleteArchivalRoute(
//------------------------------------------------------------------------------
std::list<cta::ArchivalRoute> cta::SqliteMiddleTierAdmin::getArchivalRoutes(
const SecurityIdentity &requester) const {
- return m_sqlite_db.selectAllArchivalRoutes(requester);
+ return m_db.selectAllArchivalRoutes(requester);
}
//------------------------------------------------------------------------------
@@ -162,7 +162,7 @@ void cta::SqliteMiddleTierAdmin::createLogicalLibrary(
const SecurityIdentity &requester,
const std::string &name,
const std::string &comment) {
- m_sqlite_db.insertLogicalLibrary(requester, name, comment);
+ m_db.insertLogicalLibrary(requester, name, comment);
}
//------------------------------------------------------------------------------
@@ -171,7 +171,7 @@ void cta::SqliteMiddleTierAdmin::createLogicalLibrary(
void cta::SqliteMiddleTierAdmin::deleteLogicalLibrary(
const SecurityIdentity &requester,
const std::string &name) {
- m_sqlite_db.deleteLogicalLibrary(requester, name);
+ m_db.deleteLogicalLibrary(requester, name);
}
//------------------------------------------------------------------------------
@@ -179,7 +179,7 @@ void cta::SqliteMiddleTierAdmin::deleteLogicalLibrary(
//------------------------------------------------------------------------------
std::list<cta::LogicalLibrary> cta::SqliteMiddleTierAdmin::getLogicalLibraries(
const SecurityIdentity &requester) const {
- return m_sqlite_db.selectAllLogicalLibraries(requester);
+ return m_db.selectAllLogicalLibraries(requester);
}
//------------------------------------------------------------------------------
@@ -192,7 +192,7 @@ void cta::SqliteMiddleTierAdmin::createTape(
const std::string &tapePoolName,
const uint64_t capacityInBytes,
const std::string &comment) {
- m_sqlite_db.insertTape(requester, vid, logicalLibraryName, tapePoolName,
+ m_db.insertTape(requester, vid, logicalLibraryName, tapePoolName,
capacityInBytes, comment);
}
@@ -202,7 +202,7 @@ void cta::SqliteMiddleTierAdmin::createTape(
void cta::SqliteMiddleTierAdmin::deleteTape(
const SecurityIdentity &requester,
const std::string &vid) {
- m_sqlite_db.deleteTape(requester, vid);
+ m_db.deleteTape(requester, vid);
}
//------------------------------------------------------------------------------
@@ -210,5 +210,5 @@ void cta::SqliteMiddleTierAdmin::deleteTape(
//------------------------------------------------------------------------------
std::list<cta::Tape> cta::SqliteMiddleTierAdmin::getTapes(
const SecurityIdentity &requester) const {
- return m_sqlite_db.selectAllTapes(requester);
+ return m_db.selectAllTapes(requester);
}
diff --git a/middletier/cta/SqliteMiddleTierAdmin.hpp b/middletier/cta/SqliteMiddleTierAdmin.hpp
index 768a12d1b5a5bf69d9efa728d69c7dc5ddd5cbb0..fb57016648e33571a23568546fee309fc5a23ff3 100644
--- a/middletier/cta/SqliteMiddleTierAdmin.hpp
+++ b/middletier/cta/SqliteMiddleTierAdmin.hpp
@@ -15,9 +15,10 @@ public:
/**
* Constructor.
*
+ * @param vfs The virtual file-system of the mock middle-tier.
* @param db The database of the mock middle-tier.
*/
- SqliteMiddleTierAdmin(Vfs &vfs, SqliteDatabase &sqlite_db);
+ SqliteMiddleTierAdmin(Vfs &vfs, SqliteDatabase &db);
/**
* Destructor.
@@ -75,7 +76,6 @@ public:
* @param requester The identity of the user requesting the deletion of the
* administration host.
* @param hostName The network name of the administration host.
- * @param comment The comment describing the administration host.
*/
void deleteAdminHost(
const SecurityIdentity &requester,
@@ -239,7 +239,7 @@ public:
* @param requester The identity of the user requesting the creation of the
* tape.
* @param vid The volume identifier of the tape.
- * @param logicalLibrary The name of the logical library to which the tape
+ * @param logicalLibraryName The name of the logical library to which the tape
* belongs.
* @param tapePoolName The name of the tape pool to which the tape belongs.
* @param capacityInBytes The capacity of the tape.
@@ -276,10 +276,16 @@ public:
const SecurityIdentity &requester) const;
protected:
-
- SqliteDatabase &m_sqlite_db;
-
+
+ /**
+ * The virtual filesystem of the mock middle-tier.
+ */
Vfs &m_vfs;
+
+ /**
+ * The database of the mock middle-tier.
+ */
+ SqliteDatabase &m_db;
}; // class SqliteMiddleTierAdmin
diff --git a/middletier/cta/SqliteMiddleTierUser.cpp b/middletier/cta/SqliteMiddleTierUser.cpp
index 8fa4a0390f3341d255a2c2037a0c3ca221f1e0e3..860619d879c1a80775f5511906e5d2e9331f66cf 100644
--- a/middletier/cta/SqliteMiddleTierUser.cpp
+++ b/middletier/cta/SqliteMiddleTierUser.cpp
@@ -9,8 +9,8 @@
//------------------------------------------------------------------------------
// constructor
//------------------------------------------------------------------------------
-cta::SqliteMiddleTierUser::SqliteMiddleTierUser(Vfs &vfs, SqliteDatabase &sqlite_db):
- m_sqlite_db(sqlite_db), m_vfs(vfs) {
+cta::SqliteMiddleTierUser::SqliteMiddleTierUser(Vfs &vfs, SqliteDatabase &db):
+ m_db(db), m_vfs(vfs) {
}
//------------------------------------------------------------------------------
@@ -103,14 +103,14 @@ void cta::SqliteMiddleTierUser::archiveToDirectory(
throw Exception("At least one source file should be provided");
}
std::string storageClassName = m_vfs.getDirectoryStorageClass(requester, dstDir);
- cta::StorageClass storageClass = m_sqlite_db.getStorageClassByName(requester, storageClassName);
+ cta::StorageClass storageClass = m_db.getStorageClassByName(requester, storageClassName);
if(storageClass.getNbCopies()==0) {
std::ostringstream message;
message << "archiveToDirectory() - Storage class " << storageClassName << " has 0 copies";
throw(Exception(message.str()));
}
for(int i=1; i<=storageClass.getNbCopies(); i++) {
- cta::ArchivalRoute route = m_sqlite_db.getArchivalRouteOfStorageClass(requester, storageClassName, i);
+ cta::ArchivalRoute route = m_db.getArchivalRouteOfStorageClass(requester, storageClassName, i);
for(std::list<std::string>::const_iterator itor = srcUrls.begin(); itor != srcUrls.end(); itor++) {
const std::string &srcFileName = *itor;
std::string dstPathname;
@@ -120,7 +120,7 @@ void cta::SqliteMiddleTierUser::archiveToDirectory(
else {
dstPathname = dstDir+"/"+srcFileName;
}
- m_sqlite_db.insertArchivalJob(requester, route.getTapePoolName(), srcFileName, dstPathname);
+ m_db.insertArchivalJob(requester, route.getTapePoolName(), srcFileName, dstPathname);
}
}
@@ -153,15 +153,15 @@ void cta::SqliteMiddleTierUser::archiveToFile(
const std::string &srcFileName = srcUrls.front();
std::string storageClassName = m_vfs.getDirectoryStorageClass(requester, cta::Utils::getEnclosingDirPath(dstFile));
- cta::StorageClass storageClass = m_sqlite_db.getStorageClassByName(requester, storageClassName);
+ cta::StorageClass storageClass = m_db.getStorageClassByName(requester, storageClassName);
if(storageClass.getNbCopies()==0) {
std::ostringstream message;
message << "archiveToFile() - Storage class " << storageClassName << " has 0 copies";
throw(Exception(message.str()));
}
for(int i=1; i<=storageClass.getNbCopies(); i++) {
- cta::ArchivalRoute route = m_sqlite_db.getArchivalRouteOfStorageClass(requester, storageClassName, i);
- m_sqlite_db.insertArchivalJob(requester, route.getTapePoolName(), srcFileName, dstFile);
+ cta::ArchivalRoute route = m_db.getArchivalRouteOfStorageClass(requester, storageClassName, i);
+ m_db.insertArchivalJob(requester, route.getTapePoolName(), srcFileName, dstFile);
}
m_vfs.createFile(requester, dstFile, 0666);
@@ -173,7 +173,7 @@ void cta::SqliteMiddleTierUser::archiveToFile(
std::map<cta::TapePool, std::list<cta::ArchivalJob> >
cta::SqliteMiddleTierUser::getArchivalJobs(
const SecurityIdentity &requester) const {
- return m_sqlite_db.selectAllArchivalJobs(requester);
+ return m_db.selectAllArchivalJobs(requester);
}
//------------------------------------------------------------------------------
@@ -182,7 +182,7 @@ std::map<cta::TapePool, std::list<cta::ArchivalJob> >
std::list<cta::ArchivalJob> cta::SqliteMiddleTierUser::getArchivalJobs(
const SecurityIdentity &requester,
const std::string &tapePoolName) const {
- return (m_sqlite_db.selectAllArchivalJobs(requester))[m_sqlite_db.getTapePoolByName(requester, tapePoolName)];
+ return (m_db.selectAllArchivalJobs(requester))[m_db.getTapePoolByName(requester, tapePoolName)];
}
//------------------------------------------------------------------------------
@@ -191,7 +191,7 @@ std::list<cta::ArchivalJob> cta::SqliteMiddleTierUser::getArchivalJobs(
void cta::SqliteMiddleTierUser::deleteArchivalJob(
const SecurityIdentity &requester,
const std::string &dstPath) {
- m_sqlite_db.deleteArchivalJob(requester, dstPath);
+ m_db.deleteArchivalJob(requester, dstPath);
}
//------------------------------------------------------------------------------
@@ -203,7 +203,7 @@ void cta::SqliteMiddleTierUser::retrieve(
const std::string &dstUrl) { //we consider only the case in which dstUrl is a directory so that we accept multiple source files
for(std::list<std::string>::const_iterator it=srcPaths.begin(); it!=srcPaths.end(); it++) {
std::string vid = m_vfs.getVidOfFile(requester, *it, 1); //we only consider 1st copy
- m_sqlite_db.insertRetrievalJob(requester, vid, *it, dstUrl);
+ m_db.insertRetrievalJob(requester, vid, *it, dstUrl);
}
}
@@ -213,7 +213,7 @@ void cta::SqliteMiddleTierUser::retrieve(
std::map<cta::Tape, std::list<cta::RetrievalJob> >
cta::SqliteMiddleTierUser::getRetrievalJobs(
const SecurityIdentity &requester) const {
- return m_sqlite_db.selectAllRetrievalJobs(requester);
+ return m_db.selectAllRetrievalJobs(requester);
}
//------------------------------------------------------------------------------
@@ -222,7 +222,7 @@ std::map<cta::Tape, std::list<cta::RetrievalJob> >
std::list<cta::RetrievalJob> cta::SqliteMiddleTierUser::getRetrievalJobs(
const SecurityIdentity &requester,
const std::string &vid) const {
- return m_sqlite_db.selectAllRetrievalJobs(requester)[m_sqlite_db.getTapeByVid(requester, vid)];
+ return m_db.selectAllRetrievalJobs(requester)[m_db.getTapeByVid(requester, vid)];
}
//------------------------------------------------------------------------------
@@ -231,5 +231,5 @@ std::list<cta::RetrievalJob> cta::SqliteMiddleTierUser::getRetrievalJobs(
void cta::SqliteMiddleTierUser::deleteRetrievalJob(
const SecurityIdentity &requester,
const std::string &dstUrl) {
- m_sqlite_db.deleteRetrievalJob(requester, dstUrl);
+ m_db.deleteRetrievalJob(requester, dstUrl);
}
diff --git a/middletier/cta/SqliteMiddleTierUser.hpp b/middletier/cta/SqliteMiddleTierUser.hpp
index 080e0ee04a6c0b6fc702f7ea5c920339c9248e3b..eebcd6cbec5ebd8e8fd6749b9eedd61ea57fd2db 100644
--- a/middletier/cta/SqliteMiddleTierUser.hpp
+++ b/middletier/cta/SqliteMiddleTierUser.hpp
@@ -19,8 +19,9 @@ public:
* Constructor.
*
* @param db The database of the mock middle-tier.
+ * @param vfs The virtual file-system of the mock middle-tier.
*/
- SqliteMiddleTierUser(Vfs &vfs, SqliteDatabase &sqlite_db);
+ SqliteMiddleTierUser(Vfs &vfs, SqliteDatabase &db);
/**
* Destructor.
@@ -228,8 +229,14 @@ public:
private:
- SqliteDatabase &m_sqlite_db;
+ /**
+ * The database of the mock middle-tier.
+ */
+ SqliteDatabase &m_db;
+ /**
+ * The virtual file-system of the mock middle-tier.
+ */
Vfs &m_vfs;
/**
@@ -282,7 +289,7 @@ private:
* Throws an exception if the specified requester is not authorised to archive
* a file to the specified destination directory within the archive namespace.
*
- * @param requester The identity of the user requesting the archival.
+ * @param user The identity of the user requesting the archival.
* @param dstDir Destination directory within the archive namespace.
*/
void checkUserIsAuthorisedToArchive(
diff --git a/middletier/cta/Tape.hpp b/middletier/cta/Tape.hpp
index 1af068da1b99d5cb6e7b4e32cb9b611896f64bb4..df8f09f072e700aa2890c240b84d329c5f7107a3 100644
--- a/middletier/cta/Tape.hpp
+++ b/middletier/cta/Tape.hpp
@@ -28,10 +28,12 @@ public:
* Constructor.
*
* @param vid The volume identifier of the tape.
- * @param logicalLibrary The name of the logical library to which the tape
+ * @param logicalLibraryName The name of the logical library to which the tape
* belongs.
* @param tapePoolName The name of the tape pool to which the tape belongs.
* @param capacityInBytes The capacity of the tape.
+ * @param dataOnTapeInBytes The amount of data currently stored on the tape in
+ * bytes.
* @param creator The identity of the user that created this configuration
* item.
* @param comment The comment describing this configuration item.
diff --git a/middletier/cta/UserIdentity.hpp b/middletier/cta/UserIdentity.hpp
index b0325731f498a7428f51c83e7b54308b97a53afa..f33dc5220bdf4765f3698c239cb04717167a2b56 100644
--- a/middletier/cta/UserIdentity.hpp
+++ b/middletier/cta/UserIdentity.hpp
@@ -29,7 +29,7 @@ public:
/**
* Sets the user ID of the user.
*
- * @patam uid The user ID of the user.
+ * @param uid The user ID of the user.
*/
void setUid(const uint32_t uid) throw();