X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ftestlib.c;h=1626a61c53f6f51b8ae2cce665c666deaba56eca;hb=4ee6ccf56b9e212a64894ceb919da35a5e94f2a9;hp=ba28301a92f7f60c1d4dd440a52dd96f28f493cd;hpb=a5b3cefa3cf58a5fe2de76b4f0e36210edc8f091;p=idzebra-moved-to-github.git diff --git a/test/api/testlib.c b/test/api/testlib.c index ba28301..1626a61 100644 --- a/test/api/testlib.c +++ b/test/api/testlib.c @@ -1,4 +1,4 @@ -/* $Id: testlib.c,v 1.17 2005-05-03 09:07:17 adam Exp $ +/* $Id: testlib.c,v 1.28 2005-11-09 12:01:09 adam Exp $ Copyright (C) 1995-2005 Index Data ApS @@ -22,6 +22,16 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA /** testlib - utilities for the api tests */ +#if HAVE_SYS_TIME_H +#include +#endif +#if HAVE_SYS_RESOURCE_H +#include +#endif +#if HAVE_UNISTD_H +#include +#endif + #include #include #include @@ -34,6 +44,7 @@ int log_level=0; /* not static, t*.c may use it */ void start_log(int argc, char **argv) { + int cmd_level = 0; char logname[2048]; if (!argv) return; @@ -41,9 +52,11 @@ void start_log(int argc, char **argv) return; sprintf(logname, "%s.log", argv[0]); yaz_log_init_file(logname); - 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]); + log_level = yaz_log_mask_str_x(argv[0], 0); + if (argc >= 2) + cmd_level |= yaz_log_mask_str_x(argv[1], 0); + yaz_log_init_level(YLOG_DEFAULT_LEVEL | log_level | cmd_level); + yaz_log(log_level, "starting %s", argv[0]); } /** @@ -56,6 +69,14 @@ void start_log(int argc, char **argv) */ ZebraService start_up(char *cfgname, int argc, char **argv) { +#if HAVE_SYS_RESOURCE_H +#if HAVE_SYS_TIME_H + struct rlimit rlim; + rlim.rlim_cur = 20; + rlim.rlim_max = 20; + setrlimit(RLIMIT_CPU, &rlim); +#endif +#endif nmem_init(); start_log(argc, argv); return start_service(cfgname); @@ -73,7 +94,7 @@ const char *get_srcdir() } /** start_service - do a zebra_start with a decent config name */ -ZebraService start_service(char *cfgname) +ZebraService start_service(const char *cfgname) { char cfg[256]; const char *srcdir = get_srcdir(); @@ -82,7 +103,7 @@ ZebraService start_service(char *cfgname) cfgname="zebra.cfg"; sprintf(cfg, "%.200s/%.50s", srcdir, cfgname); - zs=zebra_start(cfg); + zs = zebra_start(cfg); if (!zs) { printf("zebra_start failed, probably because missing config file \n" @@ -120,11 +141,13 @@ void init_data(ZebraHandle zh, const char **recs) zebra_select_database(zh, "Default"); yaz_log(log_level, "going to call init"); i = zebra_init(zh); - yaz_log(log_level, "init returned %d", i); + yaz_log(log_level, "init_data returned %d", i); if (i) { - printf("init failed with %d\n",i); + yaz_log(log_level, "init_data: zebra_init failed with %d", i); + printf("init_data failed with %d\n", i); zebra_result(zh, &i, &addinfo); + yaz_log(log_level, "Error %d %s", i, addinfo); printf(" Error %d %s\n", i, addinfo); exit(1); } @@ -139,8 +162,8 @@ void init_data(ZebraHandle zh, const char **recs) } -int do_query_x(int lineno, ZebraHandle zh, char *query, int exphits, - int experror) +int do_query_x(int lineno, ZebraHandle zh, const char *query, zint exphits, + int experror) { ODR odr; YAZ_PQF_Parser parser; @@ -157,21 +180,27 @@ int do_query_x(int lineno, ZebraHandle zh, char *query, int exphits, rpn = yaz_pqf_parse(parser, odr, query); yaz_pqf_destroy(parser); if (!rpn) { + yaz_log(log_level, "PQF Parse failed\n"); printf("Error: Parse failed \n%s\n", query); exit(1); } rc = zebra_search_RPN(zh, odr, rpn, setname, &hits); if (experror) { + int code; if (rc != ZEBRA_FAIL) { + yaz_log(log_level, "search returned %d (OK), but error was " + "expected", rc); printf("Error: search returned %d (OK), but error was expected\n" "%s\n", rc, query); exit(1); } - int code = zebra_errCode(zh); + code = zebra_errCode(zh); if (code != experror) { + yaz_log(log_level, "search returned error code %d, but error %d " + "was expected", code, experror); printf("Error: search returned error code %d, but error %d was " "expected\n%s\n", code, experror, query); @@ -182,13 +211,18 @@ int do_query_x(int lineno, ZebraHandle zh, char *query, int exphits, { 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, code, query); exit (1); } - if (exphits != -1 && hits != exphits) { + if (exphits != -1 && hits != exphits) + { + yaz_log(log_level, "search returned " ZINT_FORMAT + " hits instead of " ZINT_FORMAT, hits, exphits); printf("Error: search returned " ZINT_FORMAT - " hits instead of %d\n%s\n", + " hits instead of " ZINT_FORMAT "\n%s\n", hits, exphits, query); exit (1); } @@ -198,7 +232,7 @@ int do_query_x(int lineno, ZebraHandle zh, char *query, int exphits, } -int do_query(int lineno, ZebraHandle zh, char *query, int exphits) +int do_query(int lineno, ZebraHandle zh, const char *query, zint exphits) { return do_query_x(lineno, zh, query, exphits, 0); } @@ -216,7 +250,8 @@ void do_scan(int lineno, ZebraHandle zh, const char *query, yaz_log(log_level, "======================================"); yaz_log(log_level, "scan[%d]: pos=%d num=%d %s", lineno, 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 (res != ZEBRA_OK) { printf("Error: scan returned %d (FAIL), but no error was expected\n" @@ -355,6 +390,51 @@ void meta_query(int lineno, ZebraHandle zh, char *query, int exphits, free(positions); } +void do_sort(ZebraHandle zh, const char *query, zint hits, zint *exp) +{ + ZebraMetaRecord *recs; + zint i; + int errs = 0; + zint min_val_recs = 0; + zint min_val_exp = 0; + + assert(query); + do_query(__LINE__, zh, query, hits); + + recs = zebra_meta_records_create_range (zh, "rsetname", 1, 4); + if (!recs) + { + fprintf(stderr, "recs==0\n"); + exit(1); + } + /* find min for each sequence to get proper base offset */ + for (i = 0; i