using yaz/log.h again

[idzebra-moved-to-github.git] / test / api / testlib.c

diff --git a/test/api/testlib.c b/test/api/testlib.c
index 52173d3..8538b3b 100644 (file)
--- a/test/api/testlib.c
+++ b/test/api/testlib.c
@@ -1,4 +1,4 @@
-/* $Id: testlib.c,v 1.4 2004-11-04 13:10:07 heikki Exp $
+/* $Id: testlib.c,v 1.8 2004-12-13 20:51:33 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -30,7 +30,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /** start_log: open a log file */
 /*    FIXME - parse command line arguments to set log levels etc */
-static int loglevel=0;
+int log_level=0; /* not static, t*.c may use it */
+
 void start_log(int argc, char **argv)
 {
     char logname[2048];
@@ -40,9 +41,9 @@ void start_log(int argc, char **argv)
         return;
     sprintf(logname, "%s.log", argv[0]);
     yaz_log_init_file(logname);
-    loglevel = yaz_log_mask_str_x(argv[0],0);
-    yaz_log_init_level(LOG_DEFAULT_LEVEL | loglevel);
-    logf(loglevel,"starting %s",argv[0]);
+    log_level = yaz_log_mask_str_x(argv[0],0);
+    yaz_log_init_level(YLOG_DEFAULT_LEVEL | log_level);
+    yaz_log(log_level,"starting %s",argv[0]);
 }
 
 /** 
@@ -60,18 +61,27 @@ ZebraService start_up(char *cfgname, int argc, char **argv)
     return start_service(cfgname);
 }
 
+/**
+ * get_srcdir: return env srcdir or . (if does does not exist)
+ */
+const char *get_srcdir()
+{
+    const char *srcdir = getenv("srcdir");
+    if (!srcdir || ! *srcdir)
+        srcdir=".";
+    return srcdir;
+
+}
 /** start_service - do a zebra_start with a decent config name */
 ZebraService start_service(char *cfgname)
 {
     char cfg[256];
-    char *srcdir = getenv("srcdir");
+    const char *srcdir = get_srcdir();
     ZebraService zs;
-    if (!srcdir || ! *srcdir)
-        srcdir=".";
     if (!cfgname || ! *cfgname )
         cfgname="zebra.cfg";
 
-    sprintf(cfg, "%.200s/%s",srcdir, cfgname);
+    sprintf(cfg, "%.200s/%.50s", srcdir, cfgname);
     zs=zebra_start(cfg);
     if (!zs)
     {
@@ -92,9 +102,9 @@ int close_down(ZebraHandle zh, ZebraService zs, int retcode)
         zebra_stop(zs);
 
     if (retcode)
-        logf(loglevel,"========= Exiting with return code %d", retcode);
+        yaz_log(log_level,"========= Exiting with return code %d", retcode);
     else
-        logf(loglevel,"========= All tests OK");
+        yaz_log(log_level,"========= All tests OK");
     nmem_exit();
     xmalloc_trav("x");
     return retcode;
@@ -102,15 +112,15 @@ int close_down(ZebraHandle zh, ZebraService zs, int retcode)
 
 /** inits the database and inserts test data */
 
-void init_data( ZebraHandle zh, const char **recs)
+void init_data(ZebraHandle zh, const char **recs)
 {
     int i;
     char *addinfo;
     assert(zh);
     zebra_select_database(zh, "Default");
-    logf(LOG_DEBUG,"going to call init");
-    i=zebra_init(zh);
-    logf(LOG_DEBUG,"init returned %d",i);
+    yaz_log(log_level, "going to call init");
+    i = zebra_init(zh);
+    yaz_log(log_level, "init returned %d",i);
     if (i) 
     {
         printf("init failed with %d\n",i);
@@ -129,8 +139,6 @@ void init_data( ZebraHandle zh, const char **recs)
 
 }
 
-
-
 int do_query(int lineno, ZebraHandle zh, char *query, int exphits)
 {
     ODR odr;
@@ -141,8 +149,8 @@ int do_query(int lineno, ZebraHandle zh, char *query, int exphits)
     int rc;
         
 
-    logf(loglevel,"======================================");
-    logf(loglevel,"qry[%d]: %s", lineno, query);
+    yaz_log(log_level,"======================================");
+    yaz_log(log_level,"qry[%d]: %s", lineno, query);
     odr=odr_createmem (ODR_DECODE);    
 
     parser = yaz_pqf_create();
@@ -151,7 +159,7 @@ int do_query(int lineno, ZebraHandle zh, char *query, int exphits)
         printf("Error: Parse failed \n%s\n",query);
         exit(1);
     }
-    rc=zebra_search_RPN (zh, odr, rpn, setname, &hits);
+    rc = zebra_search_RPN (zh, odr, rpn, setname, &hits);
     if (rc) {
         printf("Error: search returned %d \n%s\n",rc,query);
         exit (1);
@@ -182,15 +190,16 @@ void ranking_query(int lineno, ZebraHandle zh, char *query,
     int rc;
     int i;
         
-    hits=do_query(lineno, zh, query, exphits);
+    hits = do_query(lineno, zh, query, exphits);
 
     for (i = 0; i<10; i++)
         retrievalRecord[i].position = i+1;
 
-    rc=zebra_records_retrieve (zh, odr_output, setname, 0,
-                     VAL_TEXT_XML, hits, retrievalRecord);
-
-    if (rc) {
+    rc = zebra_records_retrieve (zh, odr_output, setname, 0,
+                                VAL_TEXT_XML, hits, retrievalRecord);
+    
+    if (rc)
+    {
         printf("Error: retrieve returned %d \n%s\n",rc,query);
         exit (1);
     }
@@ -206,9 +215,47 @@ void ranking_query(int lineno, ZebraHandle zh, char *query,
     if (retrievalRecord[0].score != firstscore)
     {
         printf("Error: first rec got score %d instead of %d\n",
-                retrievalRecord[0].score, firstscore);
+              retrievalRecord[0].score, firstscore);
         exit(1);
     }
     odr_destroy (odr_output);
 }
 
+void meta_query(int lineno, ZebraHandle zh, char *query, int exphits,
+               zint *ids)
+{
+    ZebraMetaRecord *meta;
+    ODR odr_output = odr_createmem (ODR_ENCODE);    
+    const char *setname="rsetname";
+    zint *positions = (zint *) malloc(1 + (exphits * sizeof(zint)));
+    int hits;
+    int rc;
+    int i;
+        
+    hits = do_query(lineno, zh, query, exphits);
+    
+    for (i = 0; i<exphits; i++)
+        positions[i] = i+1;
+
+    meta = zebra_meta_records_create (zh, setname,  exphits, positions);
+    
+    if (!meta)
+    {
+        printf("Error: retrieve returned %d \n%s\n",rc,query);
+        exit (1);
+    }
+
+    for (i = 0; i<exphits; i++)
+    {
+       if (meta[i].sysno != ids[i])
+       {
+           printf("Expected id=" ZINT_FORMAT " but got id=" ZINT_FORMAT,
+                  ids[i], meta[i].sysno);
+           exit(1);
+       }
+    }
+    zebra_meta_records_destroy(zh, meta, exphits);
+    odr_destroy (odr_output);
+    free(positions);
+}
+