Renamed Catalogue::getArchiveFiles() to Catalogue::getArchiveFilesItor()

catalogue/Catalogue.hpp

@@ -487,7 +487,7 @@ public:
    * @param searchCriteria The search criteria.
    * @return The archive files.
    */
-  virtual ArchiveFileItor getArchiveFiles(
+  virtual ArchiveFileItor getArchiveFilesItor(
     const TapeFileSearchCriteria &searchCriteria = TapeFileSearchCriteria()) const = 0;
 
   /**

catalogue/CatalogueRetryWrapper.hpp

@@ -337,8 +337,8 @@ public:
     return retryOnLostConnection(m_log, [&]{return m_catalogue->modifyMountPolicyComment(admin, name, comment);}, m_maxTriesToConnect);
   }
 
-  ArchiveFileItor getArchiveFiles(const TapeFileSearchCriteria &searchCriteria = TapeFileSearchCriteria()) const override {
-    return retryOnLostConnection(m_log, [&]{return m_catalogue->getArchiveFiles(searchCriteria);}, m_maxTriesToConnect);
+  ArchiveFileItor getArchiveFilesItor(const TapeFileSearchCriteria &searchCriteria = TapeFileSearchCriteria()) const override {
+    return retryOnLostConnection(m_log, [&]{return m_catalogue->getArchiveFilesItor(searchCriteria);}, m_maxTriesToConnect);
   }
 
   std::list<common::dataStructures::ArchiveFile> getFilesForRepack(const std::string &vid, const uint64_t startFSeq, const uint64_t maxNbFiles) const override {

catalogue/DummyCatalogue.hpp

@@ -56,7 +56,7 @@ public:
   void filesWrittenToTape(const std::set<TapeItemWrittenPointer>& event) override { throw exception::Exception(std::string("In ")+__PRETTY_FUNCTION__+": not implemented"); }
   std::list<common::dataStructures::AdminUser> getAdminUsers() const { throw exception::Exception(std::string("In ")+__PRETTY_FUNCTION__+": not implemented"); }
   common::dataStructures::ArchiveFile getArchiveFileById(const uint64_t id) override { throw exception::Exception(std::string("In ")+__PRETTY_FUNCTION__+": not implemented"); }
-  ArchiveFileItor getArchiveFiles(const TapeFileSearchCriteria& searchCriteria) const { throw exception::Exception(std::string("In ")+__PRETTY_FUNCTION__+": not implemented"); }
+  ArchiveFileItor getArchiveFilesItor(const TapeFileSearchCriteria& searchCriteria) const { throw exception::Exception(std::string("In ")+__PRETTY_FUNCTION__+": not implemented"); }
   std::list<common::dataStructures::ArchiveFile> getFilesForRepack(const std::string &vid, const uint64_t startFSeq, const uint64_t maxNbFiles) const override { throw exception::Exception(std::string("In ")+__PRETTY_FUNCTION__+": not implemented"); }
   std::list<common::dataStructures::ArchiveRoute> getArchiveRoutes() const { throw exception::Exception(std::string("In ")+__PRETTY_FUNCTION__+": not implemented"); }
   std::list<common::dataStructures::LogicalLibrary> getLogicalLibraries() const { throw exception::Exception(std::string("In ")+__PRETTY_FUNCTION__+": not implemented"); }

catalogue/RdbmsCatalogue.cpp

@@ -4002,9 +4002,9 @@ void RdbmsCatalogue::checkTapeFileSearchCriteria(const TapeFileSearchCriteria &s
 }
 
 //------------------------------------------------------------------------------
-// getArchiveFiles
+// getArchiveFilesItor
 //------------------------------------------------------------------------------
-ArchiveFileItor RdbmsCatalogue::getArchiveFiles(const TapeFileSearchCriteria &searchCriteria) const {
+ArchiveFileItor RdbmsCatalogue::getArchiveFilesItor(const TapeFileSearchCriteria &searchCriteria) const {
 
   checkTapeFileSearchCriteria(searchCriteria);
 

catalogue/RdbmsCatalogue.hpp

@@ -489,7 +489,7 @@ public:
    * @param searchCriteria The search criteria.
    * @return The archive files.
    */
-  ArchiveFileItor getArchiveFiles(const TapeFileSearchCriteria &searchCriteria) const override;
+  ArchiveFileItor getArchiveFilesItor(const TapeFileSearchCriteria &searchCriteria) const override;
 
   /**
    * Returns the specified files in tape file sequence order.

xroot_plugins/XrdCtaArchiveFileLs.hpp

@@ -40,7 +40,7 @@ public:
     XrdSsiPb::Log::Msg(XrdSsiPb::Log::DEBUG, LOG_SUFFIX, "ArchiveFileLsStream() constructor");
 
     if(!m_isSummary) {
-      m_archiveFileItor = m_catalogue.getArchiveFiles(searchCriteria);
+      m_archiveFileItor = m_catalogue.getArchiveFilesItor(searchCriteria);
     }
   }