diff --git a/src/python/dm/common/processing/plugins/fileProcessor.py b/src/python/dm/common/processing/plugins/fileProcessor.py index c13fceda9eafe32d23af92cbf33f48d0368370fa..e1ff4ba56d3af24c62f0f44610757ee96ec0785f 100755 --- a/src/python/dm/common/processing/plugins/fileProcessor.py +++ b/src/python/dm/common/processing/plugins/fileProcessor.py @@ -12,6 +12,11 @@ class FileProcessor: @abc.abstractmethod def processFile(self, fileInfo): return NotImplemented + + def replaceTemplates(self, inputString, fileInfo): + experimentName = fileInfo.get('experimentName', ''): + outputString = inputString.replace('EXPERIMENT_NAME', experimentName) + return outputString def checkUploadFilesForProcessing(self, filePathsDict, uploadInfo): return {} diff --git a/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py b/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py index bd3d02a10ecf6f72aa43767ab5f2ec0fb01f8831..929dc77ba3803eb212a5b0d8aa5ed80ae31e63be 100755 --- a/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py +++ b/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py @@ -97,6 +97,8 @@ class GridftpFileTransferPlugin(FileTransferPlugin): ftpUtility.getMd5Sum(filePath, fileInfo) # Transfer file + srcUrl = self.replaceTemplates(srcUrl, fileInfo) + destUrl = self.replaceTemplates(destUrl, fileInfo) self.logger.debug('Starting transfer: %s' % fileInfo) self.start(srcUrl, destUrl) diff --git a/src/python/dm/common/processing/plugins/rsyncFileTransferPlugin.py b/src/python/dm/common/processing/plugins/rsyncFileTransferPlugin.py index a2b58db90d129c60fc958feefad68a2ff4bdb082..38ec8ec1d307eecb4b271d8016111d8f3e23c04b 100755 --- a/src/python/dm/common/processing/plugins/rsyncFileTransferPlugin.py +++ b/src/python/dm/common/processing/plugins/rsyncFileTransferPlugin.py @@ -60,6 +60,8 @@ class RsyncFileTransferPlugin(FileTransferPlugin): FileUtility.getMd5Sum(filePath, fileInfo) # Transfer file + srcUrl = self.replaceTemplates(srcUrl, fileInfo) + destUrl = self.replaceTemplates(destUrl, fileInfo) self.logger.debug('Starting transfer: %s' % fileInfo) self.start(srcUrl, destUrl)