diff --git a/src/python/dm/__init__.py b/src/python/dm/__init__.py index 39a6cd5e53fb558096cefc7153879295f49223bb..68b3c89b95ddad4a98f17804af4d831d695f6aa1 100644 --- a/src/python/dm/__init__.py +++ b/src/python/dm/__init__.py @@ -1 +1 @@ -__version__ = "0.8 (2016.01.25)" +__version__ = "0.8 (2016.01.26)" diff --git a/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py b/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py index 89ebabc3b1a14da1b8cb8c7113530387653c5dda..3b5e84bfa3a5b1be00774cd04f192f4b32307bce 100755 --- a/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py +++ b/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py @@ -83,9 +83,11 @@ class GridftpFileTransferPlugin(FileTransferPlugin): srcUrl = self.getSrcUrl(filePath, dataDirectory) # Calculate checksum + (scheme, host, port, dirPath) = FtpUtility.parseFtpUrl(dataDirectory, defaultPort=self.DEFAULT_PORT) + ftpUtility = FtpUtility(host, port) + ftpUtility.statFile(filePath, fileInfo) if self.localMd5Sum: - FileUtility.statFile(filePath, fileInfo) - FileUtility.getMd5Sum(filePath, fileInfo) + ftpUtility.getMd5Sum(filePath, fileInfo) # Transfer file self.logger.debug('Starting transfer: %s' % fileInfo) diff --git a/src/python/dm/common/processing/plugins/mongoDbFileCatalogPlugin.py b/src/python/dm/common/processing/plugins/mongoDbFileCatalogPlugin.py index fe5e35758031745408d645658a6cd86a8a4ad20b..00850c81430b7b822ebb25758b5a15f53c4a1b4e 100755 --- a/src/python/dm/common/processing/plugins/mongoDbFileCatalogPlugin.py +++ b/src/python/dm/common/processing/plugins/mongoDbFileCatalogPlugin.py @@ -29,7 +29,7 @@ class MongoDbFileCatalogPlugin(FileProcessor): # Prepare catalogging entry fileInfo2 = {} - for key in ['md5Sum', 'fileSize', 'fileCreationTime', 'fileCreationTimeStamp']: + for key in ['md5Sum', 'fileSize', 'fileCreationTime', 'fileCreationTimeStamp', 'fileModificationTime', 'fileModificationTimeStamp']: if fileInfo.has_key(key): fileInfo2[key] = fileInfo.get(key, '') fileLocations = fileInfo.get('fileLocations', []) diff --git a/src/python/dm/common/processing/plugins/rsyncFileTransferPlugin.py b/src/python/dm/common/processing/plugins/rsyncFileTransferPlugin.py index f4d1b8a0219224b217c0cbffe7e651522b9543b7..525ad75214008ebe7ee501582aa44b3495441f89 100755 --- a/src/python/dm/common/processing/plugins/rsyncFileTransferPlugin.py +++ b/src/python/dm/common/processing/plugins/rsyncFileTransferPlugin.py @@ -54,6 +54,7 @@ class RsyncFileTransferPlugin(FileTransferPlugin): srcUrl = self.getSrcUrl(filePath, dataDirectory) # Calculate checksum + FileUtility.statFile(filePath, fileInfo) if self.localMd5Sum: FileUtility.statFile(filePath, fileInfo) FileUtility.getMd5Sum(filePath, fileInfo)