diff --git a/doc/RELEASE_NOTES.txt b/doc/RELEASE_NOTES.txt index 90d7d0d70c6593e1805b0056da2079981b518efe..3c4718a4a99640f116b413a64bbcf1cf052ddc8c 100644 --- a/doc/RELEASE_NOTES.txt +++ b/doc/RELEASE_NOTES.txt @@ -1,4 +1,4 @@ -Release 0.7 () +Release 0.7 (12/08/2015) ============================= - Introduced framework and user interfaces for tracking progress of file diff --git a/src/python/dm/__init__.py b/src/python/dm/__init__.py index 85013a64cb1a1c6ceb6fb6577265fd28815090dc..7d57f85f9cb8b97557e24e73dab9ccc3b9799eaf 100644 --- a/src/python/dm/__init__.py +++ b/src/python/dm/__init__.py @@ -1 +1 @@ -__version__ = "0.6 (2015.11.09)" +__version__ = "0.7 (2015.12.08)" diff --git a/src/python/dm/common/processing/plugins/rsyncWithChecksumAndDeleteFileTransferPlugin.py b/src/python/dm/common/processing/plugins/rsyncWithChecksumAndDeleteFileTransferPlugin.py index f397d56652dde41830f6b58ba202dd037010fe59..87a5125ea6194276c33cfc1af726d21760947bb6 100755 --- a/src/python/dm/common/processing/plugins/rsyncWithChecksumAndDeleteFileTransferPlugin.py +++ b/src/python/dm/common/processing/plugins/rsyncWithChecksumAndDeleteFileTransferPlugin.py @@ -20,11 +20,10 @@ class RsyncWithChecksumAndDeleteFileTransferPlugin(FileTransferPlugin): def processFile(self, fileInfo): filePath = fileInfo.get('filePath') dataDirectory = fileInfo.get('dataDirectory') - experiment = fileInfo.get('experiment') - experimentName = experiment.get('name') - experimentFilePath = fileInfo.get('experimentFilePath') - storageHost = experiment.get('storageHost') - storageDirectory = experiment.get('storageDirectory') + experimentFilePath = fileInfo.get('experimentFilePath') + experimentName = fileInfo.get('experimentName') + storageHost = fileInfo.get('storageHost') + storageDirectory = fileInfo.get('storageDirectory') destUrl = self.getDestUrl(filePath, dataDirectory, storageHost, storageDirectory) # Use relative path with respect to data directory as a source os.chdir(dataDirectory) diff --git a/src/python/dm/daq_web_service/service/impl/dmFileSystemEventHandler.py b/src/python/dm/daq_web_service/service/impl/dmFileSystemEventHandler.py index 7cc20a76b04f6ecc57b2bfecd58128b937151ee8..dc9f033a5b8c2c9d0dfb4ebda3ef26ac74451692 100755 --- a/src/python/dm/daq_web_service/service/impl/dmFileSystemEventHandler.py +++ b/src/python/dm/daq_web_service/service/impl/dmFileSystemEventHandler.py @@ -42,9 +42,9 @@ class DmFileSystemEventHandler(FileSystemEventHandler): def processEvent(self, event): if event.is_directory: - self.logger.debug('Processing directory event: %s , src path: %s , latest files: %s' % (event.__dict__, event.src_path, files)) try: files = glob.glob(os.path.join(event.src_path,'*.*')) + self.logger.debug('Processing directory event: %s , src path: %s , latest files: %s' % (event.__dict__, event.src_path, files)) if len(files) > 0: filePath = max(files, key=os.path.getctime) self.logger.debug('Latest file: %s' % (filePath))