From 522ba69b8705ace652c1573af8dfeaadaef67297 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Mon, 26 Sep 2016 16:50:00 +0000
Subject: [PATCH] use src url for determining ftp scheme
---
.../common/processing/plugins/gridftpFileTransferPlugin.py | 2 +-
src/python/dm/common/utility/ftpUtility.py | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py b/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py
index d9c22442..03c56c2a 100755
--- a/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py
+++ b/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py
@@ -115,7 +115,7 @@ class GridftpFileTransferPlugin(FileTransferPlugin):
# Calculate checksum
statUtility = self.statUtility
if not statUtility:
- (scheme, host, port, dirPath) = FtpUtility.parseFtpUrl(dataDirectory, defaultPort=self.DEFAULT_PORT)
+ (scheme, host, port, dirPath) = FtpUtility.parseFtpUrl(srcUrl, defaultPort=self.DEFAULT_PORT)
statUtility = FtpUtility(host, port)
if not fileInfo.get('fileSize'):
statUtility.statFile(filePath, fileInfo)
diff --git a/src/python/dm/common/utility/ftpUtility.py b/src/python/dm/common/utility/ftpUtility.py
index c82f5607..6987a6c0 100755
--- a/src/python/dm/common/utility/ftpUtility.py
+++ b/src/python/dm/common/utility/ftpUtility.py
@@ -167,11 +167,12 @@ class FtpUtility:
if __name__ == '__main__':
print "Round 1: "
- ftpUtility = FtpUtility('s7dserv', 2811)
+ ftpUtility = FtpUtility('s33dserv', 2811)
#files = ftpUtility.getFiles2('/export/7IDSprayimage/Cummins/Data')
files = ftpUtility.getFiles2('/export/dm/test')
print files
files = ftpUtility.getFiles('/export/dm/test')
+ print ftpUtility.parseFtpUrl('/export/dm/test')
print files
#files = ftpUtility.getFiles('/export/7IDSprayimage/Cummins/Data')
#files = ftpUtility.getFiles2('/export/8-id-i/test', replacementDirPath='/data/testing/8-id-i')
@@ -187,7 +188,7 @@ if __name__ == '__main__':
#print "Round 2: "
#ftpUtility = FtpUtility('s7dserv', 2811)
#files = ftpUtility.getFiles2('/export/7IDSprayimage/Cummins/Data')
- #print ftpUtility.getMd5Sum('/export/8-id-i/test/testfile01')
+ print ftpUtility.getMd5Sum('/export/dm/test/testfile01')
#print ftpUtility.statFile('/export/8-id-i/test/testfile01')
#ftpUtility = FtpUtility('xstor-devel', 22)
#files = ftpUtility.getFiles2('/data/testing')
--
GitLab