X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=test%2Fapi%2Ftestlib.c;h=e960d0d0d7a2708740e6c1aa99edee25531b4495;hp=b9c1b1eff585912e944075f3d88a7b76ef88915b;hb=0ad2ccc469f9a06aa330f27f6810140ae33e76ec;hpb=39cb125e7755c6058a93dada8d5172804213cf8e diff --git a/test/api/testlib.c b/test/api/testlib.c index b9c1b1e..e960d0d 100644 --- a/test/api/testlib.c +++ b/test/api/testlib.c @@ -1,6 +1,6 @@ -/* $Id: testlib.c,v 1.6 2004-11-29 21:55:28 adam Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 - Index Data Aps +/* $Id: testlib.c,v 1.19 2005-05-09 12:03:59 adam Exp $ + Copyright (C) 1995-2005 + Index Data ApS This file is part of the Zebra server. @@ -23,6 +23,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA /** testlib - utilities for the api tests */ #include +#include #include #include #include "testlib.h" @@ -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) { @@ -110,68 +120,166 @@ 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 returned %d", i); if (i) { printf("init failed with %d\n",i); zebra_result(zh, &i, &addinfo); - printf(" Error %d %s\n",i,addinfo); + printf(" Error %d %s\n", i, addinfo); exit(1); } if (recs) { zebra_begin_trans (zh, 1); for (i = 0; recs[i]; i++) - zebra_add_record (zh, recs[i], strlen(recs[i])); - zebra_end_trans (zh); - zebra_commit (zh); + zebra_add_record(zh, recs[i], strlen(recs[i])); + zebra_end_trans(zh); + zebra_commit(zh); } } -int do_query(int lineno, ZebraHandle zh, char *query, int exphits) +int do_query_x(int lineno, ZebraHandle zh, const char *query, zint exphits, + int experror) { ODR odr; YAZ_PQF_Parser parser; Z_RPNQuery *rpn; const char *setname="rsetname"; - int hits; - int rc; - + zint hits; + ZEBRA_RES rc; - yaz_log(log_level,"======================================"); - yaz_log(log_level,"qry[%d]: %s", lineno, query); - odr=odr_createmem (ODR_DECODE); + yaz_log(log_level, "======================================"); + yaz_log(log_level, "qry[%d]: %s", lineno, query); + odr = odr_createmem (ODR_DECODE); parser = yaz_pqf_create(); rpn = yaz_pqf_parse(parser, odr, query); + yaz_pqf_destroy(parser); if (!rpn) { - printf("Error: Parse failed \n%s\n",query); + printf("Error: Parse failed \n%s\n", query); exit(1); } - rc = zebra_search_RPN (zh, odr, rpn, setname, &hits); - if (rc) { - printf("Error: search returned %d \n%s\n",rc,query); - exit (1); + rc = zebra_search_RPN(zh, odr, rpn, setname, &hits); + if (experror) + { + int code; + if (rc != ZEBRA_FAIL) + { + printf("Error: search returned %d (OK), but error was expected\n" + "%s\n", rc, query); + exit(1); + } + code = zebra_errCode(zh); + if (code != experror) + { + printf("Error: search returned error code %d, but error %d was " + "expected\n%s\n", + code, experror, query); + exit(1); + } } - - if (hits != exphits) { - printf("Error: search returned %d hits instead of %d\n", - hits, exphits); - exit (1); + else + { + if (rc == ZEBRA_FAIL) { + int code = zebra_errCode(zh); + printf("Error: search returned %d. Code %d\n%s\n", rc, + code, query); + exit (1); + } + if (exphits != -1 && hits != exphits) { + printf("Error: search returned " ZINT_FORMAT + " hits instead of " ZINT_FORMAT "\n%s\n", + hits, exphits, query); + exit (1); + } } - yaz_pqf_destroy(parser); odr_destroy (odr); return hits; } +int do_query(int lineno, ZebraHandle zh, const char *query, zint exphits) +{ + return do_query_x(lineno, zh, query, exphits, 0); +} + +void do_scan(int lineno, ZebraHandle zh, const char *query, + int pos, int num, + int exp_pos, int exp_num, int exp_partial, + const char **exp_entries) +{ + ODR odr = odr_createmem(ODR_ENCODE); + ZebraScanEntry *entries = 0; + int partial = -123; + ZEBRA_RES res; + + 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); + if (res != ZEBRA_OK) + { + printf("Error: scan returned %d (FAIL), but no error was expected\n" + "%s\n", res, query); + exit(1); + } + else + { + int fails = 0; + if (partial == -123) + { + printf("Error: scan returned OK, but partial was not set\n" + "%s\n", query); + fails++; + } + if (partial != exp_partial) + { + printf("Error: scan returned OK, with partial/expected %d/%d\n" + "%s\n", partial, exp_partial, query); + fails++; + } + if (num != exp_num) + { + printf("Error: scan returned OK, with num/expected %d/%d\n" + "%s\n", num, exp_num, query); + fails++; + } + if (pos != exp_pos) + { + printf("Error: scan returned OK, with pos/expected %d/%d\n" + "%s\n", pos, exp_pos, query); + fails++; + } + if (fails) + exit(1); + fails = 0; + if (exp_entries) + { + int i; + for (i = 0; iname, name)) + f->occurred = 1; +} + +void check_filter(ZebraService zs, const char *name) +{ + struct finfo f; + + f.name = name; + f.occurred = 0; + zebra_filter_info(zs, &f, filter_cb); + if (!f.occurred) + { + yaz_log(YLOG_WARN, "Filter %s does not exist.", name); + exit(0); + } +} + + + +