Reverting to old way of query generation

labkeyDatabaseBrowser.py

@@ -34,32 +34,33 @@ class labkeyDB:
       response=self.net.post(url,json.dumps(data))
       return response.data
 
-   def addQuery(self,project,schemaName,queryName,fields,options={}):
+   def addQuery(self,project,schemaName,queryName,fields):
+      
       listDomainDefinition={}
       fNames=[f['name'] for f in fields]
+      
       if schemaName=='lists':
+
          listDomainDefinition['kind']='IntList'
-         #check if options were set
-         try:
-            x=options['keyName']
-         except KeyError:
-            if 'Key' not in fNames:
-               fields.insert(0,{'name':'Key','rangeURI':'int'})
-            options['keyName']='Key'
-            if queryName.find('enum')==0:
-               options['keyType']='Integer'
-            else:
-               options['keyType']='AutoIncrementInteger'
+         fields.insert(0,{'name':'Key','rangeURI':'int'})
+         options['keyName']='Key'
+         if queryName.find('enum')==0:
+            options['keyType']='Integer'
+         else:
+            options['keyType']='AutoIncrementInteger'
          listDomainDefinition['options']=options
       
       if schemaName=='study':
+      
          listDomainDefinition['kind']='StudyDatasetVisit'
       
       domainDesign={}
       domainDesign['name']=queryName
       domainDesign['description']='Some description'
       domainDesign['fields']=fields
+      
       listDomainDefinition['domainDesign']=domainDesign
+      
       url=self.net.GetLabkeyUrl()+'/'+project
       url+='/property-createDomain.api'
       response=self.net.post(url,json.dumps(listDomainDefinition))