merged updated file transfer plugins from 0.6

src/python/dm/__init__.py

-__version__ = "0.6 (2015.11.06)"
+__version__ = "0.6 (2015.11.09)"

src/python/dm/common/processing/plugins/fileTransferPlugin.py

@@ -26,7 +26,7 @@ class FileTransferPlugin(FileProcessor):
 
         storageHost = experiment.get('storageHost')
         storageDirectory = experiment.get('storageDirectory')
-        destUrl = self.getDestUrl(storageHost, storageDirectory)
+        destUrl = self.getDestUrl(filePath, dataDirectory, storageHost, storageDirectory)
         srcUrl = self.getSrcUrl(filePath, dataDirectory)
         self.start(srcUrl, destUrl)
 
@@ -36,7 +36,7 @@ class FileTransferPlugin(FileProcessor):
         srcUrl = os.path.relpath(filePath, dataDirectory)
         return srcUrl
     
-    def getDestUrl(self, storageHost, storageDirectory):
+    def getDestUrl(self, filePath, dataDirectory, storageHost, storageDirectory):
         destUrl = '%s:%s' % (storageHost, storageDirectory)
         return destUrl
     

src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py

 #!/usr/bin/env python
 
+import os
 from fileTransferPlugin import FileTransferPlugin
 
 class GridftpFileTransferPlugin(FileTransferPlugin):
@@ -16,8 +17,10 @@ class GridftpFileTransferPlugin(FileTransferPlugin):
             srcUrl = '%s/%s' % (self.src,filePath)
         return srcUrl
     
-    def getDestUrl(self, storageHost, storageDirectory):
-        destUrl = 'sshftp://%s/%s/' % (storageHost, storageDirectory)
+    def getDestUrl(self, filePath, dataDirectory, storageHost, storageDirectory):
+        dirName = os.path.dirname(os.path.relpath(filePath, dataDirectory)).strip()
+        fileName = os.path.basename(filePath)
+        destUrl = 'sshftp://%s/%s/%s/%s' % (storageHost, storageDirectory, dirName, fileName)
         return destUrl
 
 #######################################################################

src/python/dm/daq_web_service/service/impl/rsyncWithChecksumAndDeleteFileTransferPlugin.py

@@ -25,7 +25,7 @@ class RsyncWithChecksumAndDeleteFileTransferPlugin(FileTransferPlugin):
         experimentFilePath = fileInfo.get('experimentFilePath')
         storageHost = experiment.get('storageHost')
         storageDirectory = experiment.get('storageDirectory')
-        destUrl = self.getDestUrl(storageHost, storageDirectory)
+        destUrl = self.getDestUrl(filePath, dataDirectory, storageHost, storageDirectory)
         # Use relative path with respect to data directory as a source
         os.chdir(dataDirectory)
         srcUrl = self.getSrcUrl(filePath, dataDirectory)