Mercurial > hg > audiodb

changeset 494:1327b5cf4cb5 api-inversion

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Finish rewriting libtests.
author mas01cr
date Sat, 10 Jan 2009 15:33:16 +0000
parents 1950d76be128
children c291e9201a3c
files libtests/0031/prog1.c libtests/0031/short-description libtests/0032/prog1.c libtests/0032/short-description libtests/0033/prog1.c libtests/0033/short-description libtests/0034/prog1.c libtests/0034/short-description libtests/0035/prog1.c libtests/0035/short-description libtests/0036/prog1.c libtests/0036/short-description libtests/0037/prog1.c
diffstat 13 files changed, 408 insertions(+), 976 deletions(-) [+]
line wrap: on
line diff
--- a/libtests/0031/prog1.c	Sat Jan 10 15:33:11 2009 +0000
+++ b/libtests/0031/prog1.c	Sat Jan 10 15:33:16 2009 +0000
@@ -1,244 +1,83 @@
 #include "audioDB_API.h"
 #include "test_utils_lib.h"
 
+int main(int argc, char **argv) {
+  adb_t *adb;
+  const char *keys[2];
 
-int main(int argc, char **argv){
+  clean_remove_db(TESTDB);
+  if(!(adb = audiodb_create(TESTDB,0,0,0)))
+    return 1;
 
-    int returnval=0;
-    adb_ptr mydbp={0};
-    int ivals[10];
-    double dvals[10];
-    adb_insert_t myinsert={0};
-    char * databasename="testdb";
-    adb_query_t myadbquery={0};
-    adb_queryresult_t myadbqueryresult={0};
-    int size=0;
+  adb_datum_t datum1 = {1, 2, "testfeature01", (double[4]) {0, 1}};
+  adb_datum_t datum2 = {1, 2, "testfeature10", (double[4]) {1, 0}};
+  if(audiodb_insert_datum(adb, &datum1))
+    return 1;
+  if(audiodb_insert_datum(adb, &datum2))
+    return 1;
 
+  if(audiodb_l2norm(adb))
+    return 1;
 
-    /* remove old directory */
-    //if [ -f testdb ]; then rm -f testdb; fi
-    clean_remove_db(databasename);
+  adb_datum_t query = {1, 2, "testquery", (double[2]) {0, 0.5}};
 
-    /* create new db */
-    //${AUDIODB} -d testdb -N
-    mydbp=audiodb_create(databasename,0,0,0);
+  adb_query_id_t qid = {0};
+  qid.datum = &query;
+  qid.sequence_length = 1;
+  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;
 
-///intstring 2 > testfeature01
-///floatstring 0 1 >> testfeature01
-///intstring 2 > testfeature10
-///floatstring 1 0 >> testfeature10
-    ivals[0]=2;
-    dvals[0]=0; dvals[1]=1;
-    maketestfile("testfeature01",ivals,dvals,2);
-    ivals[0]=2;
-    dvals[0]=1; dvals[1]=0;
-    maketestfile("testfeature10",ivals,dvals,2);
+  adb_query_spec_t spec;
+  spec.qid = qid;
+  spec.params = parms;
+  spec.refine = refine;
 
-///${AUDIODB} -d testdb -I -f testfeature01
-///${AUDIODB} -d testdb -I -f testfeature10
+  adb_query_results_t *results = audiodb_query_spec(adb, &spec);
+  if(!results || results->nresults != 2) return 1;
+  result_present_or_fail(results, "testfeature01", 0, 0, 0);
+  result_present_or_fail(results, "testfeature10", 2, 0, 0);
+  audiodb_query_free_results(adb, &spec, results);
 
-    myinsert.features="testfeature01";
-    if (audiodb_insert(mydbp,&myinsert)){ returnval=-1; } 
+  spec.refine.flags = ADB_REFINE_INCLUDE_KEYLIST;
+  spec.refine.include.nkeys = 0;
+  results = audiodb_query_spec(adb, &spec);
+  if(!results || results->nresults != 0) return 1;
+  audiodb_query_free_results(adb, &spec, results);
 
-    myinsert.features="testfeature10";
-    if (audiodb_insert(mydbp,&myinsert)){ returnval=-1; } 
+  spec.refine.include.nkeys = 1;
+  spec.refine.include.keys = keys;
+  spec.refine.include.keys[0] = "testfeature01";
+  results = audiodb_query_spec(adb, &spec);
+  if(!results || results->nresults != 1) return 1;
+  result_present_or_fail(results, "testfeature01", 0, 0, 0);
+  audiodb_query_free_results(adb, &spec, results);
 
-///# sequence queries require L2NORM
-///${AUDIODB} -d testdb -L
-    if(audiodb_l2norm(mydbp)){ returnval=-1; };
+  spec.refine.include.keys[0] = "testfeature10";
+  results = audiodb_query_spec(adb, &spec);
+  if(!results || results->nresults != 1) return 1;
+  result_present_or_fail(results, "testfeature10", 2, 0, 0);
+  audiodb_query_free_results(adb, &spec, results);
 
-///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);
+  spec.params.ntracks = 1;
+  results = audiodb_query_spec(adb, &spec);
+  if(!results || results->nresults != 1) return 1;
+  result_present_or_fail(results, "testfeature10", 2, 0, 0);
+  audiodb_query_free_results(adb, &spec, results);
 
-///${AUDIODB} -d testdb -Q sequence -l 1 -f testquery > testoutput
-///echo testfeature01 0 0 0 > test-expected-output
-///echo testfeature10 2 0 0 >> test-expected-output
-///cmp testoutput test-expected-output
-    myadbquery.querytype="sequence";
-    myadbquery.feature="testquery";
-    myadbquery.sequencelength="1";
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-    size=myadbqueryresult.sizeRlist;
+  spec.params.ntracks = 10;
+  spec.refine.flags = ADB_REFINE_EXCLUDE_KEYLIST;
+  spec.refine.include.nkeys = 0;
+  spec.refine.include.keys = NULL;
+  spec.refine.exclude.nkeys = 1;
+  spec.refine.exclude.keys = keys;
+  spec.refine.exclude.keys[0] = "testfeature01";
+  results = audiodb_query_spec(adb, &spec);
+  if(!results || results->nresults != 1) return 1;
+  result_present_or_fail(results, "testfeature10", 2, 0, 0);
+  audiodb_query_free_results(adb, &spec, results);
 
-    /* check the test values */
-    if (size != 2) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult,0,"testfeature01",0,0,0)) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult,1,"testfeature10",2,0,0)) {returnval = -1;};
-
-//${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -K /dev/null > testoutput
-//cat /dev/null > test-expected-output
-//cmp testoutput test-expected-output
-    myadbquery.querytype="sequence";
-    myadbquery.feature="testquery";
-    myadbquery.keylist="/dev/null";
-    myadbquery.sequencelength="1";
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-    size=myadbqueryresult.sizeRlist;
-
-    /* check the test values */
-    if (size != 0) {returnval = -1;};
-
-///echo testfeature01 > testkl.txt
-    makekeylistfile("testkl.txt","testfeature01");
-
-///${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -K testkl.txt > testoutput
-///echo testfeature01 0 0 0 > test-expected-output
-///cmp testoutput test-expected-output
-    myadbquery.querytype="sequence";
-    myadbquery.feature="testquery";
-    myadbquery.keylist="testkl.txt";
-    myadbquery.sequencelength="1";
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-
-    size=myadbqueryresult.sizeRlist;
-
-    /* check the test values */
-    if (size != 1) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult,0,"testfeature01",0,0,0)) {returnval = -1;};
-
-///echo testfeature10 > testkl.txt
-    makekeylistfile("testkl.txt","testfeature10");
-
-///${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -K testkl.txt > testoutput
-///echo testfeature10 2 0 0 > test-expected-output
-///cmp testoutput test-expected-output
-    myadbquery.querytype="sequence";
-    myadbquery.feature="testquery";
-    myadbquery.keylist="testkl.txt";
-    myadbquery.sequencelength="1";
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-
-    size=myadbqueryresult.sizeRlist;
-
-    /* check the test values */
-    if (size != 1) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult,0,"testfeature10",2,0,0)) {returnval = -1;};
-
-///echo testfeature10 > testkl.txt
-    makekeylistfile("testkl.txt","testfeature10");
-
-///${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -K testkl.txt -r 1 > testoutput
-///echo testfeature10 2 0 0 > test-expected-output
-///cmp testoutput test-expected-output
-    myadbquery.querytype="sequence";
-    myadbquery.feature="testquery";
-    myadbquery.keylist="testkl.txt";
-    myadbquery.sequencelength="1";
-    myadbquery.resultlength="1";
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-
-    size=myadbqueryresult.sizeRlist;
-
-    /* check the test values */
-    if (size != 1) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult,0,"testfeature10",2,0,0)) {returnval = -1;};
-
-///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);
-
-///${AUDIODB} -d testdb -Q sequence -l 1 -f testquery > testoutput
-///echo testfeature10 0 0 0 > test-expected-output
-///echo testfeature01 2 0 0 >> test-expected-output
-///cmp testoutput test-expected-output
-    myadbquery.querytype="sequence";
-    myadbquery.feature="testquery";
-    myadbquery.keylist=NULL;
-    myadbquery.sequencelength="1";
-    myadbquery.resultlength=NULL;
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-
-    size=myadbqueryresult.sizeRlist;
-
-    /* check the test values */
-    if (size != 2) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult,0,"testfeature10",0,0,0)) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult,1,"testfeature01",2,0,0)) {returnval = -1;};
-
-///${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -K /dev/null > testoutput
-///cat /dev/null > test-expected-output
-///cmp testoutput test-expected-output
-    myadbquery.querytype="sequence";
-    myadbquery.feature="testquery";
-    myadbquery.keylist="/dev/null";
-    myadbquery.sequencelength="1";
-    myadbquery.resultlength=NULL;
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-
-    size=myadbqueryresult.sizeRlist;
-
-    /* check the test values */
-    if (size != 0) {returnval = -1;};
-
-///echo testfeature10 > testkl.txt
-    makekeylistfile("testkl.txt","testfeature10");
-
-///${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -K testkl.txt > testoutput
-///echo testfeature10 0 0 0 > test-expected-output
-//cmp testoutput test-expected-output
-    myadbquery.querytype="sequence";
-    myadbquery.feature="testquery";
-    myadbquery.keylist="testkl.txt";
-    myadbquery.sequencelength="1";
-    myadbquery.resultlength=NULL;
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-
-    size=myadbqueryresult.sizeRlist;
-
-    /* check the test values */
-    if (size != 1) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult,0,"testfeature10",0,0,0)) {returnval = -1;};
-
-
-///echo testfeature01 > testkl.txt
-    makekeylistfile("testkl.txt","testfeature01");
-
-///${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -K testkl.txt > testoutput
-///echo testfeature01 2 0 0 > test-expected-output
-///cmp testoutput test-expected-output
-    myadbquery.querytype="sequence";
-    myadbquery.feature="testquery";
-    myadbquery.keylist="testkl.txt";
-    myadbquery.sequencelength="1";
-    myadbquery.resultlength=NULL;
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-
-    size=myadbqueryresult.sizeRlist;
-
-    /* check the test values */
-    if (size != 1) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult,0,"testfeature01",2,0,0)) {returnval = -1;};
-
-///echo testfeature01 > testkl.txt
-    makekeylistfile("testkl.txt","testfeature01");
-
-///${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -K testkl.txt -r 1 > testoutput
-///echo testfeature01 2 0 0 > test-expected-output
-///cmp testoutput test-expected-output
-    myadbquery.querytype="sequence";
-    myadbquery.feature="testquery";
-    myadbquery.keylist="testkl.txt";
-    myadbquery.sequencelength="1";
-    myadbquery.resultlength="1";
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-
-    size=myadbqueryresult.sizeRlist;
-
-    /* check the test values */
-    if (size != 1) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult,0,"testfeature01",2,0,0)) {returnval = -1;};
-
-
-
-    //printf("returnval:%d\n",returnval);
-      
-    return(returnval);
+  return 104;
 }
-
--- a/libtests/0031/short-description	Sat Jan 10 15:33:11 2009 +0000
+++ b/libtests/0031/short-description	Sat Jan 10 15:33:16 2009 +0000
@@ -1,1 +1,1 @@
-0008 with -K restriction with lib
+0008 and include and exclude keys with library
--- a/libtests/0032/prog1.c	Sat Jan 10 15:33:11 2009 +0000
+++ b/libtests/0032/prog1.c	Sat Jan 10 15:33:16 2009 +0000
@@ -1,248 +1,90 @@
 #include "audioDB_API.h"
 #include "test_utils_lib.h"
 
+int main(int argc, char **argv) {
+  adb_t *adb;
+  const char *keys[2];
 
-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};
-    int ivals[10];
-    double dvals[10];
-    adb_insert_t myinsert={0};
-    char * databasename="testdb";
-    adb_query_t myadbquery={0};
-    adb_queryresult_t myadbqueryresult={0};
-    int size=0;
+  adb_datum_t datum1 = {1, 2, "testfeature01", (double[2]) {0, 1}};
+  adb_datum_t datum2 = {1, 2, "testfeature10", (double[2]) {1, 0}};
+  if(audiodb_insert_datum(adb, &datum1))
+    return 1;
+  if(audiodb_insert_datum(adb, &datum2))
+    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_PER_TRACK, ADB_DISTANCE_DOT_PRODUCT, 10, 10};
+  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 l2 power */
-//${AUDIODB} -d testdb -L
-    if (audiodb_l2norm(mydbp)) {returnval=-1;};
+  adb_query_results_t *results = audiodb_query_spec(adb, &spec);
+  if(!results || results->nresults != 2) return 1;
+  result_present_or_fail(results, "testfeature01", 0.5, 0, 0);
+  result_present_or_fail(results, "testfeature10", 0, 0, 0);
+  audiodb_query_free_results(adb, &spec, results);
 
-    /* make feature files */
-//intstring 2 > testfeature01
-//floatstring 0 1 >> testfeature01
-//intstring 2 > testfeature10
-//floatstring 1 0 >> testfeature10
-    ivals[0]=2;
-    dvals[0]=0; dvals[1]=1;
-    maketestfile("testfeature01",ivals,dvals,2);
-    ivals[0]=2;
-    dvals[0]=1; dvals[1]=0;
-    maketestfile("testfeature10",ivals,dvals,2);
+  spec.refine.flags = ADB_REFINE_INCLUDE_KEYLIST;
+  spec.refine.include.nkeys = 0;
+  results = audiodb_query_spec(adb, &spec);
+  if(!results || results->nresults != 0) return 1;
+  audiodb_query_free_results(adb, &spec, results);
 
+  spec.refine.include.nkeys = 1;
+  spec.refine.include.keys = keys;
+  spec.refine.include.keys[0] = "testfeature01";
+  results = audiodb_query_spec(adb, &spec);
+  if(!results || results->nresults != 1) return 1;
+  result_present_or_fail(results, "testfeature01", 0.5, 0, 0);
+  audiodb_query_free_results(adb, &spec, results);
 
-    /* insertions */
-    //${AUDIODB} -d testdb -I -f testfeature01
-    //${AUDIODB} -d testdb -I -f testfeature10
-    myinsert.features="testfeature01";
-    if(audiodb_insert(mydbp,&myinsert)) {returnval = -1; };   
-    myinsert.features="testfeature10";
-    if(audiodb_insert(mydbp,&myinsert)) {returnval = -1; };   
-    
+  spec.refine.include.keys[0] = "testfeature10";
+  results = audiodb_query_spec(adb, &spec);
+  if(!results || results->nresults != 1) return 1;
+  result_present_or_fail(results, "testfeature10", 0, 0, 0);
+  audiodb_query_free_results(adb, &spec, results);
 
-    /* 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);
+  spec.refine.include.nkeys = 2;
+  spec.refine.include.keys[0] = "testfeature01";
+  spec.refine.include.keys[1] = "testfeature10";
+  results = audiodb_query_spec(adb, &spec);
+  if(!results || results->nresults != 2) return 1;
+  result_present_or_fail(results, "testfeature01", 0.5, 0, 0);
+  result_present_or_fail(results, "testfeature10", 0, 0, 0);
+  audiodb_query_free_results(adb, &spec, results);
 
-    /* test a sequence query */
-    //${AUDIODB} -d testdb -Q track -l 1 -f testquery > testoutput
-    //echo testfeature01 0.5 0 0 > test-expected-output
-    //echo testfeature10 0 0 0 >> test-expected-output
-    //cmp testoutput test-expected-output
-    myadbquery.querytype="track";
-    myadbquery.feature="testquery";
-    myadbquery.sequencelength="1";
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-    size=myadbqueryresult.sizeRlist;
+  spec.refine.include.nkeys = 0;
+  spec.refine.include.keys = NULL;
+  spec.refine.flags = ADB_REFINE_EXCLUDE_KEYLIST;
+  spec.refine.exclude.nkeys = 1;
+  spec.refine.exclude.keys = keys;
+  spec.refine.exclude.keys[0] = "testfeature10";
+  results = audiodb_query_spec(adb, &spec);
+  if(!results || results->nresults != 1) return 1;
+  result_present_or_fail(results, "testfeature01", 0.5, 0, 0);
+  audiodb_query_free_results(adb, &spec, results);
 
-    /* check the test values */
-    if (size != 2) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult,0,"testfeature01",0.5,0,0)) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult,1,"testfeature10",0,0,0)) {returnval = -1;};
+  spec.refine.exclude.keys[0] = "testfeature01";
+  results = audiodb_query_spec(adb, &spec);
+  if(!results || results->nresults != 1) return 1;
+  result_present_or_fail(results, "testfeature10", 0, 0, 0);
+  audiodb_query_free_results(adb, &spec, results);
 
-//${AUDIODB} -d testdb -Q track -l 1 -f testquery -K /dev/null > testoutput
-//cat /dev/null > test-expected-output
-//cmp testoutput test-expected-output
-    myadbquery.querytype="track";
-    myadbquery.feature="testquery";
-    myadbquery.keylist="/dev/null";
-    myadbquery.sequencelength="1";
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-    size=myadbqueryresult.sizeRlist;
-
-    /* check the test values */
-    if (size != 0) {returnval = -1;};
-
-
-
-//echo testfeature01 > testkl.txt
-    makekeylistfile("testkl.txt","testfeature01");
-//${AUDIODB} -d testdb -Q track -l 1 -f testquery -K testkl.txt > testoutput
-//echo testfeature01 0.5 0 0 > test-expected-output
-//cmp testoutput test-expected-output
-    myadbquery.querytype="track";
-    myadbquery.feature="testquery";
-    myadbquery.keylist="testkl.txt";
-    myadbquery.sequencelength="1";
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-
-    size=myadbqueryresult.sizeRlist;
-
-    /* check the test values */
-    if (size != 1) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult,0,"testfeature01",0.5,0,0)) {returnval = -1;};
-
-
-
-
-//echo testfeature10 > testkl.txt
-    makekeylistfile("testkl.txt","testfeature10");
-//${AUDIODB} -d testdb -Q track -l 1 -f testquery -K testkl.txt > testoutput
-//echo testfeature10 0 0 0 > test-expected-output
-//cmp testoutput test-expected-output
-    myadbquery.querytype="track";
-    myadbquery.feature="testquery";
-    myadbquery.keylist="testkl.txt";
-    myadbquery.sequencelength="1";
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-
-    size=myadbqueryresult.sizeRlist;
-
-    /* check the test values */
-    if (size != 1) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult,0,"testfeature10",0,0,0)) {returnval = -1;};
-
-
-
-//echo testfeature10 > testkl.txt
-    makekeylistfile("testkl.txt","testfeature10");
-//${AUDIODB} -d testdb -Q track -l 1 -f testquery -K testkl.txt -r 1 > testoutput
-//echo testfeature10 0 0 0 > test-expected-output
-//cmp testoutput test-expected-output
-    myadbquery.querytype="track";
-    myadbquery.feature="testquery";
-    myadbquery.keylist="testkl.txt";
-    myadbquery.sequencelength="1";
-    myadbquery.resultlength="1";
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-
-    size=myadbqueryresult.sizeRlist;
-
-    /* check the test values */
-    if (size != 1) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult,0,"testfeature10",0,0,0)) {returnval = -1;};
-
-//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);
-
-//${AUDIODB} -d testdb -Q track -l 1 -f testquery > testoutput
-//echo testfeature10 0.5 0 0 > test-expected-output
-//echo testfeature01 0 0 0 >> test-expected-output
-//cmp testoutput test-expected-output
-    myadbquery.querytype="track";
-    myadbquery.feature="testquery";
-    myadbquery.keylist=NULL;
-    myadbquery.sequencelength="1";
-    myadbquery.resultlength=NULL;
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-
-    size=myadbqueryresult.sizeRlist;
-
-    /* check the test values */
-    if (size != 2) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult,0,"testfeature10",0.5,0,0)) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult,1,"testfeature01",0,0,0)) {returnval = -1;};
-
-//${AUDIODB} -d testdb -Q track -l 1 -f testquery -K /dev/null > testoutput
-//cat /dev/null > test-expected-output
-//cmp testoutput test-expected-output
-    myadbquery.querytype="track";
-    myadbquery.feature="testquery";
-    myadbquery.keylist="/dev/null";
-    myadbquery.sequencelength="1";
-    myadbquery.resultlength=NULL;
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-
-    size=myadbqueryresult.sizeRlist;
-
-    /* check the test values */
-    if (size != 0) {returnval = -1;};
-
-//echo testfeature10 > testkl.txt
-    makekeylistfile("testkl.txt","testfeature10");
-//${AUDIODB} -d testdb -Q track -l 1 -f testquery -K testkl.txt > testoutput
-//echo testfeature10 0.5 0 0 > test-expected-output
-//cmp testoutput test-expected-output
-    myadbquery.querytype="track";
-    myadbquery.feature="testquery";
-    myadbquery.keylist="testkl.txt";
-    myadbquery.sequencelength="1";
-    myadbquery.resultlength=NULL;
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-
-    size=myadbqueryresult.sizeRlist;
-
-    /* check the test values */
-    if (size != 1) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult,0,"testfeature10",0.5,0,0)) {returnval = -1;};
-
-//echo testfeature01 > testkl.txt
-    makekeylistfile("testkl.txt","testfeature01");
-//${AUDIODB} -d testdb -Q track -l 1 -f testquery -K testkl.txt > testoutput
-//echo testfeature01 0 0 0 > test-expected-output
-//cmp testoutput test-expected-output
-    myadbquery.querytype="track";
-    myadbquery.feature="testquery";
-    myadbquery.keylist="testkl.txt";
-    myadbquery.sequencelength="1";
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-
-    size=myadbqueryresult.sizeRlist;
-
-    /* check the test values */
-    if (size != 1) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult,0,"testfeature01",0,0,0)) {returnval = -1;};
-
-//echo testfeature01 > testkl.txt
-    makekeylistfile("testkl.txt","testfeature01");
-//${AUDIODB} -d testdb -Q track -l 1 -f testquery -K testkl.txt -r 1 > testoutput
-//echo testfeature01 0 0 0 > test-expected-output
-//cmp testoutput test-expected-output
-    myadbquery.querytype="track";
-    myadbquery.feature="testquery";
-    myadbquery.keylist="testkl.txt";
-    myadbquery.sequencelength="1";
-    myadbquery.resultlength="1";
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-
-    size=myadbqueryresult.sizeRlist;
-
-    /* check the test values */
-    if (size != 1) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult,0,"testfeature01",0,0,0)) {returnval = -1;};
-
-
-
-
-//    printf("returnval:%d\n", returnval);
-      
-    return(returnval);
+  return 104;
 }
-
--- a/libtests/0032/short-description	Sat Jan 10 15:33:11 2009 +0000
+++ b/libtests/0032/short-description	Sat Jan 10 15:33:16 2009 +0000
@@ -1,1 +1,1 @@
-0009 with -K restriction with lib
+0009 and include / exclude keys with library
--- a/libtests/0033/prog1.c	Sat Jan 10 15:33:11 2009 +0000
+++ b/libtests/0033/prog1.c	Sat Jan 10 15:33:16 2009 +0000
@@ -1,193 +1,90 @@
 #include "audioDB_API.h"
 #include "test_utils_lib.h"
 
+int main(int argc, char **argv) {
+  adb_t *adb;
+  const char *keys[2];
 
-int main(int argc, char **argv){
+  clean_remove_db(TESTDB);
+  if(!(adb = audiodb_create(TESTDB, 0, 0, 0)))
+    return 1;
+  adb_datum_t datum1 = {1, 2, "testfeature01", (double[2]) {0, 1}};
+  adb_datum_t datum2 = {1, 2, "testfeature10", (double[2]) {1, 0}};
+  if(audiodb_insert_datum(adb, &datum1))
+    return 1;
+  if(audiodb_insert_datum(adb, &datum2))
+    return 1;
+  if(audiodb_l2norm(adb))
+    return 1;
 
-    int returnval=0;
-    adb_ptr mydbp={0};
-    int ivals[10];
-    double dvals[10];
-    adb_insert_t myinsert={0};
-    char * databasename="testdb";
-    adb_query_t myadbquery={0};
-    adb_queryresult_t myadbqueryresult={0};
-    int size=0;
+  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_PER_TRACK, ADB_DISTANCE_EUCLIDEAN_NORMED, 10, 10};
+  adb_query_refine_t refine = {0};
+  refine.flags |= ADB_REFINE_RADIUS;
+  refine.radius = 5;
+  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;
 
-//intstring 2 > testfeature01
-//floatstring 0 1 >> testfeature01
-//intstring 2 > testfeature10
-//floatstring 1 0 >> testfeature10
-    ivals[0]=2;
-    dvals[0]=0; dvals[1]=1;
-    maketestfile("testfeature01",ivals,dvals,2);
-    ivals[0]=2;
-    dvals[0]=1; dvals[1]=0;
-    maketestfile("testfeature10",ivals,dvals,2);
+  adb_query_results_t *results = audiodb_query_spec(adb, &spec);
+  if(!results ||  results->nresults != 2) return 1;
+  result_present_or_fail(results, "testfeature01", 0, 0, 0);
+  result_present_or_fail(results, "testfeature10", 2, 0, 0);
+  audiodb_query_free_results(adb, &spec, results);
 
-//${AUDIODB} -d testdb -I -f testfeature01
-//${AUDIODB} -d testdb -I -f testfeature10
-    myinsert.features="testfeature01";
-    if(audiodb_insert(mydbp,&myinsert)) {returnval = -1; };   
-    myinsert.features="testfeature10";
-    if(audiodb_insert(mydbp,&myinsert)) {returnval = -1; };   
+  /* the test in the original test suite for
+   * audioDB-the-command-line-program alters the parms.ntracks, which
+   * is not very meaningful in this context (given that we don't do
+   * aggregation, but simply return valid points); here instead we
+   * check that radius filtering works. */
+  spec.refine.radius = 1;
+  results = audiodb_query_spec(adb, &spec);
+  if(!results ||  results->nresults != 1) return 1;
+  result_present_or_fail(results, "testfeature01", 0, 0, 0);
+  audiodb_query_free_results(adb, &spec, results);
 
-//# sequence queries require L2NORM
-//${AUDIODB} -d testdb -L
-    if (audiodb_l2norm(mydbp)) {returnval=-1;};
+  spec.refine.radius = 5;
+  spec.refine.flags |= ADB_REFINE_INCLUDE_KEYLIST;
+  spec.refine.include.nkeys = 0;
+  spec.refine.include.keys = keys;
+  results = audiodb_query_spec(adb, &spec);
+  if(!results ||  results->nresults != 0) return 1;
+  audiodb_query_free_results(adb, &spec, results);
 
-//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);
+  spec.refine.include.nkeys = 1;
+  spec.refine.include.keys[0] = "testfeature01";
+  results = audiodb_query_spec(adb, &spec);
+  if(!results ||  results->nresults != 1) return 1;
+  result_present_or_fail(results, "testfeature01", 0, 0, 0);
+  audiodb_query_free_results(adb, &spec, results);
 
-//${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -R 5 > testoutput
-//audioDB -Q sequence -d testdb -f testquery -R 5 -l 1
-//echo testfeature01 1 > test-expected-output
-//echo testfeature10 1 >> test-expected-output
-//cmp testoutput test-expected-output
-    myadbquery.querytype="sequence";
-    myadbquery.feature="testquery";
-    myadbquery.sequencelength="1";
-    myadbquery.radius="5";
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-    size=myadbqueryresult.sizeRlist;
+  spec.refine.radius = 1;
+  results = audiodb_query_spec(adb, &spec);
+  if(!results ||  results->nresults != 1) return 1;
+  result_present_or_fail(results, "testfeature01", 0, 0, 0);
+  audiodb_query_free_results(adb, &spec, results);
 
-    /* check the test values */
-    if (size != 2) {returnval = -1;};
-    if (testoneradiusresult(&myadbqueryresult,0,"testfeature01",1)) {returnval = -1;};
-    if (testoneradiusresult(&myadbqueryresult,1,"testfeature10",1)) {returnval = -1;};
+  spec.refine.radius = 5;
+  spec.refine.include.keys[0] = "testfeature10";
+  results = audiodb_query_spec(adb, &spec);
+  if(!results ||  results->nresults != 1) return 1;
+  result_present_or_fail(results, "testfeature10", 2, 0, 0);
+  audiodb_query_free_results(adb, &spec, results);
 
-//${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -K /dev/null -R 5 > testoutput
-//cat /dev/null > test-expected-output
-//cmp testoutput test-expected-output
-    myadbquery.querytype="sequence";
-    myadbquery.feature="testquery";
-    myadbquery.keylist="/dev/null";
-    myadbquery.sequencelength="1";
-    myadbquery.radius="5";
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-    size=myadbqueryresult.sizeRlist;
+  spec.refine.radius = 1;
+  spec.refine.include.keys[0] = "testfeature10";
+  results = audiodb_query_spec(adb, &spec);
+  if(!results ||  results->nresults != 0) return 1;
+  audiodb_query_free_results(adb, &spec, results);
 
-    /* check the test values */
-    if (size != 0) {returnval = -1;};
-
-
-
-//echo testfeature01 > testkl.txt
-    makekeylistfile("testkl.txt","testfeature01");
-//${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -K testkl.txt -R 5 > testoutput
-//echo testfeature01 1 > test-expected-output
-//cmp testoutput test-expected-output
-    myadbquery.querytype="sequence";
-    myadbquery.feature="testquery";
-    myadbquery.keylist="testkl.txt";
-    myadbquery.sequencelength="1";
-    myadbquery.radius="5";
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-    size=myadbqueryresult.sizeRlist;
-
-    /* check the test values */
-    if (size != 1) {returnval = -1;};
-    if (testoneradiusresult(&myadbqueryresult,0,"testfeature01",1)) {returnval = -1;};
-
-//echo testfeature10 > testkl.txt
-    makekeylistfile("testkl.txt","testfeature10");
-//${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -K testkl.txt -R 5 > testoutput
-//echo testfeature10 1 > test-expected-output
-//cmp testoutput test-expected-output
-    myadbquery.querytype="sequence";
-    myadbquery.feature="testquery";
-    myadbquery.keylist="testkl.txt";
-    myadbquery.sequencelength="1";
-    myadbquery.radius="5";
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-    size=myadbqueryresult.sizeRlist;
-
-    /* check the test values */
-    if (size != 1) {returnval = -1;};
-    if (testoneradiusresult(&myadbqueryresult,0,"testfeature10",1)) {returnval = -1;};
-
-//echo testfeature10 > testkl.txt
-//${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -K testkl.txt -r 1 -R 5 > testoutput
-//echo testfeature10 1 > test-expected-output
-//cmp testoutput test-expected-output
-    myadbquery.querytype="sequence";
-    myadbquery.feature="testquery";
-    myadbquery.keylist="testkl.txt";
-    myadbquery.sequencelength="1";
-    myadbquery.radius="5";
-    myadbquery.resultlength="1";
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-    size=myadbqueryresult.sizeRlist;
-
-    /* check the test values */
-    if (size != 1) {returnval = -1;};
-    if (testoneradiusresult(&myadbqueryresult,0,"testfeature10",1)) {returnval = -1;};
-
-
-//# NB: one might be tempted to insert a test here for having both keys
-//# in the keylist, but in non-database order, and then checking that
-//# the result list is also in that non-database order.  I think that
-//# would be misguided, as the efficient way of dealing with such a
-//# keylist is to advance as-sequentially-as-possible through the
-//# database; it just so happens that our current implementation is not
-//# so smart.
-
-//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);
-
-//${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -R 5 > testoutput
-//echo testfeature01 1 > test-expected-output
-//echo testfeature10 1 >> test-expected-output
-//cmp testoutput test-expected-output
-    myadbquery.querytype="sequence";
-    myadbquery.feature="testquery";
-    myadbquery.keylist=NULL;
-    myadbquery.sequencelength="1";
-    myadbquery.radius="5";
-    myadbquery.resultlength=NULL;
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-    size=myadbqueryresult.sizeRlist;
-
-    /* check the test values */
-    if (size != 2) {returnval = -1;};
-    if (testoneradiusresult(&myadbqueryresult,0,"testfeature01",1)) {returnval = -1;};
-    if (testoneradiusresult(&myadbqueryresult,1,"testfeature10",1)) {returnval = -1;};
-
-//echo testfeature10 > testkl.txt
-//${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -K testkl.txt -r 1 -R 5 > testoutput
-//echo testfeature10 1 > test-expected-output
-//cmp testoutput test-expected-output
-    myadbquery.querytype="sequence";
-    myadbquery.feature="testquery";
-    myadbquery.keylist="testkl.txt";
-    myadbquery.sequencelength="1";
-    myadbquery.radius="5";
-    myadbquery.resultlength="1";
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-    size=myadbqueryresult.sizeRlist;
-
-    /* check the test values */
-    if (size != 1) {returnval = -1;};
-    if (testoneradiusresult(&myadbqueryresult,0,"testfeature10",1)) {returnval = -1;};
-
-
-    //fprintf(stderr,"returnval:%d\n",returnval); 
-    return(returnval);
+  return 104;
 }
-
--- a/libtests/0033/short-description	Sat Jan 10 15:33:11 2009 +0000
+++ b/libtests/0033/short-description	Sat Jan 10 15:33:16 2009 +0000
@@ -1,1 +1,1 @@
-0010 with -K restriction with lib
+0010 and include / exclude keylists with library
--- a/libtests/0034/prog1.c	Sat Jan 10 15:33:11 2009 +0000
+++ b/libtests/0034/prog1.c	Sat Jan 10 15:33:16 2009 +0000
@@ -1,170 +1,62 @@
 #include "audioDB_API.h"
 #include "test_utils_lib.h"
 
+int main(int argc, char **argv) {
+  adb_t *adb;
+  adb_insert_t insert = {0};
+  adb_status_t status = {0};
+  adb_insert_t batch[4] = {{0},{0},{0},{0}};
 
-int main(int argc, char **argv){
+  clean_remove_db(TESTDB);
+  if(!(adb = audiodb_create(TESTDB, 0, 0, 0)))
+    return 1;
 
-    int returnval=0;
-    adb_ptr mydbp={0};
-    int ivals[10];
-    double dvals[10];
-    adb_insert_t myinsert={0};
-    char * databasename="testdb";
-    adb_status_t mystatus={0};
-    adb_insert_t ins1[3]={{0},{0},{0}};
+  maketestfile("testfeature", (int[1]) {2}, (double[2]) {1, 1}, 2);
+  maketestfile("testfeature01", (int[1]) {2}, (double[2]) {0, 1}, 2);
+  maketestfile("testfeature10", (int[1]) {2}, (double[2]) {1, 0}, 2);
 
+  insert.features = "testfeature";
+  if(audiodb_insert(adb, &insert))
+    return 1;
+  if(audiodb_status(adb, &status) || status.numFiles != 1)
+    return 1;
+  
+  /* reinserts using audiodb_insert() should silently not fail and
+   * silently not insert, to support legacy command-line behaviour. */
+  if(audiodb_insert(adb, &insert))
+    return 1;
+  if(audiodb_status(adb, &status) || status.numFiles != 1)
+    return 1;
 
+  /* reinserts using audiodb_insert_datum() should fail. */
+  adb_datum_t datum = {1, 2, "testfeature", (double[2]) {1, 1}};
+  if(!audiodb_insert_datum(adb, &datum))
+    return 1;
 
-    /* remove old directory */
-//if [ -f testdb ]; then rm -f testdb; fi
-    clean_remove_db(databasename);
+  insert.features = "testfeature01";
+  if(audiodb_insert(adb, &insert))
+    return 1;
+  if(audiodb_status(adb, &status) || status.numFiles != 2)
+    return 1;
 
-    /* create new db */
-//${AUDIODB} -d testdb -N
-    mydbp=audiodb_create(databasename,0,0,0);
+  insert.features = "testfeature10";
+  if(audiodb_insert(adb, &insert))
+    return 1;
+  if(audiodb_status(adb, &status) || status.numFiles != 3)
+    return 1;
+  
+  clean_remove_db(TESTDB);
+  if(!(adb = audiodb_create(TESTDB, 0, 0, 0)))
+    return 1;
 
+  batch[0].features = "testfeature";
+  batch[1].features = "testfeature01";
+  batch[2].features = "testfeature10";
+  batch[3].features = "testfeature10";
+  if(audiodb_batchinsert(adb, batch, 4))
+    return 1;
+  if(audiodb_status(adb, &status) || status.numFiles != 3)
+    return 1;
 
-//intstring 2 > testfeature
-//floatstring 1 1 >> testfeature
-//intstring 2 > testfeature01
-//floatstring 0 1 >> testfeature01
-//intstring 2 > testfeature10
-//floatstring 1 0 >> testfeature10
-    ivals[0]=2;
-    dvals[0]=1; dvals[1]=1;
-    maketestfile("testfeature",ivals,dvals,2);
-    ivals[0]=2;
-    dvals[0]=0; dvals[1]=1;
-    maketestfile("testfeature01",ivals,dvals,2);
-    ivals[0]=2;
-    dvals[0]=1; dvals[1]=0;
-    maketestfile("testfeature10",ivals,dvals,2);
-
-//${AUDIODB} -d testdb -I -f testfeature
-    myinsert.features="testfeature";
-    if(audiodb_insert(mydbp,&myinsert)) {returnval = -1; };   
-
-//${AUDIODB} -d testdb -S | grep "num files:1"
-    if(audiodb_status(mydbp,&mystatus)) {returnval = -1; };
-    if(mystatus.numFiles != 1) { returnval = -1; }
-
-//${AUDIODB} -d testdb -I -f testfeature
-    myinsert.features="testfeature";
-    if(audiodb_insert(mydbp,&myinsert)) {returnval = -1; };   
-
-//${AUDIODB} -d testdb -S | grep "num files:1"
-    if(audiodb_status(mydbp,&mystatus)) {returnval = -1; };
-    if(mystatus.numFiles != 1) { returnval = -1; }
-
-//${AUDIODB} -d testdb -I -f testfeature01
-    myinsert.features="testfeature01";
-    if(audiodb_insert(mydbp,&myinsert)) {returnval = -1; };   
-
-//${AUDIODB} -d testdb -S | grep "num files:2"
-    if(audiodb_status(mydbp,&mystatus)) {returnval = -1; };
-    if(mystatus.numFiles != 2) { returnval = -1; }
-
-//${AUDIODB} -d testdb -I -f testfeature10
-    myinsert.features="testfeature10";
-    if(audiodb_insert(mydbp,&myinsert)) {returnval = -1; };   
-
-//${AUDIODB} -d testdb -S | grep "num files:3"
-    if(audiodb_status(mydbp,&mystatus)) {returnval = -1; };
-    if(mystatus.numFiles != 3) { returnval = -1; }
-
-//rm -f testdb
-    clean_remove_db(databasename);
-
-    /* create new db */
-//${AUDIODB} -d testdb -N
-    mydbp=audiodb_create(databasename,0,0,0);
-
-
-//${AUDIODB} -d testdb -I -f testfeature01
-    myinsert.features="testfeature01";
-    if(audiodb_insert(mydbp,&myinsert)) {returnval = -1; };   
-
-//${AUDIODB} -d testdb -S | grep "num files:1"
-    if(audiodb_status(mydbp,&mystatus)) {returnval = -1; };
-    if(mystatus.numFiles != 1) { returnval = -1; }
-
-//${AUDIODB} -d testdb -I -f testfeature01
-    myinsert.features="testfeature01";
-    if(audiodb_insert(mydbp,&myinsert)) {returnval = -1; };   
-
-//${AUDIODB} -d testdb -S | grep "num files:1"
-    if(audiodb_status(mydbp,&mystatus)) {returnval = -1; };
-    if(mystatus.numFiles != 1) { returnval = -1; }
-
-//${AUDIODB} -d testdb -I -f testfeature10
-    myinsert.features="testfeature10";
-    if(audiodb_insert(mydbp,&myinsert)) {returnval = -1; };   
-
-//${AUDIODB} -d testdb -S | grep "num files:2"
-    if(audiodb_status(mydbp,&mystatus)) {returnval = -1; };
-    if(mystatus.numFiles != 2) { returnval = -1; }
-
-//${AUDIODB} -d testdb -I -f testfeature
-    myinsert.features="testfeature";
-    if(audiodb_insert(mydbp,&myinsert)) {returnval = -1; };   
-
-//${AUDIODB} -d testdb -S | grep "num files:3"
-    if(audiodb_status(mydbp,&mystatus)) {returnval = -1; };
-    if(mystatus.numFiles != 3) { returnval = -1; }
-
-
-
-
-//rm -f testdb
-    clean_remove_db(databasename);
-
-    /* create new db */
-//${AUDIODB} -d testdb -N
-    mydbp=audiodb_create(databasename,0,0,0);
-
-//echo testfeature > testfeaturelist.txt
-//echo testfeature01 >> testfeaturelist.txt
-//echo testfeature10 >> testfeaturelist.txt
-//${AUDIODB} -B -F testfeaturelist.txt -d testdb
-    ins1[0].features="testfeature";
-    ins1[1].features="testfeature01";
-    ins1[2].features="testfeature10";
-    if(audiodb_batchinsert(mydbp,ins1,3)){
-        returnval=-1;
-    };
-
-//${AUDIODB} -d testdb -S | grep "num files:3"
-    if(audiodb_status(mydbp,&mystatus)) {returnval = -1; };
-    if(mystatus.numFiles != 3) { returnval = -1; }
-
-
-
-
-//rm -f testdb
-    clean_remove_db(databasename);
-
-    /* create new db */
-//${AUDIODB} -d testdb -N
-    mydbp=audiodb_create(databasename,0,0,0);
-
-
-//echo testfeature01 > testfeaturelist.txt
-//echo testfeature10 >> testfeaturelist.txt
-//echo testfeature >> testfeaturelist.txt
-//${AUDIODB} -B -F testfeaturelist.txt -d testdb
-    ins1[0].features="testfeature";
-    ins1[1].features="testfeature01";
-    ins1[2].features="testfeature10";
-    if(audiodb_batchinsert(mydbp,ins1,3)){
-        returnval=-1;
-    };
-
-//${AUDIODB} -d testdb -S | grep "num files:3"
-    if(audiodb_status(mydbp,&mystatus)) {returnval = -1; };
-    if(mystatus.numFiles != 3) { returnval = -1; }
-
-
-
-    fprintf(stderr,"returnval:%d\n",returnval); 
-    return(returnval);
+  return 104;
 }
--- a/libtests/0034/short-description	Sat Jan 10 15:33:11 2009 +0000
+++ b/libtests/0034/short-description	Sat Jan 10 15:33:16 2009 +0000
@@ -1,1 +1,1 @@
-key duplicate test with lib
+key duplicate test with library
--- a/libtests/0035/prog1.c	Sat Jan 10 15:33:11 2009 +0000
+++ b/libtests/0035/prog1.c	Sat Jan 10 15:33:16 2009 +0000
@@ -1,80 +1,42 @@
 #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;
 
-    int returnval=0;
-    adb_ptr mydbp={0};
-    int ivals[10];
-    double dvals[10];
-    adb_insert_t myinsert={0};
-    char * databasename="testdb";
-    adb_query_t myadbquery={0};
-    adb_queryresult_t myadbqueryresult={0};
-    int size=0;
+  adb_datum_t datum1 = {1, 2, "testfeature1", (double[2]) {0, 1}};
+  adb_datum_t datum3 = {3, 2, "testfeature3", (double[6]) {1, 0, 0, 1, 1, 0}};
 
+  if(audiodb_insert_datum(adb, &datum1))
+    return 1;
+  if(audiodb_insert_datum(adb, &datum3))
+    return 1;
+  if(audiodb_l2norm(adb))
+    return 1;
 
-    /* remove old directory */
-    //if [ -f testdb ]; then rm -f testdb; fi
-    clean_remove_db(databasename);
+  adb_datum_t query = {2, 2, "testquery", (double[4]) {0, 1, 1, 0}};
+  adb_query_id_t qid = {0};
+  qid.datum = &query;
+  qid.sequence_length = 2;
+  qid.sequence_start = 0;
+  adb_query_parameters_t parms =
+    {ADB_ACCUMULATION_PER_TRACK, ADB_DISTANCE_EUCLIDEAN, 1, 10};
+  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;
 
-//intstring 2 > testfeature1
-//floatstring 0 1 >> testfeature1
-    ivals[0]=2;
-    dvals[0]=0; dvals[1]=1;
-    maketestfile("testfeature1",ivals,dvals,2);
+  adb_query_results_t *results = audiodb_query_spec(adb, &spec);
+  if(!results || results->nresults != 1) return 1;
+  result_present_or_fail(results, "testfeature3", 0, 0, 1);
+  audiodb_query_free_results(adb, &spec, results);
 
-//intstring 2 > testfeature3
-//floatstring 1 0 >> testfeature3
-//floatstring 0 1 >> testfeature3
-//floatstring 1 0 >> testfeature3
-    ivals[0]=2;
-    dvals[0]=1; dvals[1]=0;
-    dvals[2]=0; dvals[3]=1;
-    dvals[4]=1; dvals[5]=0;
-    maketestfile("testfeature3",ivals,dvals,6);
-
-//${AUDIODB} -d testdb -I -f testfeature1
-    myinsert.features="testfeature1";
-    if (audiodb_insert(mydbp,&myinsert)){ returnval=-1; } 
-//${AUDIODB} -d testdb -I -f testfeature3
-    myinsert.features="testfeature3";
-    if (audiodb_insert(mydbp,&myinsert)){ returnval=-1; } 
-
-//# sequence queries require L2NORM
-//${AUDIODB} -d testdb -L
-    if(audiodb_l2norm(mydbp)){ returnval=-1; };
-
-//echo "query point (0 1, 1 0)"
-//intstring 2 > testquery
-//floatstring 0 1 >> testquery
-//floatstring 1 0 >> testquery
-    ivals[0]=2;
-    dvals[0]=0; dvals[1]=1;
-    dvals[2]=1; dvals[3]=0;
-    maketestfile("testquery",ivals,dvals,4);
-
-//audioDB -Q sequence -d testdb -f testquery -n 1 -l 2
-//${AUDIODB} -d testdb -Q sequence -l 2 -f testquery -n 1 > testoutput
-    myadbquery.querytype="sequence";
-    myadbquery.feature="testquery";
-    myadbquery.sequencelength="2";
-    myadbquery.numpoints="1";
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-    size=myadbqueryresult.sizeRlist;
-
-    /* check the test values */
-////wc -l testoutput | grep "1 testoutput"
-////grep "^testfeature3 .* 0 1$" testoutput
-    if (size != 1) {returnval = -1;};
-    if (strcmp(myadbqueryresult.Rlist[0],"testfeature3")){ returnval = -1; };
-
-    //printf("returnval:%d\n",returnval);  
-    return(returnval);
+  return 104;
 }
-
--- a/libtests/0035/short-description	Sat Jan 10 15:33:11 2009 +0000
+++ b/libtests/0035/short-description	Sat Jan 10 15:33:16 2009 +0000
@@ -1,1 +1,1 @@
--l 2 search with short tracks with lib
+search with short tracks using library
--- a/libtests/0036/prog1.c	Sat Jan 10 15:33:11 2009 +0000
+++ b/libtests/0036/prog1.c	Sat Jan 10 15:33:16 2009 +0000
@@ -1,106 +1,115 @@
 #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;
 
-    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};
-    adb_query_t myadbquery2={0};
-    adb_queryresult_t myadbqueryresult2={0};
-    int size=0;
+  adb_datum_t datum1 = {2, 2, "testfeature01", (double[4]) {0, 1, 1, 0}};
+  adb_datum_t datum2 = {2, 2, "testfeature10", (double[4]) {1, 0, 0, 1}};
 
+  if(audiodb_insert_datum(adb, &datum1))
+    return 1;
+  if(audiodb_insert_datum(adb, &datum2))
+    return 1;
+  if(audiodb_l2norm(adb))
+    return 1;
 
-    return 14;
+  adb_datum_t query = {1, 2, NULL, (double [2]){0, 0.5}, NULL, NULL};
+  adb_query_id_t qid = {0};
+  qid.datum = &query;
+  qid.sequence_length = 1;
+  adb_query_parameters_t parms = 
+    {ADB_ACCUMULATION_PER_TRACK, ADB_DISTANCE_EUCLIDEAN_NORMED, 10, 10};
+  adb_query_refine_t refine = {0};
+  refine.hopsize = 1;
 
-//#! /bin/bash
-//
-//. ../test-utils.sh
-//
-//if [ -f testdb ]; then rm -f testdb; fi
-//
-//${AUDIODB} -d testdb -N
-//
-//intstring 2 > testfeature01
-//floatstring 0 1 >> testfeature01
-//floatstring 1 0 >> testfeature01
-//intstring 2 > testfeature10
-//floatstring 1 0 >> testfeature10
-//floatstring 0 1 >> testfeature10
-//
-//cat > testfeaturefiles <<EOF
-//testfeature01
-//testfeature10
-//EOF
-//
-//${AUDIODB} -d testdb -B -F testfeaturefiles
-//
-//# sequence queries require L2NORM
-//${AUDIODB} -d testdb -L
-//
-//echo "query point (0.0,0.5)"
-//intstring 2 > testquery
-//floatstring 0 0.5 >> testquery
-//
-//${AUDIODB} -d testdb -Q nsequence -l 1 -f testquery > testoutput
-//echo testfeature01 1 > test-expected-output
-//echo 0 0 0 >> test-expected-output
-//echo 2 0 1 >> test-expected-output
-//echo testfeature10 1 >> test-expected-output
-//echo 0 0 1 >> test-expected-output
-//echo 2 0 0 >> test-expected-output
-//cmp testoutput test-expected-output
-//
-//${AUDIODB} -d testdb -Q nsequence -l 1 -f testquery -n 2 > testoutput
-//cmp testoutput test-expected-output
-//
-//${AUDIODB} -d testdb -Q nsequence -l 1 -f testquery -n 5 > testoutput
-//cmp testoutput test-expected-output
-//
-//${AUDIODB} -d testdb -Q nsequence -l 1 -f testquery -n 1 > testoutput
-//echo testfeature01 0 > test-expected-output
-//echo 0 0 0 >> test-expected-output
-//echo testfeature10 0 >> test-expected-output
-//echo 0 0 1 >> test-expected-output
-//cmp testoutput test-expected-output
-//
-//echo "query point (0.5,0.0)"
-//intstring 2 > testquery
-//floatstring 0.5 0 >> testquery
-//
-//${AUDIODB} -d testdb -Q nsequence -l 1 -f testquery > testoutput
-//echo testfeature01 1 > test-expected-output
-//echo 0 0 1 >> test-expected-output
-//echo 2 0 0 >> test-expected-output
-//echo testfeature10 1 >> test-expected-output
-//echo 0 0 0 >> test-expected-output
-//echo 2 0 1 >> test-expected-output
-//cmp testoutput test-expected-output
-//
-//${AUDIODB} -d testdb -Q nsequence -l 1 -f testquery -n 2 > testoutput
-//cmp testoutput test-expected-output
-//
-//${AUDIODB} -d testdb -Q nsequence -l 1 -f testquery -n 5 > testoutput
-//cmp testoutput test-expected-output
-//
-//${AUDIODB} -d testdb -Q nsequence -l 1 -f testquery -n 1 > testoutput
-//echo testfeature01 0 > test-expected-output
-//echo 0 0 1 >> test-expected-output
-//echo testfeature10 0 >> test-expected-output
-//echo 0 0 0 >> test-expected-output
-//cmp testoutput test-expected-output
-//
-//exit 104
+  adb_query_spec_t spec;
+  spec.qid = qid;
+  spec.params = parms;
+  spec.refine = refine;
 
-    returnval=-1;
-      
-    return(returnval);
+  adb_query_results_t *results = audiodb_query_spec(adb, &spec);
+
+  if(!results || results->nresults != 4) return 1;
+  result_present_or_fail(results, "testfeature01", 0, 0, 0);
+  result_present_or_fail(results, "testfeature01", 2, 0, 1);
+  result_present_or_fail(results, "testfeature10", 0, 0, 1);
+  result_present_or_fail(results, "testfeature10", 2, 0, 0);
+  audiodb_query_free_results(adb, &spec, results);
+
+  spec.params.npoints = 2;
+  results = audiodb_query_spec(adb, &spec);
+
+  if(!results || results->nresults != 4) return 1;
+  result_present_or_fail(results, "testfeature01", 0, 0, 0);
+  result_present_or_fail(results, "testfeature01", 2, 0, 1);
+  result_present_or_fail(results, "testfeature10", 0, 0, 1);
+  result_present_or_fail(results, "testfeature10", 2, 0, 0);
+  audiodb_query_free_results(adb, &spec, results);
+
+  spec.params.npoints = 5;
+  results = audiodb_query_spec(adb, &spec);
+
+  if(!results || results->nresults != 4) return 1;
+  result_present_or_fail(results, "testfeature01", 0, 0, 0);
+  result_present_or_fail(results, "testfeature01", 2, 0, 1);
+  result_present_or_fail(results, "testfeature10", 0, 0, 1);
+  result_present_or_fail(results, "testfeature10", 2, 0, 0);
+  audiodb_query_free_results(adb, &spec, results);
+
+  spec.params.npoints = 1;
+  results = audiodb_query_spec(adb, &spec);
+
+  if(!results || results->nresults != 2) return 1;
+  result_present_or_fail(results, "testfeature01", 0, 0, 0);
+  result_present_or_fail(results, "testfeature10", 0, 0, 1);
+
+  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);
+
+  if(!results || results->nresults != 4) return 1;
+  result_present_or_fail(results, "testfeature01", 0, 0, 1);
+  result_present_or_fail(results, "testfeature01", 2, 0, 0);
+  result_present_or_fail(results, "testfeature10", 0, 0, 0);
+  result_present_or_fail(results, "testfeature10", 2, 0, 1);
+  audiodb_query_free_results(adb, &spec, results);
+
+  spec.params.npoints = 2;
+  results = audiodb_query_spec(adb, &spec);
+
+  if(!results || results->nresults != 4) return 1;
+  result_present_or_fail(results, "testfeature01", 0, 0, 1);
+  result_present_or_fail(results, "testfeature01", 2, 0, 0);
+  result_present_or_fail(results, "testfeature10", 0, 0, 0);
+  result_present_or_fail(results, "testfeature10", 2, 0, 1);
+  audiodb_query_free_results(adb, &spec, results);
+
+  spec.params.npoints = 5;
+  results = audiodb_query_spec(adb, &spec);
+
+  if(!results || results->nresults != 4) return 1;
+  result_present_or_fail(results, "testfeature01", 0, 0, 1);
+  result_present_or_fail(results, "testfeature01", 2, 0, 0);
+  result_present_or_fail(results, "testfeature10", 0, 0, 0);
+  result_present_or_fail(results, "testfeature10", 2, 0, 1);
+  audiodb_query_free_results(adb, &spec, results);
+
+  spec.params.npoints = 1;
+  results = audiodb_query_spec(adb, &spec);
+
+  if(!results || results->nresults != 2) return 1;
+  result_present_or_fail(results, "testfeature01", 0, 0, 1);
+  result_present_or_fail(results, "testfeature10", 0, 0, 0);
+  audiodb_query_free_results(adb, &spec, results);
+
+  audiodb_close(adb);
+
+  return 104;
 }
-
--- a/libtests/0036/short-description	Sat Jan 10 15:33:11 2009 +0000
+++ b/libtests/0036/short-description	Sat Jan 10 15:33:16 2009 +0000
@@ -1,1 +1,1 @@
-nsequence search with lib
+nsequence search using library
--- a/libtests/0037/prog1.c	Sat Jan 10 15:33:11 2009 +0000
+++ b/libtests/0037/prog1.c	Sat Jan 10 15:33:16 2009 +0000
@@ -5,8 +5,6 @@
   adb_t *adb;
   adb_insert_t *batch = 0;
   adb_status_t status;
-  adb_query_t query = {0};
-  adb_queryresult_t result;
 
   clean_remove_db(TESTDB);
   adb = audiodb_create(TESTDB, 0, 0, 0);
@@ -31,16 +29,11 @@
   audiodb_batchinsert(adb, batch, 6);
   free(batch);
 
-  if(audiodb_status(adb, &status)) {
+  if(audiodb_status(adb, &status) || status.numFiles != 2)
     return 1;
-  }
-  if(status.numFiles != 2) {
+
+  if(audiodb_l2norm(adb))
     return 1;
-  }
-
-  if(audiodb_l2norm(adb)) {
-    return 1;
-  }
 
   adb_datum_t datum = {1, 2, NULL, (double [2]){0, 0.5}, NULL, NULL};
   adb_query_id_t qid = {0};
@@ -51,7 +44,6 @@
   adb_query_refine_t refine = {0};
   refine.hopsize = 1;
 
-  /* FIXME: structs / pointers */
   adb_query_spec_t spec;
   spec.qid = qid;
   spec.params = parms;
@@ -138,4 +130,3 @@
 
   return 104;
 }
-