comparison bindings/python/pyadb.py @ 630:5f47b734c532

Various fixes:

* queryConfig -> configQuery throughout
* instance check fix
* True response from configCheck

 		absThres      : double absolute power threshold (db must have power),\n\
 		relThres      : double relative power threshold (db must have power),\n\
 		durRatio      : double time expansion/compresion ratio,\n\
 		hopSize       : int hopsize (1 by default)])->resultDict\n\
 		resFmt        : [\"list\"|\"dict\"](\"dict\" by default)}"""
-		for key in self.queryConfig.keys():
+		for key in self.configQuery.keys():
 			if key not in Pyadb.validConfigTerms.keys():
-				if not scrub:return False
-				del self.queryConfig[key]
-			if not isinstance(Pyadb.validConfigTerms[key], self.queryConfig[key]):
-				if not scrub:return False
-				self.queryConfig[key] = Pyadb.validConfigTerms[key](self.queryConfig[key])#hrm, syntax?
-		
+				if not scrub: return False
+				del self.configQuery[key]
+			if not isinstance(self.configQuery[key], Pyadb.validConfigTerms[key]):
+				if not scrub: return False
+				self.configQuery[key] = Pyadb.validConfigTerms[key](self.configQuery[key])#hrm, syntax?
+		return True	
 				
 				# 
 	
 	def query(self, key=None, featData=None, strictConfig=False):
 		"""query the database.  Query parameters as defined in self.configQuery. For details on this consult the doc string in the configCheck method."""

 			raise Usage("query require either key or featData to be defined, you have defined both or neither.")
 		if key:
 			result = _pyadb._pyadb_queryFromKey(self._db, key, **self.configQuery)
 		elif featData:
 			raise NotImplementedError("direct data query not yet implemented.  Sorry.")
-		return Result(result, self.queryConfig)
+		return Pyadb.Result(result, self.configQuery)
 	
 	###internal methods###
 	def _updateDBAttributes(self):
 		'''run _pyadb_status to fill/update the database level flags and info'''
 		rawFlags = long(0)