Skip to content
Snippets Groups Projects
Commit d7fa0758 authored by sveseli's avatar sveseli
Browse files

make code more consistent between upload and startDaq

parent 2b7f6537
No related branches found
No related tags found
No related merge requests found
...@@ -23,7 +23,6 @@ class ExperimentRestApi(DaqRestApi): ...@@ -23,7 +23,6 @@ class ExperimentRestApi(DaqRestApi):
raise InvalidRequest('Experiment data directory must be provided.') raise InvalidRequest('Experiment data directory must be provided.')
daqInfo['experimentName'] = experimentName daqInfo['experimentName'] = experimentName
daqInfo['dataDirectory'] = dataDirectory daqInfo['dataDirectory'] = dataDirectory
#print json.dumps(daqInfo)
url += '?experimentName=%s' % Encoder.encode(experimentName) url += '?experimentName=%s' % Encoder.encode(experimentName)
url += '&dataDirectory=%s' % Encoder.encode(dataDirectory) url += '&dataDirectory=%s' % Encoder.encode(dataDirectory)
url += '&daqInfo=%s' % (Encoder.encode(json.dumps(daqInfo))) url += '&daqInfo=%s' % (Encoder.encode(json.dumps(daqInfo)))
...@@ -48,7 +47,9 @@ class ExperimentRestApi(DaqRestApi): ...@@ -48,7 +47,9 @@ class ExperimentRestApi(DaqRestApi):
raise InvalidRequest('Experiment data directory must be provided.') raise InvalidRequest('Experiment data directory must be provided.')
daqInfo['experimentName'] = experimentName daqInfo['experimentName'] = experimentName
daqInfo['dataDirectory'] = dataDirectory 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') responseDict = self.sendSessionRequest(url=url, method='POST')
return Experiment(responseDict) return Experiment(responseDict)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment