diff --git a/src/DIRAC/DataManagementSystem/DB/FileCatalogComponents/DirectoryMetadata/MultiVODirectoryMetadata.py b/src/DIRAC/DataManagementSystem/DB/FileCatalogComponents/DirectoryMetadata/MultiVODirectoryMetadata.py index e0aa1d625d7..879bae5d536 100644 --- a/src/DIRAC/DataManagementSystem/DB/FileCatalogComponents/DirectoryMetadata/MultiVODirectoryMetadata.py +++ b/src/DIRAC/DataManagementSystem/DB/FileCatalogComponents/DirectoryMetadata/MultiVODirectoryMetadata.py @@ -158,17 +158,17 @@ def setMetaParameter(self, dPath, metaName, metaValue, credDict): def getDirectoryMetadata(self, path, credDict, inherited=True, ownData=True): """ - Get metadata for the given directory aggregating metadata for the directory itself - and for all the parent directories if inherited flag is True. Get also the non-indexed - metadata parameters. - - :param str path: directory path - :param dict credDict: client credential dictionary - :param bool inherited: include parent directories if True - :param bool ownData: - :return: standard Dirac result object + additional MetadataOwner \ - and MetadataType dict entries if the operation is successful. - """ + Get metadata for the given directory aggregating metadata for the directory itself + and for all the parent directories if inherited flag is True. Get also the non-indexed + metadata parameters. + + :param str path: directory path + :param dict credDict: client credential dictionary + :param bool inherited: include parent directories if True + :param bool ownData: + :return: standard Dirac result object + additional MetadataOwner \ + and MetadataType dict entries if the operation is successful. + """ result = super().getDirectoryMetadata(path, credDict, inherited, ownData) if not result["OK"]: @@ -181,9 +181,16 @@ def getDirectoryMetadata(self, path, credDict, inherited=True, ownData=True): return result - def findDirIDsByMetadata(self, metaDict, dPath, credDict): - """Find Directories satisfying the given metadata and being subdirectories of - the given path + def findDirectoriesByMetadata(self, queryDict, path, credDict): """ - fMetaDict = _getMetaNameDict(metaDict, credDict) - return super().findDirIDsByMetadata(fMetaDict, dPath, credDict) + Find Directory names satisfying the given metadata and being subdirectories of + the given path. + + :param dict queryDict: dictionary containing query data + :param str path: starting directory path + :param dict credDict: client credential dictionary + :return: S_OK/S_ERROR, Value list of selected directory paths + """ + + fMetaDict = _getMetaNameDict(queryDict, credDict) + return super().findDirectoriesByMetadata(fMetaDict, path, credDict) diff --git a/src/DIRAC/DataManagementSystem/DB/FileCatalogComponents/FileMetadata/MultiVOFileMetadata.py b/src/DIRAC/DataManagementSystem/DB/FileCatalogComponents/FileMetadata/MultiVOFileMetadata.py index 67261768d65..02892073b43 100644 --- a/src/DIRAC/DataManagementSystem/DB/FileCatalogComponents/FileMetadata/MultiVOFileMetadata.py +++ b/src/DIRAC/DataManagementSystem/DB/FileCatalogComponents/FileMetadata/MultiVOFileMetadata.py @@ -120,7 +120,7 @@ def getFileUserMetadata(self, path, credDict): def findFilesByMetadata(self, metaDict, path, credDict): """Find Files satisfying the given metadata - :param dict metaDict: dictionary with the metaquery parameters + :param dict metaDict: dictionary with the metaquery parameters :param dict metaDict: dictionary with the metaquery parameters :param str path: Path to search into :param dict credDict: Dictionary with the user credentials