X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzserver.c;h=3b060d55c1aede91fab6dfa36dce23b946bbe2b8;hp=fb72949506703ecb95e60db45e3cd6a40a54d54d;hb=e150e51a7e20a902e9fd2f11f00811f94f67d529;hpb=beda7a0a471cf2c19abb42dd9d1dad0d2aa28069 diff --git a/index/zserver.c b/index/zserver.c index fb72949..3b060d5 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -1,10 +1,49 @@ /* - * Copyright (C) 1995-1998, Index Data I/S + * Copyright (C) 1995-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: zserver.c,v $ - * Revision 1.62 1998-08-06 14:35:28 adam + * Revision 1.75 1999-11-30 13:48:04 adam + * Improved installation. Updated for inclusion of YAZ header files. + * + * Revision 1.74 1999/11/29 15:13:26 adam + * Server sets implementationName - and Version. + * + * Revision 1.73 1999/11/04 15:00:45 adam + * Implemented delete result set(s). + * + * Revision 1.71 1999/07/14 10:59:26 adam + * Changed functions isc_getmethod, isams_getmethod. + * Improved fatal error handling (such as missing EXPLAIN schema). + * + * Revision 1.70 1999/06/10 12:14:56 adam + * Fixed to use bend_start instead of pre_init. + * + * Revision 1.69 1999/06/10 09:20:03 adam + * Minor change to pre_init handler. + * + * Revision 1.68 1999/05/26 07:49:13 adam + * C++ compilation. + * + * Revision 1.67 1999/02/02 14:51:14 adam + * Updated WIN32 code specific sections. Changed header. + * + * 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. + * + * Revision 1.62 1998/08/06 14:35:28 adam * Routine bend_deleterequest removed. * * Revision 1.61 1998/06/24 12:16:15 adam @@ -229,23 +268,31 @@ #include #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #include #else #include #endif -#include -#include +#include #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); +static int bend_delete (void *handle, bend_delete_rr *rr); bend_initresult *bend_init (bend_initrequest *q) { - bend_initresult *r = odr_malloc (q->stream, sizeof(*r)); + bend_initresult *r = (bend_initresult *) + odr_malloc (q->stream, sizeof(*r)); ZebraHandle zh; struct statserv_options_block *sob; char *user = NULL; @@ -254,6 +301,10 @@ bend_initresult *bend_init (bend_initrequest *q) r->errcode = 0; r->errstring = 0; q->bend_sort = bend_sort; + q->bend_delete = bend_delete; + + q->implementation_name = "Z'mbol Information Server"; + q->implementation_version = "Z'mbol 1.0"; logf (LOG_DEBUG, "bend_init"); @@ -292,8 +343,9 @@ bend_initresult *bend_init (bend_initrequest *q) bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd) { - ZebraHandle zh = handle; - bend_searchresult *r = odr_malloc (q->stream, sizeof(*r)); + ZebraHandle zh = (ZebraHandle) handle; + bend_searchresult *r = (bend_searchresult *) + odr_malloc (q->stream, sizeof(*r)); r->hits = 0; r->errcode = 0; @@ -303,12 +355,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->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; } @@ -317,8 +373,9 @@ bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd) bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num) { - ZebraHandle zh = handle; - bend_fetchresult *r = odr_malloc (q->stream, sizeof(*r)); + ZebraHandle zh = (ZebraHandle) handle; + bend_fetchresult *r = (bend_fetchresult *) + odr_malloc (q->stream, sizeof(*r)); ZebraRetrievalRecord retrievalRecord; retrievalRecord.position = q->number; @@ -352,14 +409,16 @@ bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num) bend_scanresult *bend_scan (void *handle, bend_scanrequest *q, int *num) { ZebraScanEntry *entries; - ZebraHandle zh = handle; - bend_scanresult *r = odr_malloc (q->stream, sizeof(*r)); + ZebraHandle zh = (ZebraHandle) handle; + bend_scanresult *r = (bend_scanresult *) + odr_malloc (q->stream, sizeof(*r)); int is_partial, i; r->term_position = q->term_position; r->num_entries = q->num_entries; - r->entries = odr_malloc (q->stream, sizeof(*r->entries) * q->num_entries); + r->entries = (struct scan_entry *) + odr_malloc (q->stream, sizeof(*r->entries) * q->num_entries); zebra_scan (zh, q->stream, q->term, q->attributeset, q->num_bases, q->basenames, @@ -386,7 +445,7 @@ void bend_close (void *handle) int bend_sort (void *handle, bend_sort_rr *rr) { - ZebraHandle zh = handle; + ZebraHandle zh = (ZebraHandle) handle; zebra_sort (zh, rr->stream, rr->num_input_setnames, (const char **) rr->input_setnames, @@ -396,21 +455,33 @@ int bend_sort (void *handle, bend_sort_rr *rr) return 0; } -#ifndef WINDOWS -static void pre_init (struct statserv_options_block *sob) +int bend_delete (void *handle, bend_delete_rr *rr) { - char *pidfile = "zebrasrv.pid"; - int fd = creat (pidfile, 0666); - - if (fd == -1) - logf (LOG_WARN|LOG_ERRNO, "creat %s", pidfile); - else + ZebraHandle zh = (ZebraHandle) handle; + + rr->delete_status = zebra_deleleResultSet(zh, rr->function, + rr->num_setnames, rr->setnames, + rr->statuses); + return 0; +} + +#ifndef WIN32 +static void bend_start (struct statserv_options_block *sob) +{ + if (!sob->inetd) { - char pidstr[30]; + char *pidfile = "zebrasrv.pid"; + int fd = creat (pidfile, 0666); + if (fd == -1) + logf (LOG_WARN|LOG_ERRNO, "creat %s", pidfile); + else + { + char pidstr[30]; - sprintf (pidstr, "%ld", (long) getpid ()); - write (fd, pidstr, strlen(pidstr)); - close (fd); + sprintf (pidstr, "%ld", (long) getpid ()); + write (fd, pidstr, strlen(pidstr)); + close (fd); + } } } #endif @@ -421,10 +492,13 @@ int main (int argc, char **argv) sob = statserv_getcontrol (); strcpy (sob->configname, FNAME_CONFIG); -#ifndef WINDOWS - sob->pre_init = pre_init; +#ifndef WIN32 + sob->bend_start = bend_start; #endif statserv_setcontrol (sob); +#if ZEBRASDR + zebraSdr_std (); +#endif return statserv_main (argc, argv); }