From b4575b85bac4588297e416eb8c7213f8c1e13701 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Thu, 8 Oct 2015 07:07:12 +0000
Subject: [PATCH] added stat file interface
---
.../dm/ds_web_service/api/fileRestApi.py | 21 +++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/python/dm/ds_web_service/api/fileRestApi.py b/src/python/dm/ds_web_service/api/fileRestApi.py
index 6e28ef0b..597d886b 100755
--- a/src/python/dm/ds_web_service/api/fileRestApi.py
+++ b/src/python/dm/ds_web_service/api/fileRestApi.py
@@ -15,13 +15,26 @@ class FileRestApi(DsRestApi):
DsRestApi.__init__(self, username, password, host, port, protocol)
@DsRestApi.execute
- def processFile(self, filePath, experimentName, fileInfo={}):
+ def processFile(self, experimentFilePath, experimentName, fileInfo={}):
url = '%s/files/processFile' % (self.getContextRoot())
- if not filePath:
- raise InvalidRequest('File path must be provided.')
+ if not experimentFilePath:
+ raise InvalidRequest('Experiment file path must be provided.')
if not experimentName:
raise InvalidRequest('Experiment name must be provided.')
- fileInfo['filePath'] = filePath
+ fileInfo['experimentFilePath'] = experimentFilePath
+ fileInfo['experimentName'] = experimentName
+ url += '?fileInfo=%s' % (Encoder.encode(json.dumps(fileInfo)))
+ responseDict = self.sendSessionRequest(url=url, method='POST')
+ return FileMetadata(responseDict)
+
+ @DsRestApi.execute
+ def statFile(self, experimentFilePath, experimentName, fileInfo={}):
+ url = '%s/files/statFile' % (self.getContextRoot())
+ if not experimentFilePath:
+ raise InvalidRequest('Experiment file path must be provided.')
+ if not experimentName:
+ raise InvalidRequest('Experiment name must be provided.')
+ fileInfo['experimentFilePath'] = experimentFilePath
fileInfo['experimentName'] = experimentName
url += '?fileInfo=%s' % (Encoder.encode(json.dumps(fileInfo)))
responseDict = self.sendSessionRequest(url=url, method='POST')
--
GitLab