diff --git a/catalogue/SqliteCatalogue.cpp b/catalogue/SqliteCatalogue.cpp index ecdced604490bf8d6f331818d819c8352640c14c..de0962ca460f119b2176cc7cc0a238314efb7ca3 100644 --- a/catalogue/SqliteCatalogue.cpp +++ b/catalogue/SqliteCatalogue.cpp @@ -1548,7 +1548,7 @@ void SqliteCatalogue::createArchiveFile( "DISK_INSTANCE," "DISK_FILE_ID," "DISK_FILE_PATH," - "DISK_FILE_OWNER," + "DISK_FILE_USER," "DISK_FILE_GROUP," "DISK_FILE_RECOVERY_BLOB," "FILE_SIZE," @@ -1562,7 +1562,7 @@ void SqliteCatalogue::createArchiveFile( ":DISK_INSTANCE," ":DISK_FILE_ID," ":DISK_FILE_PATH," - ":DISK_FILE_OWNER," + ":DISK_FILE_USER," ":DISK_FILE_GROUP," ":DISK_FILE_RECOVERY_BLOB," ":FILE_SIZE," @@ -1577,7 +1577,7 @@ void SqliteCatalogue::createArchiveFile( stmt->bind(":DISK_INSTANCE", archiveFile.diskInstance); stmt->bind(":DISK_FILE_ID", archiveFile.diskFileID); stmt->bind(":DISK_FILE_PATH", archiveFile.drData.drPath); - stmt->bind(":DISK_FILE_OWNER", archiveFile.drData.drOwner); + stmt->bind(":DISK_FILE_USER", archiveFile.drData.drOwner); stmt->bind(":DISK_FILE_GROUP", archiveFile.drData.drGroup); stmt->bind(":DISK_FILE_RECOVERY_BLOB", archiveFile.drData.drBlob); stmt->bind(":FILE_SIZE", archiveFile.fileSize); @@ -1637,7 +1637,7 @@ std::list<cta::common::dataStructures::ArchiveFile> "DISK_INSTANCE AS DISK_INSTANCE," "DISK_FILE_ID AS DISK_FILE_ID," "DISK_FILE_PATH AS DISK_FILE_PATH," - "DISK_FILE_OWNER AS DISK_FILE_OWNER," + "DISK_FILE_USER AS DISK_FILE_USER," "DISK_FILE_GROUP AS DISK_FILE_GROUP," "DISK_FILE_RECOVERY_BLOB AS DISK_FILE_RECOVERY_BLOB," "FILE_SIZE AS FILE_SIZE," @@ -1659,7 +1659,7 @@ std::list<cta::common::dataStructures::ArchiveFile> file.diskInstance = stmt->columnText(nameToIdx["DISK_INSTANCE"]); file.diskFileID = stmt->columnText(nameToIdx["DISK_FILE_ID"]); file.drData.drPath = stmt->columnText(nameToIdx["DISK_FILE_PATH"]); - file.drData.drOwner = stmt->columnText(nameToIdx["DISK_FILE_OWNER"]); + file.drData.drOwner = stmt->columnText(nameToIdx["DISK_FILE_USER"]); file.drData.drGroup = stmt->columnText(nameToIdx["DISK_FILE_GROUP"]); file.drData.drBlob = stmt->columnText(nameToIdx["DISK_FILE_RECOVERY_BLOB"]); file.fileSize = stmt->columnUint64(nameToIdx["FILE_SIZE"]); @@ -1693,7 +1693,7 @@ cta::common::dataStructures::ArchiveFile SqliteCatalogue:: "DISK_INSTANCE AS DISK_INSTANCE," "DISK_FILE_ID AS DISK_FILE_ID," "DISK_FILE_PATH AS DISK_FILE_PATH," - "DISK_FILE_OWNER AS DISK_FILE_OWNER," + "DISK_FILE_USER AS DISK_FILE_USER," "DISK_FILE_GROUP AS DISK_FILE_GROUP," "DISK_FILE_RECOVERY_BLOB AS DISK_FILE_RECOVERY_BLOB," "FILE_SIZE AS FILE_SIZE," @@ -1721,7 +1721,7 @@ cta::common::dataStructures::ArchiveFile SqliteCatalogue:: file.diskInstance = stmt->columnText(nameToIdx["DISK_INSTANCE"]); file.diskFileID = stmt->columnText(nameToIdx["DISK_FILE_ID"]); file.drData.drPath = stmt->columnText(nameToIdx["DISK_FILE_PATH"]); - file.drData.drOwner = stmt->columnText(nameToIdx["DISK_FILE_OWNER"]); + file.drData.drOwner = stmt->columnText(nameToIdx["DISK_FILE_USER"]); file.drData.drGroup = stmt->columnText(nameToIdx["DISK_FILE_GROUP"]); file.drData.drBlob = stmt->columnText(nameToIdx["DISK_FILE_RECOVERY_BLOB"]); file.fileSize = stmt->columnUint64(nameToIdx["FILE_SIZE"]); @@ -2094,7 +2094,7 @@ std::list<common::dataStructures::ArchiveFile> SqliteCatalogue::getArchiveFile(c "DISK_INSTANCE AS DISK_INSTANCE," "DISK_FILE_ID AS DISK_FILE_ID," "DISK_FILE_PATH AS DISK_FILE_PATH," - "DISK_FILE_OWNER AS DISK_FILE_OWNER," + "DISK_FILE_USER AS DISK_FILE_USER," "DISK_FILE_GROUP AS DISK_FILE_GROUP," "DISK_FILE_RECOVERY_BLOB AS DISK_FILE_RECOVERY_BLOB," "FILE_SIZE AS FILE_SIZE," @@ -2119,7 +2119,7 @@ std::list<common::dataStructures::ArchiveFile> SqliteCatalogue::getArchiveFile(c file.diskInstance = stmt->columnText(nameToIdx["DISK_INSTANCE"]); file.diskFileID = stmt->columnText(nameToIdx["DISK_FILE_ID"]); file.drData.drPath = stmt->columnText(nameToIdx["DISK_FILE_PATH"]); - file.drData.drOwner = stmt->columnText(nameToIdx["DISK_FILE_OWNER"]); + file.drData.drOwner = stmt->columnText(nameToIdx["DISK_FILE_USER"]); file.drData.drGroup = stmt->columnText(nameToIdx["DISK_FILE_GROUP"]); file.drData.drBlob = stmt->columnText(nameToIdx["DISK_FILE_RECOVERY_BLOB"]); file.fileSize = stmt->columnUint64(nameToIdx["FILE_SIZE"]); diff --git a/catalogue/catalogue_schema.pdf b/catalogue/catalogue_schema.pdf index 3c37ba72996d0fffeeee56751c60b101a9d6e911..f362fa62a5db444591cda397365680fb87025b30 100644 Binary files a/catalogue/catalogue_schema.pdf and b/catalogue/catalogue_schema.pdf differ diff --git a/catalogue/catalogue_schema.sql b/catalogue/catalogue_schema.sql index 3fedd5b04521a12c5cdc81c33bfd6ef9fb312388..d2ede1aab5d0a60535ad0256577a3fb443f73461 100644 --- a/catalogue/catalogue_schema.sql +++ b/catalogue/catalogue_schema.sql @@ -172,7 +172,7 @@ CREATE TABLE ARCHIVE_FILE( DISK_INSTANCE VARCHAR2(100) NOT NULL, DISK_FILE_ID VARCHAR2(100) NOT NULL, DISK_FILE_PATH VARCHAR2(2000) NOT NULL, - DISK_FILE_OWNER VARCHAR2(100) NOT NULL, + DISK_FILE_USER VARCHAR2(100) NOT NULL, DISK_FILE_GROUP VARCHAR2(100) NOT NULL, DISK_FILE_RECOVERY_BLOB VARCHAR2(2000) NOT NULL, FILE_SIZE INTEGER NOT NULL,