Deleted DeletedArchiveFileItor and the DeletedArchiveFile data structure

catalogue/Catalogue.hpp

@@ -38,7 +38,6 @@
 #include "common/dataStructures/ArchiveRoute.hpp"
 #include "common/dataStructures/CancelRetrieveRequest.hpp"
 #include "common/dataStructures/DeleteArchiveRequest.hpp"
-#include "common/dataStructures/DeletedArchiveFile.hpp"
 #include "common/dataStructures/DiskFileInfo.hpp"
 #include "common/dataStructures/DriveState.hpp"
 #include "common/dataStructures/FileRecycleLog.hpp"
@@ -863,8 +862,6 @@ public:
   virtual ArchiveFileItor getArchiveFilesItor(
     const TapeFileSearchCriteria &searchCriteria = TapeFileSearchCriteria()) const = 0;
 
-  typedef CatalogueItor<common::dataStructures::DeletedArchiveFile> DeletedArchiveFileItor;
-
   
   typedef CatalogueItor<common::dataStructures::FileRecycleLog> FileRecycleLogItor;
   

common/CMakeLists.txt

@@ -44,7 +44,6 @@ set (COMMON_LIB_SRC_FILES
   dataStructures/ArchiveRequest.cpp
   dataStructures/ArchiveRoute.cpp
   dataStructures/CancelRetrieveRequest.cpp
-  dataStructures/DeletedArchiveFile.cpp
   dataStructures/DeleteArchiveRequest.cpp
   dataStructures/DesiredDriveState.cpp
   dataStructures/DiskFileInfo.cpp

common/dataStructures/DeletedArchiveFile.cpp

-/*
- * The CERN Tape Archive (CTA) project
- * Copyright (C) 2019  CERN
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "DeletedArchiveFile.hpp"
-
-namespace cta {
-namespace common {
-namespace dataStructures {
-
-  DeletedArchiveFile::DeletedArchiveFile():ArchiveFile(){}
-
-}}}
\ No newline at end of file

common/dataStructures/DeletedArchiveFile.hpp

-/*
- * The CERN Tape Archive (CTA) project
- * Copyright (C) 2019  CERN
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "ArchiveFile.hpp"
-
-
-namespace cta {
-namespace common {
-namespace dataStructures {
-
-struct DeletedArchiveFile: public ArchiveFile {
-  
-  DeletedArchiveFile();
-  
-  std::string diskFilePath;
-  std::string diskFileIdWhenDeleted;
-  time_t deletionTime;
-};
-
-}}}
\ No newline at end of file