projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added support for temr hit counts. This was not in place for earlier
[idzebra-moved-to-github.git]
/
test
/
api
/
testlib.c
diff --git
a/test/api/testlib.c
b/test/api/testlib.c
index
8a32b05
..
c0a495b
100644
(file)
--- a/
test/api/testlib.c
+++ b/
test/api/testlib.c
@@
-1,4
+1,4
@@
-/* $Id: testlib.c,v 1.16 2005-05-02 09:05:22 adam Exp $
+/* $Id: testlib.c,v 1.20 2005-05-24 11:27:48 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
Copyright (C) 1995-2005
Index Data ApS
@@
-41,9
+41,11
@@
void start_log(int argc, char **argv)
return;
sprintf(logname, "%s.log", argv[0]);
yaz_log_init_file(logname);
return;
sprintf(logname, "%s.log", argv[0]);
yaz_log_init_file(logname);
- log_level = yaz_log_mask_str_x(argv[0],0);
+ log_level = yaz_log_mask_str_x(argv[0], 0);
+ if (argc >= 2)
+ log_level |= yaz_log_mask_str_x(argv[1], 0);
yaz_log_init_level(YLOG_DEFAULT_LEVEL | log_level);
yaz_log_init_level(YLOG_DEFAULT_LEVEL | log_level);
- yaz_log(log_level,"starting %s",argv[0]);
+ yaz_log(log_level, "starting %s", argv[0]);
}
/**
}
/**
@@
-139,8
+141,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;
{
ODR odr;
YAZ_PQF_Parser parser;
@@
-163,13
+165,14
@@
int do_query_x(int lineno, ZebraHandle zh, char *query, int exphits,
rc = zebra_search_RPN(zh, odr, rpn, setname, &hits);
if (experror)
{
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);
}
if (rc != ZEBRA_FAIL)
{
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)
{
printf("Error: search returned error code %d, but error %d was "
if (code != experror)
{
printf("Error: search returned error code %d, but error %d was "
@@
-188,7
+191,7
@@
int do_query_x(int lineno, ZebraHandle zh, char *query, int exphits,
}
if (exphits != -1 && hits != exphits) {
printf("Error: search returned " ZINT_FORMAT
}
if (exphits != -1 && 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);
}
hits, exphits, query);
exit (1);
}
@@
-198,7
+201,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);
}
{
return do_query_x(lineno, zh, query, exphits, 0);
}
@@
-304,7
+307,7
@@
void ranking_query(int lineno, ZebraHandle zh, char *query,
if (!strstr(retrievalRecord[0].buf, firstrec))
{
printf("Error: Got the wrong record first\n");
if (!strstr(retrievalRecord[0].buf, firstrec))
{
printf("Error: Got the wrong record first\n");
- printf("Expected '%s' but got \n", firstrec);
+ printf("Expected '%s' but got\n", firstrec);
printf("%.*s\n", retrievalRecord[0].len, retrievalRecord[0].buf);
exit(1);
}
printf("%.*s\n", retrievalRecord[0].len, retrievalRecord[0].buf);
exit(1);
}
@@
-345,7
+348,7
@@
void meta_query(int lineno, ZebraHandle zh, char *query, int exphits,
{
if (meta[i].sysno != ids[i])
{
{
if (meta[i].sysno != ids[i])
{
- printf("Expected id=" ZINT_FORMAT " but got id=" ZINT_FORMAT,
+ printf("Expected id=" ZINT_FORMAT " but got id=" ZINT_FORMAT "\n",
ids[i], meta[i].sysno);
exit(1);
}
ids[i], meta[i].sysno);
exit(1);
}