X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=test%2Fapi%2Ftestlib.c;h=8a112399304583ab2a3c8573bf87290493fe90a2;hp=18f3cd9ea496dbca32e8b748fb4c6eb9e70b7299;hb=a030c87bc444608639905eca95e29f84a4f1d991;hpb=c401b3a1421e31b3d6b77bc7bac6ffb934207df1

diff --git a/test/api/testlib.c b/test/api/testlib.c
index 18f3cd9..8a11239 100644
--- a/test/api/testlib.c
+++ b/test/api/testlib.c
@@ -1,8 +1,5 @@
-/* $Id: testlib.c,v 1.39 2006-10-29 17:20:01 adam Exp $
-   Copyright (C) 1995-2006
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2011 Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -35,37 +32,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <assert.h>
 #include <yaz/log.h>
 #include <yaz/pquery.h>
+#include <yaz/oid_db.h>
 #include <idzebra/api.h>
 #include "testlib.h"
 
-/** start_log: open a log file */
-/*    FIXME - parse command line arguments to set log levels etc */
-int log_level=0; /* not static, t*.c may use it */
-
-void tl_start_log(int argc, char **argv)
-{
-    char logname[2048];
-    if (!argv) 
-        return;
-    if (!argv[0])
-        return;
-    sprintf(logname, "%s.log", argv[0]);
-#if HAVE_UNISTD_H
-    unlink(logname);
-#endif
-    yaz_log_init_file(logname);
-    if (argc >= 2)
-	log_level = yaz_log_mask_str_x(argv[1], 0);
-    if (argc >= 3)
-	yaz_log_time_format(argv[2]);
-    if (log_level)
-        yaz_log_init_level(log_level);
-    yaz_log(log_level, "starting %s", argv[0]);
-}
+int log_level = YLOG_LOG;
 
-/** 
+/* 
  * tl_start_up : do common start things, and a zebra_start
- *    - nmem_init
  *    - build the name of logfile from argv[0], and open it
  *      if no argv passed, do not open a log
  *    - read zebra.cfg from env var srcdir if it exists; otherwise current dir 
@@ -81,8 +55,6 @@ ZebraService tl_start_up(char *cfgname, int argc, char **argv)
     setrlimit(RLIMIT_CPU, &rlim);
 #endif
 #endif
-    nmem_init();
-    tl_start_log(argc, argv);
     return tl_zebra_start(cfgname);
 }
 
@@ -117,7 +89,6 @@ int tl_close_down(ZebraHandle zh, ZebraService zs)
     if (zs)
         zebra_stop(zs);
 
-    nmem_exit();
     xmalloc_trav("x");
     return 1;
 }
@@ -148,7 +119,14 @@ int tl_init_data(ZebraHandle zh, const char **recs)
 	if (zebra_begin_trans (zh, 1) != ZEBRA_OK)
 	    return 0;
         for (i = 0; recs[i]; i++)
-            zebra_add_record(zh, recs[i], strlen(recs[i]));
+        {
+            if (zebra_add_record(zh, recs[i], strlen(recs[i])) != ZEBRA_OK)
+            {
+                if (zebra_end_trans(zh) != ZEBRA_OK)
+                    return 0;
+                return 0;
+            }
+        }
         if (zebra_end_trans(zh) != ZEBRA_OK)
 	    return 0;
         zebra_commit(zh);
@@ -340,7 +318,7 @@ int tl_ranking_query(ZebraHandle zh, char *query,
 
     odr_output = odr_createmem(ODR_ENCODE);    
     rc = zebra_records_retrieve(zh, odr_output, setname, 0,
-                                VAL_TEXT_XML, exphits, retrievalRecord);
+                                yaz_oid_recsyn_xml, exphits, retrievalRecord);
     if (rc != ZEBRA_OK)
         ret = 0;
     else if (!strstr(retrievalRecord[0].buf, firstrec))
@@ -469,12 +447,71 @@ void tl_check_filter(ZebraService zs, const char *name)
     }
 }
 
+ZEBRA_RES tl_fetch(ZebraHandle zh, int position, const char *element_set,
+                   const Odr_oid * format, ODR odr,
+                   const char **rec_buf, size_t *rec_len)
+{
+    ZebraRetrievalRecord retrievalRecord[1];
+    Z_RecordComposition *comp;
+    ZEBRA_RES res;
+
+    retrievalRecord[0].position = position;
+    
+    yaz_set_esn(&comp, element_set, odr->mem);
+
+    res = zebra_records_retrieve(zh, odr, "rsetname", comp, format, 1, 
+                                 retrievalRecord);
+    if (res != ZEBRA_OK)
+    {
+        int code = zebra_errCode(zh);
+        yaz_log(YLOG_FATAL, "zebra_records_retrieve returned error %d",
+                code);
+    }
+    else
+    {
+        *rec_buf = retrievalRecord[0].buf;
+        *rec_len = retrievalRecord[0].len;
+    }
+    return res;
+}
 
+ZEBRA_RES tl_fetch_compare(ZebraHandle zh,
+                           int position, const char *element_set,
+                           const Odr_oid *format, const char *cmp_rec)
+{
+    const char *rec_buf = 0;
+    size_t rec_len = 0;
+    ODR odr = odr_createmem(ODR_ENCODE);
+    ZEBRA_RES res = tl_fetch(zh, position, element_set, format, odr,
+                             &rec_buf, &rec_len);
+    if (res == ZEBRA_OK)
+    {
+        if (strlen(cmp_rec) != rec_len)
+            res = ZEBRA_FAIL;
+        else if (memcmp(cmp_rec, rec_buf, rec_len))
+            res = ZEBRA_FAIL;
+        if (res == ZEBRA_FAIL)
+        {
+            int l = rec_len;
+            yaz_log(YLOG_LOG, "Expected: %s", cmp_rec);
+            yaz_log(YLOG_LOG, "Got: %.*s", l, rec_buf);
+        }
+    }
+    odr_destroy(odr);
+    return res;
+}
 
+ZEBRA_RES tl_fetch_first_compare(ZebraHandle zh,
+                                 const char *element_set,
+                                 const Odr_oid *format, const char *cmp_rec)
+{
+    return tl_fetch_compare(zh, 1, element_set, format, cmp_rec);
+}
 
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab