From 823e7e972540050f44b87e77f1da21098eeec52c Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Mon, 20 Jun 2016 09:21:35 +0000
Subject: [PATCH] SSDM-3027 : ELN cifs support
SVN: 36711
---
.../reporting-plugins/eln-lims-api/script.py | 28 +++++++++++--------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/eln-lims-api/script.py b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/eln-lims-api/script.py
index 85ae413c113..9e04570b789 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/eln-lims-api/script.py
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/eln-lims-api/script.py
@@ -76,28 +76,33 @@ def getConfigParameterAsString(propertyKey):
return property;
def getDirectLinkURL():
- ftpServerEnable = getConfigParameterAsString("ftp.server.enable");
+ #CIFS
+ cifsServerEnable = getConfigParameterAsString("cifs.server.enable");
+ cifsServerPort = getConfigParameterAsString("cifs.server.smb-port");
+
+ #SFTP
+ sftpPort = getConfigParameterAsString("ftp.server.sftp-port");
+
+ #FTPS
+ ftpServerEnable = getConfigParameterAsString("ftp.server.enable");
ftpServerUseSsl = getConfigParameterAsString("ftp.server.use-ssl");
useSsl = getConfigParameterAsString("use-ssl");
-
ftpPortLegacy = getConfigParameterAsString("ftp.server.port");
ftpPort = getConfigParameterAsString("ftp.server.ftp-port");
- sftpPort = getConfigParameterAsString("ftp.server.sftp-port");
-
-
protocol = None;
port = None;
- if (ftpServerEnable == "true") and (sftpPort is not None):
+
+ if (cifsServerEnable == "true") and (cifsServerPort is not None):
+ protocol = "cifs"
+ port = cifsServerPort;
+ if (sftpPort is not None):
protocol = "sftp";
+ port = sftpPort;
elif (ftpServerEnable == "true") and ((ftpPort is not None) or (ftpPortLegacy is not None)) and (ftpServerUseSsl == "true" or useSsl == "true"):
protocol = "ftps";
-
- if protocol is not None:
- if sftpPort is not None:
- port = sftpPort;
- elif ftpPort is not None:
+ if ftpPort is not None:
port = ftpPort;
elif ftpPortLegacy is not None:
port = ftpPortLegacy;
@@ -105,7 +110,6 @@ def getDirectLinkURL():
directLinkURL = None;
if protocol is not None:
directLinkURL = protocol + "://$URL:" + str(port) + "/";
-
return getJsonForData(directLinkURL);
def getProperties(tr, parameters):
--
GitLab