X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ftestlib.c;h=583a2c40275a0d621d45df0e307ff848e3419a0b;hb=9dbf16ff99472e07182dab1c7cf8796a4d357b0c;hp=ad878d617663231359a586fe47a57d0a063619ac;hpb=89d3a004b7c651fd5673abfc192e1472dc4d4197;p=idzebra-moved-to-github.git diff --git a/test/api/testlib.c b/test/api/testlib.c index ad878d6..583a2c4 100644 --- a/test/api/testlib.c +++ b/test/api/testlib.c @@ -1,4 +1,4 @@ -/* $Id: testlib.c,v 1.42 2007-01-15 15:10:20 adam Exp $ +/* $Id: testlib.c,v 1.45 2007-04-18 11:37:39 adam Exp $ Copyright (C) 1995-2007 Index Data ApS @@ -35,6 +35,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include +#include #include #include "testlib.h" @@ -42,7 +43,6 @@ 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 @@ -58,7 +58,6 @@ ZebraService tl_start_up(char *cfgname, int argc, char **argv) setrlimit(RLIMIT_CPU, &rlim); #endif #endif - nmem_init(); return tl_zebra_start(cfgname); } @@ -93,7 +92,6 @@ int tl_close_down(ZebraHandle zh, ZebraService zs) if (zs) zebra_stop(zs); - nmem_exit(); xmalloc_trav("x"); return 1; } @@ -323,7 +321,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))