diff --git a/Code/Mantid/Framework/ICat/inc/MantidICat/ICat3/ICat3Catalog.h b/Code/Mantid/Framework/ICat/inc/MantidICat/ICat3/ICat3Catalog.h index e678f93d47d3..cdd68e7cc2ac 100644 --- a/Code/Mantid/Framework/ICat/inc/MantidICat/ICat3/ICat3Catalog.h +++ b/Code/Mantid/Framework/ICat/inc/MantidICat/ICat3/ICat3Catalog.h @@ -73,7 +73,7 @@ namespace Mantid virtual const std::string getUploadURL( const std::string &investigationID, const std::string &createFileName, const std::string &dataFileDescription); /// Generate a DOI for a datafile based on the related investigation. - virtual const std::string registerDatafileDOI(const long long& investigationID); + virtual const std::string registerDatafileDOI(const long long& databaseID); private: /// The helper class that accesses ICAT functionality. diff --git a/Code/Mantid/Framework/ICat/inc/MantidICat/ICat4/ICat4Catalog.h b/Code/Mantid/Framework/ICat/inc/MantidICat/ICat4/ICat4Catalog.h index 406a4eb4405e..ad5595e91c7e 100644 --- a/Code/Mantid/Framework/ICat/inc/MantidICat/ICat4/ICat4Catalog.h +++ b/Code/Mantid/Framework/ICat/inc/MantidICat/ICat4/ICat4Catalog.h @@ -70,7 +70,7 @@ namespace Mantid virtual const std::string getUploadURL( const std::string &investigationID, const std::string &createFileName, const std::string &dataFileDescription); /// Generate a DOI for a datafile based on the related investigation. - virtual const std::string registerDatafileDOI(const long long& investigationID); + virtual const std::string registerDatafileDOI(const long long& databaseID); private: // Ensures human friendly error messages are provided to the user. diff --git a/Code/Mantid/Framework/ICat/src/ICat3/ICat3Catalog.cpp b/Code/Mantid/Framework/ICat/src/ICat3/ICat3Catalog.cpp index eec36e8611ff..f086da42a181 100644 --- a/Code/Mantid/Framework/ICat/src/ICat3/ICat3Catalog.cpp +++ b/Code/Mantid/Framework/ICat/src/ICat3/ICat3Catalog.cpp @@ -119,12 +119,12 @@ namespace Mantid /** * Generate a DOI for a datafile based on the related investigation. - * @param investigationID :: The investigation of the datafile to register the DOI for. + * @param databaseID :: The database ID of the datafile's investigation to register the DOI for. * @return The DOI that was generated for the datafile. */ - const std::string ICat3Catalog::registerDatafileDOI(const long long& investigationID) + const std::string ICat3Catalog::registerDatafileDOI(const long long& databaseID) { - UNUSED_ARG(investigationID); + UNUSED_ARG(databaseID); throw std::runtime_error("ICat3Catalog does not support registrations of DOIs."); } diff --git a/Code/Mantid/Framework/ICat/src/ICat4/ICat4Catalog.cpp b/Code/Mantid/Framework/ICat/src/ICat4/ICat4Catalog.cpp index c773f2fb2fcb..a91d36f04ff2 100644 --- a/Code/Mantid/Framework/ICat/src/ICat4/ICat4Catalog.cpp +++ b/Code/Mantid/Framework/ICat/src/ICat4/ICat4Catalog.cpp @@ -779,13 +779,11 @@ namespace Mantid /** * Generate a DOI for a datafile based on the related investigation. - * @param investigationID :: The investigation of the datafile to register the DOI for. + * @param databaseID :: The database ID of the datafile's investigation to register the DOI for. * @return The DOI that was generated for the datafile. */ - const std::string ICat4Catalog::registerDatafileDOI(const long long& investigationID) + const std::string ICat4Catalog::registerDatafileDOI(const long long& databaseID) { - UNUSED_ARG(investigationID); - return ""; } /**