From d7fa0758fb6a43da338fce482ebd90a141582956 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Thu, 8 Oct 2015 07:11:56 +0000
Subject: [PATCH] make code more consistent between upload and startDaq
---
src/python/dm/daq_web_service/api/experimentRestApi.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/python/dm/daq_web_service/api/experimentRestApi.py b/src/python/dm/daq_web_service/api/experimentRestApi.py
index f6cca3a4..8e3c433b 100755
--- a/src/python/dm/daq_web_service/api/experimentRestApi.py
+++ b/src/python/dm/daq_web_service/api/experimentRestApi.py
@@ -23,7 +23,6 @@ class ExperimentRestApi(DaqRestApi):
raise InvalidRequest('Experiment data directory must be provided.')
daqInfo['experimentName'] = experimentName
daqInfo['dataDirectory'] = dataDirectory
- #print json.dumps(daqInfo)
url += '?experimentName=%s' % Encoder.encode(experimentName)
url += '&dataDirectory=%s' % Encoder.encode(dataDirectory)
url += '&daqInfo=%s' % (Encoder.encode(json.dumps(daqInfo)))
@@ -48,7 +47,9 @@ class ExperimentRestApi(DaqRestApi):
raise InvalidRequest('Experiment data directory must be provided.')
daqInfo['experimentName'] = experimentName
daqInfo['dataDirectory'] = dataDirectory
- url += '?daqInfo=%s' % (Encoder.encode(json.dumps(daqInfo)))
+ url += '?experimentName=%s' % Encoder.encode(experimentName)
+ url += '&dataDirectory=%s' % Encoder.encode(dataDirectory)
+ url += '&daqInfo=%s' % (Encoder.encode(json.dumps(daqInfo)))
responseDict = self.sendSessionRequest(url=url, method='POST')
return Experiment(responseDict)
--
GitLab