diff libtests/0005/prog1.c @ 490:13de7ba21966 api-inversion

Continue removing uses of audiodb_query()

Deal with four more libtests/ cases.

Of course, it would probably be "nice" or "useful" to provide an
audiodb_query() implemented in terms of audiodb_query_spec() -- but that
is not a task that I would enjoy.

--- a/libtests/0005/prog1.c	Sat Jan 10 15:32:53 2009 +0000
+++ b/libtests/0005/prog1.c	Sat Jan 10 15:32:58 2009 +0000
@@ -1,56 +1,22 @@
 #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";
-    int myerror=0;
+  adb_datum_t datum = {2, 2, "testfeature", (double[4]) {0, 1, 1, 0}};
+  if(audiodb_insert_datum(adb,&datum))
+    return 1;
 
+  if(audiodb_l2norm(adb))
+    return 1;
 
-    /* remove old directory */
-    //if [ -f testdb ]; then rm -f testdb; fi
-    clean_remove_db(databasename);
+  audiodb_close(adb);
 
-    /* create new db */
-    //${AUDIODB} -d testdb -N
-    mydbp=audiodb_create(databasename,0,0,0);
-
-
-    /* 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);
-
-    
-    /* insert */ 
-    //${AUDIODB} -d testdb -I -f testfeature
-    myinsert.features="testfeature";
-    myerr=audiodb_insert(mydbp,&myinsert);   
-
-    /* turn on l2norm */
-    //echo running L2Norm
-    //${AUDIODB} -d testdb -L
-    myerror=audiodb_l2norm(mydbp);
-    if (myerror){
-        returnval=-1;
-    }
-
-
-    /* close */
-    audiodb_close(mydbp);
-
-
-      
-    return(returnval);
+  return 104;
 }