-/* $Id: testlib.c,v 1.35 2006-08-14 10:40:22 adam Exp $
- Copyright (C) 1995-2006
+/* $Id: testlib.c,v 1.43 2007-04-16 08:44:32 adam Exp $
+ Copyright (C) 1995-2007
Index Data ApS
This file is part of the Zebra server.
#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 */
+int log_level = YLOG_LOG;
-void tl_start_log(int argc, char **argv)
-{
- int cmd_level = 0;
- 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]);
- yaz_log_init_level(YLOG_DEFAULT_LEVEL | log_level | cmd_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
#endif
#endif
nmem_init();
- tl_start_log(argc, argv);
return tl_zebra_start(cfgname);
}
/**
* get_srcdir: return env srcdir or . (if does does not exist)
*/
-const char *tl_get_srcdir()
+const char *tl_get_srcdir(void)
{
const char *srcdir = getenv("srcdir");
if (!srcdir || ! *srcdir)
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);
}
rc = zebra_search_RPN(zh, odr, rpn, setname, &hits);
+ odr_destroy(odr);
if (experror)
{
int code;
return 0;
}
}
- odr_destroy(odr);
return 1;
}
int exp_pos, int exp_num, int exp_partial,
const char **exp_entries)
{
+ int ret = 1;
ODR odr = odr_createmem(ODR_ENCODE);
ZebraScanEntry *entries = 0;
int partial = -123;
res = zebra_scan_PQF(zh, odr, query, &pos, &num, &entries, &partial,
0 /* setname */);
- if (res != ZEBRA_OK)
+
+ if (partial == -123)
{
- printf("Error: scan returned %d (FAIL), but no error was expected\n"
- "%s\n", res, query);
- return 0;
+ printf("Error: scan returned OK, but partial was not set\n"
+ "%s\n", query);
+ ret = 0;
+ }
+ if (partial != exp_partial)
+ {
+ printf("Error: scan OK, with partial/expected %d/%d\n",
+ partial, exp_partial);
+ ret = 0;
+ }
+ if (res != ZEBRA_OK) /* failure */
+ {
+ if (exp_entries)
+ {
+ printf("Error: scan failed, but no error was expected\n");
+ ret = 0;
+ }
}
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)
- return 0;
- fails = 0;
- if (exp_entries)
- {
- int i;
- for (i = 0; i<num; i++)
- {
- if (strcmp(exp_entries[i], entries[i].term))
- {
- printf("Error: scan OK, but entry %d term/exp %s/%s\n"
- "%s\n",
- i, entries[i].term, exp_entries[i], query);
- fails++;
- }
- }
- }
- if (fails)
- return 0;
+ if (!exp_entries)
+ {
+ printf("Error: scan OK, but error was expected\n");
+ ret = 0;
+ }
+ else
+ {
+ int fails = 0;
+ if (num != exp_num)
+ {
+ printf("Error: scan OK, with num/expected %d/%d\n",
+ num, exp_num);
+ fails++;
+ }
+ if (pos != exp_pos)
+ {
+ printf("Error: scan OK, with pos/expected %d/%d\n",
+ pos, exp_pos);
+ fails++;
+ }
+ if (!fails)
+ {
+ if (exp_entries)
+ {
+ int i;
+ for (i = 0; i<num; i++)
+ {
+ if (strcmp(exp_entries[i], entries[i].term))
+ {
+ printf("Error: scan OK of %s, no %d got=%s exp=%s\n",
+ query, i, entries[i].term, exp_entries[i]);
+ fails++;
+ }
+ }
+ }
+ }
+ if (fails)
+ ret = 0;
+ }
}
odr_destroy(odr);
- return 1;
+ return ret;
}
/**
int exphits, char *firstrec, int firstscore)
{
ZebraRetrievalRecord retrievalRecord[10];
- ODR odr_output = odr_createmem (ODR_ENCODE);
- const char *setname="rsetname";
+ ODR odr_output = 0;
+ const char *setname = "rsetname";
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;
- rc = zebra_records_retrieve (zh, odr_output, setname, 0,
- VAL_TEXT_XML, exphits, retrievalRecord);
+ odr_output = odr_createmem(ODR_ENCODE);
+ rc = zebra_records_retrieve(zh, odr_output, setname, 0,
+ yaz_oid_xml(), exphits, retrievalRecord);
if (rc != ZEBRA_OK)
- return 0;
-
- if (!strstr(retrievalRecord[0].buf, firstrec))
+ ret = 0;
+ else if (!strstr(retrievalRecord[0].buf, firstrec))
{
printf("Error: Got the wrong record first\n");
printf("Expected '%s' but got\n", firstrec);
printf("%.*s\n", retrievalRecord[0].len, retrievalRecord[0].buf);
- return 0;
+ ret = 0;
}
-
- if (retrievalRecord[0].score != firstscore)
+ else if (retrievalRecord[0].score != firstscore)
{
printf("Error: first rec got score %d instead of %d\n",
retrievalRecord[0].score, firstscore);
- return 0;
+ ret = 0;
}
odr_destroy (odr_output);
- return 1;
+ return ret;
}
int tl_meta_query(ZebraHandle zh, char *query, int exphits,
zint *ids)
{
ZebraMetaRecord *meta;
- ODR odr_output = odr_createmem (ODR_ENCODE);
- const char *setname="rsetname";
- zint *positions = (zint *) malloc(1 + (exphits * sizeof(zint)));
- int i;
+ 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; i<exphits; i++)
positions[i] = i+1;
- meta = zebra_meta_records_create (zh, setname, exphits, positions);
+ meta = zebra_meta_records_create(zh, setname, exphits, positions);
if (!meta)
{
printf("Error: retrieve returned error\n%s\n", query);
+ xfree(positions);
return 0;
}
{
printf("Expected id=" ZINT_FORMAT " but got id=" ZINT_FORMAT "\n",
ids[i], meta[i].sysno);
- return 0;
+ ret = 0;
}
}
zebra_meta_records_destroy(zh, meta, exphits);
- odr_destroy (odr_output);
- free(positions);
- return 1;
+ xfree(positions);
+ return ret;
}
int tl_sort(ZebraHandle zh, const char *query, zint hits, zint *exp)
projects / idzebra-moved-to-github.git / blobdiff