From 10516acb424a12e1333682770bedda6d85e4567a Mon Sep 17 00:00:00 2001
From: "Barbara B. Frosik" <bfrosik@aps.anl.gov>
Date: Mon, 21 Sep 2015 17:44:31 +0000
Subject: [PATCH] fixing startDaq issue with daqInfo
---
.../daq_web_service/service/experimentSessionController.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/python/dm/daq_web_service/service/experimentSessionController.py b/src/python/dm/daq_web_service/service/experimentSessionController.py
index 5e348959..e62999b8 100755
--- a/src/python/dm/daq_web_service/service/experimentSessionController.py
+++ b/src/python/dm/daq_web_service/service/experimentSessionController.py
@@ -28,9 +28,10 @@ class ExperimentSessionController(DmSessionController):
if dataDirectory is None or not len(dataDirectory):
raise InvalidRequest('Missing data directory.')
dataDirectory = Encoder.decode(dataDirectory)
- daqInfo = kwargs.get('daqInfo')
+ daqInfo = {}
+ encodedDaqInfo = kwargs.get('daqInfo')
if daqInfo is not None:
- daqInfo = Encoder.decode(daqInfo)
+ daqInfo = json.loads(Encoder.decode(encodedDaqInfo))
response = self.experimentSessionControllerImpl.startDaq(experimentName, dataDirectory, daqInfo).getFullJsonRep()
self.logger.debug('Returning: %s' % response)
return response
--
GitLab