X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=test%2Fapi%2Ftestlib.c;h=d8841b48762a5fb3a4661edad582aea27baa4d3f;hp=755d7bc27246dc842029013bf0cf5fe23883a0a5;hb=e4c6861efeeea654bfb00c5f0239ee258629d77f;hpb=d94e1b43a4a350167e0949c38907dd8c35aa408c diff --git a/test/api/testlib.c b/test/api/testlib.c index 755d7bc..d8841b4 100644 --- a/test/api/testlib.c +++ b/test/api/testlib.c @@ -1,8 +1,5 @@ -/* $Id: testlib.c,v 1.40 2006-11-10 12:57:49 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) 2004-2013 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 @@ -22,6 +19,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA /** testlib - utilities for the api tests */ +#if HAVE_CONFIG_H +#include +#endif #if HAVE_SYS_TIME_H #include #endif @@ -35,40 +35,17 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include +#include #include #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 */ +int log_level = YLOG_LOG; -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]); -} - -/** +/* * 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 + * - read zebra.cfg from env var srcdir if it exists; otherwise current dir * default to zebra.cfg, if no name is given */ ZebraService tl_start_up(char *cfgname, int argc, char **argv) @@ -81,8 +58,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 +92,6 @@ int tl_close_down(ZebraHandle zh, ZebraService zs) if (zs) zebra_stop(zs); - nmem_exit(); xmalloc_trav("x"); return 1; } @@ -136,7 +110,7 @@ int tl_init_data(ZebraHandle zh, const char **recs) yaz_log(log_level, "going to call init"); res = zebra_init(zh); - if (res == ZEBRA_FAIL) + if (res == ZEBRA_FAIL) { yaz_log(log_level, "init_data: zebra_init failed with %d", res); printf("init_data failed with %d\n", res); @@ -218,16 +192,16 @@ int tl_query_x(ZebraHandle zh, const char *query, zint exphits, int experror) if (rc == ZEBRA_FAIL) { int code = zebra_errCode(zh); yaz_log(log_level, "search returned %d. Code %d", rc, code); - - printf("Error: search returned %d. Code %d\n%s\n", rc, + + printf("Error: search returned %d. Code %d\n%s\n", rc, code, query); return 0; } if (exphits != -1 && hits != exphits) { - yaz_log(log_level, "search returned " ZINT_FORMAT + yaz_log(log_level, "search returned " ZINT_FORMAT " hits instead of " ZINT_FORMAT, hits, exphits); - printf("Error: search returned " ZINT_FORMAT + printf("Error: search returned " ZINT_FORMAT " hits instead of " ZINT_FORMAT "\n%s\n", hits, exphits, query); return 0; @@ -256,7 +230,7 @@ int tl_scan(ZebraHandle zh, const char *query, yaz_log(log_level, "======================================"); yaz_log(log_level, "scan: pos=%d num=%d %s", pos, num, query); - res = zebra_scan_PQF(zh, odr, query, &pos, &num, &entries, &partial, + res = zebra_scan_PQF(zh, odr, query, &pos, &num, &entries, &partial, 0 /* setname */); if (partial == -123) @@ -325,11 +299,11 @@ int tl_scan(ZebraHandle zh, const char *query, return ret; } -/** - * makes a query, checks number of hits, and for the first hit, that +/** + * makes a query, checks number of hits, and for the first hit, that * it contains the given string, and that it gets the right score */ -int tl_ranking_query(ZebraHandle zh, char *query, +int tl_ranking_query(ZebraHandle zh, char *query, int exphits, char *firstrec, int firstscore) { ZebraRetrievalRecord retrievalRecord[10]; @@ -338,16 +312,16 @@ int tl_ranking_query(ZebraHandle zh, char *query, int rc; int i; int ret = 1; - + if (!tl_query(zh, query, exphits)) return 0; for (i = 0; i<10; i++) retrievalRecord[i].position = i+1; - odr_output = odr_createmem(ODR_ENCODE); + 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)) @@ -374,16 +348,16 @@ int tl_meta_query(ZebraHandle zh, char *query, int exphits, const char *setname= "rsetname"; zint *positions = 0; int i, ret = 1; - + if (!tl_query(zh, query, exphits)) return 0; - + positions = (zint *) xmalloc(1 + (exphits * sizeof(zint))); for (i = 0; imem); + 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