changeset 491:29d28cfe0222 api-inversion

More removal of audiodb_query()

There's still a certain amount of code duplication between these test
files (for example, almost all of 0011/ and 0012/ are exactly the same),
but it's all improvement.

--- a/libtests/0009/prog1.c	Sat Jan 10 15:32:58 2009 +0000
+++ b/libtests/0009/prog1.c	Sat Jan 10 15:33:02 2009 +0000
@@ -1,153 +1,63 @@
 #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};
-    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 = {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}};
 
+  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;
 
-    //if [ -f testdb ]; then rm -f testdb; fi
+  adb_query_spec_t spec;
+  spec.qid = qid;
+  spec.params = parms;
+  spec.refine = refine;
 
-    /* remove old directory */
-    clean_remove_db(databasename);
+  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);
 
+  spec.params.ntracks = 1;
+  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);
 
-    //${AUDIODB} -d testdb -N
+  spec.qid.datum->data = (double [2]) {0.5, 0};
+  spec.params.ntracks = 10;
+  results = audiodb_query_spec(adb, &spec);
+  if(!results || results->nresults != 2) return 1;
+  result_present_or_fail(results, "testfeature10", 0.5, 0, 0);
+  result_present_or_fail(results, "testfeature01", 0, 0, 0);
+  audiodb_query_free_results(adb, &spec, results);
 
-    /* create new db */
-    mydbp=audiodb_create(databasename,0,0,0);
+  spec.params.ntracks = 1;
+  results = audiodb_query_spec(adb, &spec);
+  if(!results || results->nresults != 1) return 1;
+  result_present_or_fail(results, "testfeature10", 0.5, 0, 0);
+  audiodb_query_free_results(adb, &spec, results);
 
-    //${AUDIODB} -d testdb -L
-    if(audiodb_l2norm(mydbp)){
-        returnval=-1;
-    };
-
-    //intstring 2 > testfeature01
-    //floatstring 0 1 >> testfeature01
-    //intstring 2 > testfeature10
-    //floatstring 1 0 >> testfeature10
-
-    /* create testfeature01 file */
-    ivals[0]=2;
-    dvals[0]=0; dvals[1]=1; dvals[2]=0; dvals[3]=0;
-    maketestfile("testfeature01",ivals,dvals,2);
-
-    /* create testfeature10 file */
-    ivals[0]=2;
-    dvals[0]=1; dvals[1]=0; dvals[2]=0; dvals[3]=0;
-    maketestfile("testfeature10",ivals,dvals,2);
-
-    //${AUDIODB} -d testdb -I -f testfeature01
-    //${AUDIODB} -d testdb -I -f testfeature10
-
-    /* insert */
-    myinsert.features="testfeature01";
-    myerr=audiodb_insert(mydbp,&myinsert);   
-    myinsert.features="testfeature10";
-    myerr=audiodb_insert(mydbp,&myinsert);   
-
-    //echo "query point (0.0,0.5)"
-    //intstring 2 > testquery
-    //floatstring 0 0.5 >> testquery
-
-
-    /* create testquery file */
-    ivals[0]=2;
-    dvals[0]=0.0; dvals[1]=0.5; dvals[2]=0; dvals[3]=0;
-    maketestfile("testquery",ivals,dvals,2);
-
-    //${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
-
-    /* query */
-    myadbquery.querytype="track";
-    myadbquery.feature="testquery";
-    myadbquery.sequencelength="1";
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-    size=myadbqueryresult.sizeRlist;
-
-    /* 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;};
-
-    //${AUDIODB} -d testdb -Q track -l 1 -f testquery -r 1 > testoutput
-    //echo testfeature01 0.5 0 0 > test-expected-output
-    //cmp testoutput test-expected-output
-
-    /* query */
-    myadbquery.querytype="track";
-    myadbquery.feature="testquery";
-    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.5,0,0)) {returnval = -1;};
-
-    //echo "query point (0.5,0.0)"
-    //intstring 2 > testquery
-    //floatstring 0.5 0 >> testquery
-
-    /* create testquery file */
-    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
-
-    /* query */
-    myadbquery2.querytype="track";
-    myadbquery2.feature="testquery";
-    myadbquery2.sequencelength="1";
-    audiodb_query(mydbp,&myadbquery2,&myadbqueryresult2);
-    size=myadbqueryresult2.sizeRlist;
-
-
-    /* check the test values */
-    if (size != 2) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult2,0,"testfeature10",0.5,0,0)) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult2,1,"testfeature01",0,0,0)) {returnval = -1;};
-
-
-    //${AUDIODB} -d testdb -Q track -l 1 -f testquery -r 1 > testoutput
-    //echo testfeature10 0.5 0 0 > test-expected-output
-    //cmp testoutput test-expected-output
-
-    /* query */
-    myadbquery2.querytype="track";
-    myadbquery2.feature="testquery";
-    myadbquery2.sequencelength="1";
-    myadbquery2.resultlength="1";
-    audiodb_query(mydbp,&myadbquery2,&myadbqueryresult2);
-    size=myadbqueryresult2.sizeRlist;
-
-
-    /* check the test values */
-    if (size != 1) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult2,0,"testfeature10",0.5,0,0)) {returnval = -1;};
-
-
-    return(returnval);
+  return 104;
 }
-

--- a/libtests/0009/short-description	Sat Jan 10 15:32:58 2009 +0000
+++ b/libtests/0009/short-description	Sat Jan 10 15:33:02 2009 +0000
@@ -1,1 +1,1 @@
-track search with lib
+track search with library

--- a/libtests/0010/prog1.c	Sat Jan 10 15:32:58 2009 +0000
+++ b/libtests/0010/prog1.c	Sat Jan 10 15:33:02 2009 +0000
@@ -1,111 +1,69 @@
 #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;
+  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};
-    unsigned int myerr=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}};
 
-/* clean */
-//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;
 
-/* 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;
 
-/* test feature files */
-//intstring 2 > testfeature01
-//floatstring 0 1 >> testfeature01
-    ivals[0]=2;
-    dvals[0]=0; dvals[1]=1;
-    maketestfile("testfeature01",ivals,dvals,2);
-//intstring 2 > testfeature10
-//floatstring 1 0 >> testfeature10
-    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);
+  
+  /* 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);
 
-/* inserts */
-//${AUDIODB} -d testdb -I -f testfeature01
-//${AUDIODB} -d testdb -I -f testfeature10
-    myinsert.features="testfeature01";
-    myerr=audiodb_insert(mydbp,&myinsert);   
-    myinsert.features="testfeature10";
-    myerr=audiodb_insert(mydbp,&myinsert);   
+  spec.qid.datum->data = (double[2]) {0.5, 0};
+  spec.refine.radius = 5;
+  results = audiodb_query_spec(adb, &spec);
+  if(!results ||  results->nresults != 2) return 1;
+  result_present_or_fail(results, "testfeature10", 0, 0, 0);
+  result_present_or_fail(results, "testfeature01", 2, 0, 0);
+  audiodb_query_free_results(adb, &spec, results);
 
-/* l2norm */
-//# sequence queries require L2NORM
-//${AUDIODB} -d testdb -L
-    audiodb_l2norm(mydbp);
+  spec.refine.radius = 1;
+  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 1 */
-//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,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.sequencelength="1";
-    myadbquery.radius="5";
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-    size=myadbqueryresult.sizeRlist;
-
-    /* check the test values */
-    if (size != 2) {returnval = -1;};
-    //if (testoneresult(&myadbqueryresult,0,"testfeature",1,0,0)) {returnval = -1;};
-    //if (testoneresult(&myadbqueryresult,1,"testfeature",1,0,0)) {returnval = -1;};
-  
-  
-/* query 2 */
-//${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -r 1 -R 5 > testoutput
-//echo testfeature01 1 > test-expected-output
-//cmp testoutput test-expected-output
-//
-//echo "query point (0.5,0.0)"
-//intstring 2 > testquery
-//floatstring 0.5 0 >> testquery
-
-
-/* query 3 */
-//# FIXME: because there's only one point in each track (and the query),
-//# the ordering is essentially database order.  We need these test
-//# cases anyway because we need to test non-segfaulting, non-empty
-//# results...
-//
-//${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
-
-
-
-/* query 4 */
-//${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -r 1 -R 5 > testoutput
-//echo testfeature01 1 > test-expected-output
-//cmp testoutput test-expected-output
-
-
-    printf("returnval:%d\n",returnval);
-    //returnval=-1;
-      
-    return(returnval);
+  return 104;
 }
-

--- a/libtests/0010/short-description	Sat Jan 10 15:32:58 2009 +0000
+++ b/libtests/0010/short-description	Sat Jan 10 15:33:02 2009 +0000
@@ -1,1 +1,1 @@
-sequence radius search / 1 point with lib
+sequence radius search / 1 point with library

--- a/libtests/0011/prog1.c	Sat Jan 10 15:32:58 2009 +0000
+++ b/libtests/0011/prog1.c	Sat Jan 10 15:33:02 2009 +0000
@@ -1,128 +1,59 @@
 #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 datum = {2, 2, "testfeature", (double[4]) {0, 0.5, 0.5, 0}};
+  if(audiodb_insert_datum(adb, &datum))
+    return 1;
+  if(audiodb_l2norm(adb))
+    return 1;
 
+  adb_datum_t query = {1, 2, "testquery", (double[2]) {0, 0.5}};
+  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;
 
-    //if [ -f testdb ]; then rm -f testdb; fi
-    /* 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 || results->nresults != 2) return 1;
+  result_present_or_fail(results, "testfeature", 0, 0, 0);
+  result_present_or_fail(results, "testfeature", 2, 0, 1);
+  audiodb_query_free_results(adb, &spec, results);
 
-    //${AUDIODB} -d testdb -N
-    /* create new db */
-    mydbp=audiodb_create(databasename,0,0,0);
+  spec.params.npoints = 1;
+  results = audiodb_query_spec(adb, &spec);
+  if(!results || results->nresults != 1) return 1;
+  result_present_or_fail(results, "testfeature", 0, 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);
+  if(!results || results->nresults != 2) return 1;
+  result_present_or_fail(results, "testfeature", 0, 0, 1);
+  result_present_or_fail(results, "testfeature", 2, 0, 0);
+  audiodb_query_free_results(adb, &spec, results);
+  
+  spec.params.npoints = 1;
+  results = audiodb_query_spec(adb, &spec);
+  if(!results || results->nresults != 1) return 1;
+  result_present_or_fail(results, "testfeature", 0, 0, 1);
+  audiodb_query_free_results(adb, &spec, results);
 
-    /* create testfeature01 file */
-    //intstring 2 > testfeature
-    //floatstring 0 0.5 >> testfeature
-    //floatstring 0.5 0 >> testfeature
-    ivals[0]=2;
-    dvals[0]=0; dvals[1]=0.5; dvals[2]=0.5; dvals[3]=0;
-    maketestfile("testfeature",ivals,dvals,4);
-
-    /* insert */
-    //${AUDIODB} -d testdb -I -f testfeature
-    myinsert.features="testfeature";
-    myerr=audiodb_insert(mydbp,&myinsert);   
-
-    /* create testquery file */
-    //echo "query point (0.0,0.5)"
-    //intstring 2 > testquery
-    //floatstring 0 0.5 >> testquery
-    ivals[0]=2;
-    dvals[0]=0.0; dvals[1]=0.5; dvals[2]=0; dvals[3]=0;
-    maketestfile("testquery",ivals,dvals,2);
-
-    /* l2norm */
-    //# sequence queries require L2NORM
-    //${AUDIODB} -d testdb -L
-    audiodb_l2norm(mydbp);
-
-    /* query */
-    //${AUDIODB} -d testdb -Q sequence -l 1 -f testquery > testoutput
-    //echo testfeature 1 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;
-
-    /* check the test values */
-    if (size != 1) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult,0,"testfeature",1,0,0)) {returnval = -1;};
-
-    /* query2 */
-    //${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -n 1 > testoutput
-    //echo testfeature 0 0 0 > test-expected-output
-    //cmp testoutput test-expected-output
-    myadbquery.querytype="sequence";
-    myadbquery.feature="testquery";
-    myadbquery.sequencelength="1";
-    myadbquery.numpoints="1";
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-    size=myadbqueryresult.sizeRlist;
-
-    /* check the test values */
-    if (size != 1) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult,0,"testfeature",0,0,0)) {returnval = -1;};
-
-    /* query3 */
-    //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;
-    maketestfile("testquery",ivals,dvals,2);
-
-    //${AUDIODB} -d testdb -Q sequence -l 1 -f testquery > testoutput
-    //echo testfeature 1 0 1 > test-expected-output
-    //cmp testoutput test-expected-output
-    myadbquery2.querytype="sequence";
-    myadbquery2.feature="testquery";
-    myadbquery2.sequencelength="1";
-    audiodb_query(mydbp,&myadbquery2,&myadbqueryresult2);
-    size=myadbqueryresult2.sizeRlist;
-
-
-    /* check the test values */
-    if (size != 1) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult2,0,"testfeature",1,0,1)) {returnval = -1;};
-
-
-    /* query4 */
-    //${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -n 1 > testoutput
-    //echo testfeature 0 0 1 > test-expected-output
-    //cmp testoutput test-expected-output
-    myadbquery2.querytype="sequence";
-    myadbquery2.feature="testquery";
-    myadbquery2.sequencelength="1";
-    myadbquery2.numpoints="1";
-    audiodb_query(mydbp,&myadbquery2,&myadbqueryresult2);
-    size=myadbqueryresult2.sizeRlist;
-
-    /* check the test values */
-    if (size != 1) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult2,0,"testfeature",0,0,1)) {returnval = -1;};
-
-
-
-    return(returnval);
+  return 104;
 }
-

--- a/libtests/0011/short-description	Sat Jan 10 15:32:58 2009 +0000
+++ b/libtests/0011/short-description	Sat Jan 10 15:33:02 2009 +0000
@@ -1,1 +1,1 @@
-sequence search / 1 track / non-normed features using lib
+sequence search / 1 track / non-normed features using library

--- a/libtests/0012/prog1.c	Sat Jan 10 15:32:58 2009 +0000
+++ b/libtests/0012/prog1.c	Sat Jan 10 15:33:02 2009 +0000
@@ -1,125 +1,59 @@
 #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};
-    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 datum = {2, 2, "testfeature", (double[4]) {0, 0.5, 0.5, 0}};
+  if(audiodb_insert_datum(adb, &datum))
+    return 1;
 
+  adb_datum_t query = {1, 2, "testquery", (double[2]) {0, 0.5}};
+  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;
 
-    /* remove old directory */
-    //if [ -f testdb ]; then rm -f testdb; fi
-    clean_remove_db(databasename);
+  adb_query_spec_t spec;
+  spec.qid = qid;
+  spec.params = parms;
+  spec.refine = refine;
 
-    /* create new db */
-    //${AUDIODB} -d testdb -N
-    mydbp=audiodb_create(databasename,0,0,0);
+  adb_query_results_t *results = audiodb_query_spec(adb, &spec);
+  if(!results || results->nresults != 2) return 1;
+  result_present_or_fail(results, "testfeature", 0, 0, 0);
+  result_present_or_fail(results, "testfeature", 2, 0, 1);
+  audiodb_query_free_results(adb, &spec, results);
 
-    //intstring 2 > testfeature
-    //floatstring 0 0.5 >> testfeature
-    //floatstring 0.5 0 >> testfeature
-    ivals[0]=2;
-    dvals[0]=0; dvals[1]=0.5; dvals[2]=0.5; 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, 0, 0);
+  audiodb_query_free_results(adb, &spec, results);
 
-    //# sequence queries require L2NORM; check that we can still insert
-    //# after turning flag on
-    //${AUDIODB} -d testdb -L
-    if(audiodb_l2norm(mydbp)){
-        returnval=-1;
-    };
+  spec.qid.datum->data = (double[2]) {0.5, 0};
+  spec.params.npoints = 10;
+  results = audiodb_query_spec(adb, &spec);
+  if(!results || results->nresults != 2) return 1;
+  result_present_or_fail(results, "testfeature", 0, 0, 1);
+  result_present_or_fail(results, "testfeature", 2, 0, 0);
+  audiodb_query_free_results(adb, &spec, results);
+  
+  spec.params.npoints = 1;
+  results = audiodb_query_spec(adb, &spec);
+  if(!results || results->nresults != 1) return 1;
+  result_present_or_fail(results, "testfeature", 0, 0, 1);
+  audiodb_query_free_results(adb, &spec, results);
 
-    //${AUDIODB} -d testdb -I -f testfeature
-    myinsert.features="testfeature";
-    myerr=audiodb_insert(mydbp,&myinsert);   
-
-    //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);
-
-    /* query 1 */
-//${AUDIODB} -d testdb -Q sequence -l 1 -f testquery > testoutput
-//echo testfeature 1 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;
-
-    /* check the test values */
-    if (size != 1) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult,0,"testfeature",1,0,0)) {returnval = -1;};
-
-
-    /* query 2 */
-    //${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -n 1 > testoutput
-    //echo testfeature 0 0 0 > test-expected-output
-    //cmp testoutput test-expected-output
-    myadbquery.querytype="sequence";
-    myadbquery.feature="testquery";
-    myadbquery.sequencelength="1";
-    myadbquery.numpoints="1";
-    audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
-    size=myadbqueryresult.sizeRlist;
-
-    /* check the test values */
-    if (size != 1) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult,0,"testfeature",0,0,0)) {returnval = -1;};
-
-    /* testquery */
-//echo "query point (0.5,0.0)"
-//intstring 2 > testquery
-//floatstring 0.5 0 >> testquery
-    /* create testquery file */
-    ivals[0]=2;
-    dvals[0]=0.5; dvals[1]=0.0; dvals[2]=0; dvals[3]=0;
-    maketestfile("testquery",ivals,dvals,2);
-
-    /* query 3 file */
-//${AUDIODB} -d testdb -Q sequence -l 1 -f testquery > testoutput
-//echo testfeature 1 0 1 > test-expected-output
-//cmp testoutput test-expected-output
-    myadbquery2.querytype="sequence";
-    myadbquery2.feature="testquery";
-    myadbquery2.sequencelength="1";
-    audiodb_query(mydbp,&myadbquery2,&myadbqueryresult2);
-    size=myadbqueryresult2.sizeRlist;
-
-    /* check the test values */
-    if (size != 1) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult2,0,"testfeature",1,0,1)) {returnval = -1;};
-
-    /* query 4 */
-//${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -n 1 > testoutput
-//echo testfeature 0 0 1 > test-expected-output
-//cmp testoutput test-expected-output
-    myadbquery2.querytype="sequence";
-    myadbquery2.feature="testquery";
-    myadbquery2.sequencelength="1";
-    myadbquery2.numpoints="1";
-    audiodb_query(mydbp,&myadbquery2,&myadbqueryresult2);
-    size=myadbqueryresult2.sizeRlist;
-
-    /* check the test values */
-    if (size != 1) {returnval = -1;};
-    if (testoneresult(&myadbqueryresult2,0,"testfeature",0,0,1)) {returnval = -1;};
-
-      
-    return(returnval);
+  return 104;
 }
-

--- a/libtests/0012/short-description	Sat Jan 10 15:32:58 2009 +0000
+++ b/libtests/0012/short-description	Sat Jan 10 15:33:02 2009 +0000
@@ -1,1 +1,1 @@
-insert after L2Norm with lib
+insert after L2Norm with library