X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=9e4543cde88ddaf1f137415b37aaba767fcda639;hb=d0fa45cf0b317b7332a097928dc3c8827536a97d;hp=e3115d69352be3324159a9c6564567eb1330f137;hpb=0df6c383d656dba662eb9d9acafed01a0973fcff;p=idzebra-moved-to-github.git diff --git a/index/zserver.c b/index/zserver.c index e3115d6..9e4543c 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -4,7 +4,17 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: zserver.c,v $ - * Revision 1.63 1998-09-02 13:53:21 adam + * Revision 1.66 1998-10-28 10:54:41 adam + * SDRKit integration. + * + * Revision 1.65 1998/10/18 07:54:54 adam + * Additional info added for diagnostics 114 (Unsupported use attribute) and + * 121 (Unsupported attribute set). + * + * Revision 1.64 1998/09/22 10:48:21 adam + * Minor changes in search API. + * + * Revision 1.63 1998/09/02 13:53:21 adam * Extra parameter decode added to search routines to implement * persistent queries. * @@ -245,6 +255,13 @@ #include "zserver.h" +#ifndef ZEBRASDR +#define ZEBRASDR 0 +#endif +#if ZEBRASDR +#include "zebrasdr.h" +#endif + static int bend_sort (void *handle, bend_sort_rr *rr); bend_initresult *bend_init (bend_initrequest *q) @@ -307,12 +324,16 @@ bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd) switch (q->query->which) { case Z_Query_type_1: case Z_Query_type_101: - zebra_search_rpn (zh, q->stream, q->decode, q->query->u.type_1, + zebra_search_rpn (zh, q->decode, q->stream, q->query->u.type_1, q->num_bases, q->basenames, q->setname); r->errcode = zh->errCode; r->errstring = zh->errString; r->hits = zh->hits; break; + case Z_Query_type_2: + r->errcode = 107; + r->errstring = "type-2"; + break; default: r->errcode = 107; } @@ -430,5 +451,8 @@ int main (int argc, char **argv) #endif statserv_setcontrol (sob); +#if ZEBRASDR + zebraSdr_std (); +#endif return statserv_main (argc, argv); }