diff --git a/src/python/dm/common/processing/plugins/fileTransferPlugin.py b/src/python/dm/common/processing/plugins/fileTransferPlugin.py index cb45db43fbc17f68e113b69edf0f407c295643b9..d30939699e90979c2880c465795e331082bd5f92 100755 --- a/src/python/dm/common/processing/plugins/fileTransferPlugin.py +++ b/src/python/dm/common/processing/plugins/fileTransferPlugin.py @@ -34,15 +34,15 @@ class FileTransferPlugin(FileProcessor): self.start(src=srcUrl, dest=destUrl, templateInfo=fileInfo) def getSrcUrl(self, filePath, dataDirectory): - return filePath + srcUrl = '%s/./%s' % (dataDirectory, os.path.relpath(filePath, dataDirectory)) + return srcUrl def getDestUrl(self, filePath, dataDirectory, storageHost, storageDirectory): # Use relative path with respect to data directory as a source - srcDir = os.path.dirname(os.path.relpath(filePath, dataDirectory)) if self.dest: - destUrl = '%s/%s/' % (self.dest, srcDir) + destUrl = '%s/' % (self.dest, srcDir) else: - destUrl = '%s:%s/%s/' % (storageHost, storageDirectory, srcDir) + destUrl = '%s:%s/' % (storageHost, storageDirectory) return destUrl def getSrcDirUrl(self, dataDirectory):