From fe267cabd4c662118841526cf7e67bfc0e108d5b Mon Sep 17 00:00:00 2001
From: "Barbara B. Frosik" <bfrosik@aps.anl.gov>
Date: Tue, 1 Sep 2015 20:50:49 +0000
Subject: [PATCH] minor changes in daq service
---
src/python/dm/daq_web_service/api/experimentRestApi.py | 5 +++--
.../daq_web_service/service/experimentSessionController.py | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/python/dm/daq_web_service/api/experimentRestApi.py b/src/python/dm/daq_web_service/api/experimentRestApi.py
index 13d09556..cbdc2dc6 100755
--- a/src/python/dm/daq_web_service/api/experimentRestApi.py
+++ b/src/python/dm/daq_web_service/api/experimentRestApi.py
@@ -21,10 +21,11 @@ class ExperimentRestApi(DaqRestApi):
raise InvalidRequest('Experiment name must be provided.')
if dataDirectory is None or not len(dataDirectory):
raise InvalidRequest('Experiment data directory must be provided.')
- url += '?dataDirectory=%s' % dataDirectory
- url += '&experimentName=%s' % experimentName
daqInfo['experimentName'] = experimentName
daqInfo['dataDirectory'] = dataDirectory
+ print json.dumps(daqInfo)
+ url += '?experimentName=%s' % experimentName
+ url += '&dataDirectory=%s' % dataDirectory
responseDict = self.sendSessionRequest(url=url, method='POST')
return Experiment(responseDict)
diff --git a/src/python/dm/daq_web_service/service/experimentSessionController.py b/src/python/dm/daq_web_service/service/experimentSessionController.py
index 26f6f39b..7139e3d0 100755
--- a/src/python/dm/daq_web_service/service/experimentSessionController.py
+++ b/src/python/dm/daq_web_service/service/experimentSessionController.py
@@ -25,7 +25,7 @@ class ExperimentSessionController(DmSessionController):
raise InvalidRequest('Missing experiment name.')
dataDirectory = kwargs.get('dataDirectory')
if dataDirectory is None or not len(dataDirectory):
- raise InvalidRequest('Missing experiment name.')
+ raise InvalidRequest('Missing data directory.')
response = self.experimentSessionControllerImpl.startDaq(experimentName, dataDirectory).getFullJsonRep()
self.logger.debug('Returning: %s' % response)
return response
--
GitLab