diff libtests/0004/prog1.c @ 489:4cb6c611f812 api-inversion

Begin removing uses of audiodb_query()

audiodb_query() is actually an unsupportable interface.  It requires
access to the filesystem, does not (and cannot) actually support whole
swathes of functionality, is only implementable using code that is no
longer part of the core of audioDB (reporter.h), is in the way of fixing
memory leaks in the SOAP server, and is horrible to use to boot.

So, begin converting the libtests uses of audiodb_query() to
audio_query_spec().  In the process, go through the test code and
remove useless comments, pointless variables, and commented-out bits
of shell scripts.

--- a/libtests/0004/prog1.c	Sat Jan 10 15:32:49 2009 +0000
+++ b/libtests/0004/prog1.c	Sat Jan 10 15:32:53 2009 +0000
@@ -1,127 +1,62 @@
 #include "audioDB_API.h"
 #include "test_utils_lib.h"
 
+int main(int argc, char **argv) {
+  adb_t *adb;
 
-int main(int argc, char **argv){
+  clean_remove_db(TESTDB);
+  if(!(adb = audiodb_create(TESTDB, 0, 0, 0)))
+    return 1;
+  if(audiodb_l2norm(adb))
+    return 1;
 
-    int returnval=0;
-    adb_ptr mydbp={0};
-    adb_status_t mystatus={0};
-    int ivals[10];
-    double dvals[10];
-    FILE * myfile;
-    int ret=0;
-    adb_insert_t myinsert={0};
-    unsigned int myerr=0;
-    adb_query_t myadbquery={0};
-    adb_queryresult_t myadbqueryresult={0};
-    adb_query_t myadbquery2={0};
-    adb_queryresult_t myadbqueryresult2={0};
-    char * databasename="testdb";
-    int i=0;
-    int size=0;
+  adb_datum_t feature = {2, 2, "testfeature", (double[4]) {0, 1, 1, 0}};
+  if(audiodb_insert_datum(adb, &feature))
+    return 1;
 
+  adb_datum_t query = {1, 2, "testquery", (double [2]) {0, 0.5}};
 
-    /* remove old directory */
-    //if [ -f testdb ]; then rm -f testdb; fi
-    clean_remove_db(databasename);
+  adb_query_id_t qid = {0};
+  qid.datum = &query;
+  qid.sequence_length = 1;
+  qid.sequence_start = 0;
+  adb_query_parameters_t parms = 
+    {ADB_ACCUMULATION_DB, ADB_DISTANCE_DOT_PRODUCT, 10, 0};
+  adb_query_refine_t refine = {0};
+  refine.hopsize = 1;
 
-    /* create new db */
-    //${AUDIODB} -d testdb -N
-    mydbp=audiodb_create(databasename,0,0,0);
+  adb_query_spec_t spec;
+  spec.qid = qid;
+  spec.params = parms;
+  spec.refine = refine;
 
-    /* turn on l2norm */
-    //${AUDIODB} -d testdb -L
-    audiodb_l2norm(mydbp);
+  adb_query_results_t *results = audiodb_query_spec(adb, &spec);
+  if(!results || results->nresults != 2) return 1;
+  result_present_or_fail(results, "testfeature", 0.5, 0, 0);
+  result_present_or_fail(results, "testfeature", 0, 0, 1);
+  audiodb_query_free_results(adb, &spec, results);
 
-    /* make a test file */
-    //intstring 2 > testfeature
-    //floatstring 0 1 >> testfeature
-    //floatstring 1 0 >> testfeature
-    ivals[0]=2;
-    dvals[0]=0; dvals[1]=1; dvals[2]=1; dvals[3]=0;
-    maketestfile("testfeature", ivals,dvals,4);
+  spec.params.npoints = 1;
+  results = audiodb_query_spec(adb, &spec);
+  if(!results || results->nresults != 1) return 1;
+  result_present_or_fail(results, "testfeature", 0.5, 0, 0);  
+  audiodb_query_free_results(adb, &spec, results);
 
+  spec.qid.datum->data = (double[2]) {0.5, 0};
+  spec.params.npoints = 10;
+  results = audiodb_query_spec(adb, &spec);
+  result_present_or_fail(results, "testfeature", 0.5, 0, 1);
+  result_present_or_fail(results, "testfeature", 0, 0, 0);
+  audiodb_query_free_results(adb, &spec, results);
 
-    /* insert */ 
-    //${AUDIODB} -d testdb -I -f testfeature
-    myinsert.features="testfeature";
-    myerr=audiodb_insert(mydbp,&myinsert);   
+  spec.params.npoints = 1;
+  results = audiodb_query_spec(adb, &spec);
+  if(!results || results->nresults != 1) return 1;
+  result_present_or_fail(results, "testfeature", 0.5, 0, 1);  
+  audiodb_query_free_results(adb, &spec, results);
 
-    /* testquery */ 
-    //echo "query point (0.0,0.5)"
-    //intstring 2 > testquery
-    //floatstring 0 0.5 >> testquery
-    ivals[0]=2;
-    dvals[0]=0; dvals[1]=0.5; dvals[2]=0; dvals[3]=0;
-    maketestfile("testquery", ivals,dvals,4);
+  audiodb_close(adb);
 
-    /* query 1 */
-    //${AUDIODB} -d testdb -Q point -f testquery > testoutput
-    //echo testfeature 0.5 0 0 > test-expected-output
-    //echo testfeature 0 0 1 >> test-expected-output
-    //cmp testoutput test-expected-output
-    myadbquery.querytype="point"; 
-    myadbquery.feature="testquery"; 
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-    size=myadbqueryresult.sizeRlist;
-    
-    /* check the test values */
-    if (size != 2) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult,0,"testfeature",.5,0,0)) {returnval = -1;};   
-    if (testoneresult(&myadbqueryresult,1,"testfeature",0,0,1)) {returnval = -1;};   
-    
-    /* query 2 - same but only first result */
-//${AUDIODB} -d testdb -Q point -f testquery -n 1 > testoutput
-//echo testfeature 0.5 0 0 > test-expected-output
-//cmp testoutput test-expected-output
-    myadbquery.numpoints="1"; 
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-    size=myadbqueryresult.sizeRlist;
-
-    if (size != 1) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult,0,"testfeature",.5,0,0)) {returnval = -1;};   
-
-
-    /* testquery2 */ 
-    //echo "query point (0.5,0.0)"
-    //intstring 2 > testquery
-    //floatstring 0.5 0 >> testquery
-    ivals[0]=2;
-    dvals[0]=0.5; dvals[1]=0; dvals[2]=0; dvals[3]=0;
-    maketestfile("testquery", ivals,dvals,4);
-
-    /* query 3 */ 
-    //${AUDIODB} -d testdb -Q point -f testquery > testoutput
-    //echo testfeature 0.5 0 1 > test-expected-output
-    //echo testfeature 0 0 0 >> test-expected-output
-    //cmp testoutput test-expected-output
-    myadbquery2.querytype="point"; 
-    myadbquery2.feature="testquery"; 
-    myadbquery2.numpoints=NULL; 
-    audiodb_query(mydbp,&myadbquery2,&myadbqueryresult2);
-    size=myadbqueryresult2.sizeRlist;
-
-    /* check the test values */
-    if (size != 2) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult2,0,"testfeature",.5,0,1)) {returnval = -1;};   
-    if (testoneresult(&myadbqueryresult2,1,"testfeature",0,0,0)) {returnval = -1;};   
-     
-    /* query 4 - same as 3 but only first result */
-    //${AUDIODB} -d testdb -Q point -f testquery -n 1 > testoutput
-    //echo testfeature 0.5 0 1 > test-expected-output
-    //cmp testoutput test-expected-output
-    myadbquery2.numpoints="1"; 
-    audiodb_query(mydbp,&myadbquery2,&myadbqueryresult2);
-    size=myadbqueryresult2.sizeRlist;
-
-
-    if (size != 1) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult2,0,"testfeature",.5,0,1)) {returnval = -1;};   
-
-    audiodb_close(mydbp);
-
-
-    return(returnval);
+  return 104;
 }