projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libyaz does not depend on readline; yaz does (programs)
[yaz-moved-to-github.git]
/
ztest
/
ztest.c
diff --git
a/ztest/ztest.c
b/ztest/ztest.c
index
a021b64
..
c7e0679
100644
(file)
--- a/
ztest/ztest.c
+++ b/
ztest/ztest.c
@@
-1,8
+1,8
@@
/*
/*
- * Copyright (c) 1995-2002, Index Data.
+ * Copyright (c) 1995-2003, Index Data.
* See the file LICENSE for details.
*
* See the file LICENSE for details.
*
- * $Id: ztest.c,v 1.52 2002-03-18 21:33:48 adam Exp $
+ * $Id: ztest.c,v 1.57 2003-03-24 22:26:51 adam Exp $
*/
/*
*/
/*
@@
-13,12
+13,9
@@
#include <stdlib.h>
#include <ctype.h>
#include <stdlib.h>
#include <ctype.h>
+#include <yaz/yaz-util.h>
#include <yaz/backend.h>
#include <yaz/backend.h>
-#include <yaz/log.h>
-
-#if YAZ_MODULE_ill
#include <yaz/ill.h>
#include <yaz/ill.h>
-#endif
Z_GenericRecord *dummy_grs_record (int num, ODR o);
char *dummy_marc_record (int num, ODR odr);
Z_GenericRecord *dummy_grs_record (int num, ODR o);
char *dummy_marc_record (int num, ODR odr);
@@
-37,7
+34,7
@@
int ztest_search (void *handle, bend_search_rr *rr)
rr->errcode = 23;
return 0;
}
rr->errcode = 23;
return 0;
}
- if (strcmp (rr->basenames[0], "Default"))
+ if (yaz_matchstr (rr->basenames[0], "Default"))
{
rr->errcode = 109;
rr->errstring = rr->basenames[0];
{
rr->errcode = 109;
rr->errstring = rr->basenames[0];
@@
-99,7
+96,6
@@
int ztest_esrequest (void *handle, bend_esrequest_rr *rr)
yaz_log(LOG_LOG, "setId: %s", n->resultSetItem->resultSetId);
yaz_log(LOG_LOG, "item: %d", *n->resultSetItem->item);
}
yaz_log(LOG_LOG, "setId: %s", n->resultSetItem->resultSetId);
yaz_log(LOG_LOG, "item: %d", *n->resultSetItem->item);
}
-#if YAZ_MODULE_ill
if (n->itemRequest)
{
Z_External *r = (Z_External*) n->itemRequest;
if (n->itemRequest)
{
Z_External *r = (Z_External*) n->itemRequest;
@@
-177,7
+173,6
@@
int ztest_esrequest (void *handle, bend_esrequest_rr *rr)
*item_req->protocol_version_num);
}
}
*item_req->protocol_version_num);
}
}
-#endif
if (k)
{
if (k)
{
@@
-601,9
+596,21
@@
int ztest_scan(void *handle, bend_scan_rr *q)
return 0;
}
return 0;
}
+static int ztest_explain(void *handle, bend_explain_rr *rr)
+{
+ rr->explain_buf = "<explain>\n"
+ "\t<serverInfo>\n"
+ "\t\t<host>localhost</host>\n"
+ "\t\t<port>210</port>\n"
+ "\t</serverInfo>\n"
+ "</explain>\n";
+ return 0;
+}
+
bend_initresult *bend_init(bend_initrequest *q)
{
bend_initresult *bend_init(bend_initrequest *q)
{
- bend_initresult *r = (bend_initresult *) odr_malloc (q->stream, sizeof(*r));
+ bend_initresult *r = (bend_initresult *)
+ odr_malloc (q->stream, sizeof(*r));
int *counter = (int *) xmalloc (sizeof(int));
*counter = 0;
int *counter = (int *) xmalloc (sizeof(int));
*counter = 0;
@@
-617,6
+624,7
@@
bend_initresult *bend_init(bend_initrequest *q)
q->bend_delete = ztest_delete;
q->bend_fetch = ztest_fetch;
q->bend_scan = ztest_scan;
q->bend_delete = ztest_delete;
q->bend_fetch = ztest_fetch;
q->bend_scan = ztest_scan;
+ q->bend_explain = ztest_explain;
return r;
}
return r;
}