From 6f760af54902d32d826efaf6856560b43fe92980 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Tue, 12 Apr 2016 19:51:44 +0000
Subject: [PATCH] final fix for filenames with columns
---
.../dm/common/processing/plugins/fileTransferPlugin.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/python/dm/common/processing/plugins/fileTransferPlugin.py b/src/python/dm/common/processing/plugins/fileTransferPlugin.py
index cb45db43..d3093969 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):
--
GitLab