comparison bindings/python/pyadbmodule.c @ 758:9d32eea0cd78

added queryFromData(), passes equivalence test with queryFromKey

 	current_db = (adb_t *)PyCObject_AsVoidPtr(incoming);
 	status = (adb_status_t *)malloc(sizeof(adb_status_t));
 	//verify that the data to be inserted is the correct size for the database.
 	
 	ins = (adb_datum_t *)malloc(sizeof(adb_datum_t));
-	if (PyArray_AsCArray(&features, &(ins->data), dims,  1, descr)){
+	if (PyArray_AsCArray((PyObject**)&features, &(ins->data), dims,  1, descr)){
 		PyErr_SetString(PyExc_RuntimeError, "Trouble expressing the feature np array as a C array.");
 		return NULL;
 	}
 	
 	if (power){
-		if (PyArray_AsCArray(&power, &(ins->power), dims,  1, descr)){
+	  if (PyArray_AsCArray((PyObject**)&power, &(ins->power), dims,  1, descr)){
 			PyErr_SetString(PyExc_RuntimeError, "Trouble expressing the power np array as a C array.");
 			return NULL;
 		}
 	}else{
 		ins->power=NULL;
 	}
 	
 	if (times){
-		if (PyArray_AsCArray(&times, &(ins->times), dims,  1, descr)){
+	  if (PyArray_AsCArray((PyObject**)&times, &(ins->times), dims,  1, descr)){
 			PyErr_SetString(PyExc_RuntimeError, "Trouble expressing the times np array as a C array.");
 			return NULL;
 		}
 	}else{
 		ins->times=NULL;

 	PyObject *incoming = NULL;
 	PyObject *outgoing = NULL;
 	PyObject *thisKey = NULL;
 	PyObject *currentValue = NULL;
 	PyObject *newBits = NULL;
-	npy_intp dims[2];
 	unsigned int nDims = 0;
 	unsigned int nVect = 0;
 	PyArrayObject *features = NULL;
 	PyArrayObject *power = NULL;
 	PyArrayObject *times = NULL;
-	PyArray_Descr *descr;
 	adb_status_t *status;
 
 	static char *kwlist[]  = { "db", "features", 
 				   "seqLength", 
 				   "seqStart", 

 	  free(status);
 	  return NULL;
 	}
 
 	free(status);
-
 	
 	if (exhaustive){
 		spec->qid.flags = spec->qid.flags | ADB_QID_FLAG_EXHAUSTIVE;
 	}
 	if (falsePositives){

                 /* not ideal but a temporary bandage fix */
 		spec->refine.qhopsize = hop;
 		spec->refine.ihopsize = hop;
 	}
 
-	descr = PyArray_DescrFromType(NPY_DOUBLE);
-
-	if (PyArray_AsCArray(&features, &(spec->qid.datum->data), dims,  2, descr)){
-	  PyErr_SetString(PyExc_RuntimeError, "Trouble expressing the feature np array as a C array.");
-	  return NULL;
-	}
+	spec->qid.datum->data = (double*) features->data;
 	
 	if (power){
-	  if (PyArray_AsCArray(&power, &(spec->qid.datum->power), dims,  1, descr)){
-	    PyErr_SetString(PyExc_RuntimeError, "Trouble expressing the power np array as a C array.");
-	    return NULL;
-	  }
+	  spec->qid.datum->power = (double*) power->data;
 	}else{
 	  spec->qid.datum->power=NULL;
 	}
 	
 	if (times){
-	  if (PyArray_AsCArray(&times, &(spec->qid.datum->times), dims,  1, descr)){
-	    PyErr_SetString(PyExc_RuntimeError, "Trouble expressing the times np array as a C array.");
-	    return NULL;
-	  }
+	  spec->qid.datum->times = (double*) times->data;
 	}else{
 	  spec->qid.datum->times=NULL;
 	}
 
 	nVect = PyArray_DIMS(features)[0];

 	unsigned features=0, powers=0, times=0;
 	PyObject *incoming = 0; // The ADB database
 	PyObject *outgoing = 0; // The PyArrayObject
 	const char *key = NULL;
 	static char *kwlist[]  = { "db", "key", "features", "powers", "times", NULL};
-	double * data;
+	double * data = NULL;
 	int dims = 0;
 	npy_intp shape[2] = { 0, 0 };	
 
 	ok =  PyArg_ParseTupleAndKeywords(args, keywds, "Os|III", kwlist, &incoming, &key, &features, &powers, &times);
 	if (!ok){

 	{"_pyadb_queryFromData", (PyCFunction)_pyadb_queryFromData, METH_VARARGS | METH_KEYWORDS,
 	 "data query. Required features=F (numpy ndarray). Optional: power=P (numpy 1d array), times=T (numpy 1d array)"},
 	{NULL,NULL, 0, NULL}
 };
 
-void init_pyadb()
+void init_pyadb(void)
 {
 	Py_InitModule3("_pyadb", _pyadbMethods, "internal c bindings for audioDB.  Use pyadb for pythonic access to adb.");
 	import_array();
 	return;
 }