|
@@ -36,7 +36,7 @@ class labkeyDB:
|
|
|
response=self.net.post(url,json.dumps(data))
|
|
|
return response.data
|
|
|
|
|
|
- def addQuery(self,project,schemaName,queryName,fields):
|
|
|
+ def addQuery(self,project,schemaName,queryName,fields,options=None):
|
|
|
|
|
|
listDomainDefinition={}
|
|
|
fNames=[f['name'] for f in fields]
|
|
@@ -44,13 +44,14 @@ class labkeyDB:
|
|
|
if schemaName=='lists':
|
|
|
|
|
|
listDomainDefinition['kind']='IntList'
|
|
|
- fields.insert(0,{'name':'Key','rangeURI':'int'})
|
|
|
- options={}
|
|
|
- options['keyName']='Key'
|
|
|
- if queryName.find('enum')==0:
|
|
|
- options['keyType']='Integer'
|
|
|
- else:
|
|
|
- options['keyType']='AutoIncrementInteger'
|
|
|
+ if not options:
|
|
|
+ fields.insert(0,{'name':'Key','rangeURI':'int'})
|
|
|
+ options={}
|
|
|
+ options['keyName']='Key'
|
|
|
+ if queryName.find('enum')==0:
|
|
|
+ options['keyType']='Integer'
|
|
|
+ else:
|
|
|
+ options['keyType']='AutoIncrementInteger'
|
|
|
listDomainDefinition['options']=options
|
|
|
|
|
|
if schemaName=='study':
|