diff libtests/0007/prog1.c @ 498:342822c2d49a

Merge api-inversion branch (-r656:771, but I don't expect to return to
that branch) into the trunk.

I expect there to be minor performance regressions (e.g. in the SOAP
server index cacheing, which I have forcibly removed) and minor
unplugged memory leaks (e.g. in audioDB::query(), where I don't free up
the datum).  I hope that these leaks and performance regressions can be
plugged in short order.  I also expect that some (but maybe not all) of
the issues currently addressed in the memory-leaks branch are superseded
or fixed by this merge.

There remains much work to be done; go forth and do it.

--- a/libtests/0007/prog1.c	Sat Jan 10 11:11:27 2009 +0000
+++ b/libtests/0007/prog1.c	Sat Jan 10 16:47:57 2009 +0000
@@ -1,124 +1,64 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sysexits.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <unistd.h>
-#include <sys/stat.h>
-/*
- *  * #define NDEBUG
- *   * */
-#include <assert.h>
+#include "audioDB_API.h"
+#include "test_utils_lib.h"
 
-#include "../../audioDB_API.h"
-#include "../test_utils_lib.h"
+int main(int argc, char **argv) {
+  adb_t *adb;
 
+  clean_remove_db(TESTDB);
+  if(!(adb = audiodb_create(TESTDB, 0, 0, 0)))
+    return 1;
 
-int main(int argc, char **argv){
+  adb_datum_t feature = {2, 2, "testfeature", (double[4]) {0, 1, 1, 0}};
+  if(audiodb_insert_datum(adb, &feature))
+    return 1;
+  audiodb_l2norm(adb);
 
-    int returnval=0;
-    adb_ptr mydbp={0};
-    int ivals[10];
-    double dvals[10];
-    adb_insert_t myinsert={0};
-    unsigned int myerr=0;
-    char * databasename="testdb";
-    adb_query_t myadbquery={0};
-    adb_queryresult_t myadbqueryresult={0};
-    // adbquery myadbquery2={0};
-    // adbqueryresult myadbqueryresult2={0};
-    int size=0;
+  adb_datum_t query = {1, 2, "testquery", (double[2]) {0, 0.5}};
+  adb_query_id_t qid = {0};
+  qid.datum = &query;
+  qid.sequence_length = 16;
+  qid.sequence_start = 0;
+  adb_query_parameters_t parms = 
+    {ADB_ACCUMULATION_PER_TRACK, ADB_DISTANCE_EUCLIDEAN_NORMED, 10, 10};
+  adb_query_refine_t refine = {0};
+  refine.hopsize = 1;
 
-    /* remove old directory */
-    clean_remove_db(databasename);
+  adb_query_spec_t spec;
+  spec.qid = qid;
+  spec.params = parms;
+  spec.refine = refine;
+  adb_query_results_t *results = audiodb_query_spec(adb, &spec);
+  if(results) return 1;
 
-    /* create new db */
-    mydbp=audiodb_create(databasename,0,0,0);
+  spec.params.npoints = 1;
+  results = audiodb_query_spec(adb, &spec);
+  if(results) return 1;
 
-//# tests that the lack of -l when the query sequence is shorter doesn't
-//# segfault.
+  spec.qid.datum->data = (double [2]) {0.5, 0};
+  spec.params.npoints = 10;
+  results = audiodb_query_spec(adb, &spec);
+  if(results) return 1;
+  
+  spec.params.npoints = 1;
+  results = audiodb_query_spec(adb, &spec);
+  if(results) return 1;
 
-    /* make 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);
+  /* the above tests mirror those in the audioDB command-line test
+   * suite.  We can test for additional bad input cases too: */
 
-    /* insert */
-    //${AUDIODB} -d testdb -I -f testfeature
-    myinsert.features="testfeature";
-    myerr=audiodb_insert(mydbp,&myinsert);   
-    if(myerr){ returnval=-1; };
+  spec.qid.sequence_start = 1;
+  spec.qid.sequence_length = 1;
+  results = audiodb_query_spec(adb, &spec);
+  if(results) return 1;
 
+  /* and just sanity check that we haven't broken everything */
+  spec.qid.sequence_start = 0;
+  spec.params.npoints = 2;
+  results = audiodb_query_spec(adb, &spec);
+  if(!results || results->nresults != 2) return 1;
+  audiodb_query_free_results(adb, &spec, results);
 
-    /* turn on l2norm */
-    //# sequence queries require L2NORM
-    //${AUDIODB} -d testdb -L
-    if(audiodb_l2norm(mydbp)){ returnval=-1; };
+  audiodb_close(adb);
 
-
-    /* make query */
-    //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;
-    maketestfile("testquery",ivals,dvals,2);
-
-
-/* should fail */
-
-//audioDB -Q sequence -d testdb -f testquery
-//expect_clean_error_exit ${AUDIODB} -d testdb -Q sequence -f testquery
-    
-    myadbquery.querytype="sequence";
-    myadbquery.feature="testquery";
-    //myadbquery.sequencelength="1";
-    myerr=audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-    size=myadbqueryresult.sizeRlist;
-    if (!myerr){ returnval = -1;};
-
-
-///* should fail */
-//expect_clean_error_exit ${AUDIODB} -d testdb -Q sequence -f testquery -n 1
-    myadbquery.querytype="sequence";
-    myadbquery.feature="testquery";
-    myadbquery.numpoints="1";
-    myerr=audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-    if(!myerr){ returnval=-1; };
-
-/* query 2 */
-//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.0;
-    maketestfile("testquery",ivals,dvals,2);
-
-/* should fail */
-//expect_clean_error_exit ${AUDIODB} -d testdb -Q sequence -f testquery
-    myadbquery.querytype="sequence";
-    myadbquery.feature="testquery";
-    myadbquery.numpoints=NULL;
-    myerr=audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-    if(!myerr){ returnval=-1; };
-
-/* should fail */
-//expect_clean_error_exit ${AUDIODB} -d testdb -Q sequence -f testquery -n 1
-    myadbquery.querytype="sequence";
-    myadbquery.feature="testquery";
-    myadbquery.numpoints="1";
-    myerr=audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-    if(!myerr){ returnval=-1; };
-
-
-
-
-    //printf("returnval:%d\n", returnval);
-      
-    return(returnval);
+  return 104;
 }
-