X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=e78e8711f34554a1b5947282eec63eb1f3f44605;hb=3726bf6622da6a8b983bb4cbb7d654e84c3216d7;hp=a6ecfd3bb6566a4d1998af25158bb3370485d0a0;hpb=ce3907338568fce46c5751e7e1091a5ad1c8e291;p=idzebra-moved-to-github.git diff --git a/index/zserver.c b/index/zserver.c index a6ecfd3..e78e871 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -1,10 +1,60 @@ /* - * 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.56 1998-03-05 08:45:13 adam + * 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 + * Support for relations on text operands. Open range support in + * DFA module (i.e. [-j], [g-]). + * + * Revision 1.60 1998/06/22 11:36:49 adam + * Added authentication check facility to zebra. + * + * Revision 1.59 1998/06/12 12:22:13 adam + * Work on Zebra API. + * + * Revision 1.58 1998/05/27 16:57:46 adam + * Zebra returns surrogate diagnostic for single records when + * appropriate. + * + * Revision 1.57 1998/04/03 14:45:18 adam + * Fixed setting of last_in_set in bend_fetch. + * + * Revision 1.56 1998/03/05 08:45:13 adam * New result set model and modular ranking system. Moved towards * descent server API. System information stored as "SGML" records. * @@ -209,7 +259,7 @@ #include #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #include #else @@ -217,17 +267,26 @@ #endif #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); 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; + char *passwd = NULL; r->errcode = 0; r->errstring = 0; @@ -236,20 +295,43 @@ bend_initresult *bend_init (bend_initrequest *q) logf (LOG_DEBUG, "bend_init"); sob = statserv_getcontrol (); - if (!(zh = zebra_open (NULL, sob->configname))) + if (!(zh = zebra_open (sob->configname))) { logf (LOG_FATAL, "Failed to open Zebra `%s'", sob->configname); r->errcode = 1; return r; } + if (q->auth) + { + if (q->auth->which == Z_IdAuthentication_open) + { + char *openpass = xstrdup (q->auth->u.open); + char *cp = strchr (openpass, '/'); + if (cp) + { + *cp = '\0'; + user = nmem_strdup (odr_getmem (q->stream), openpass); + passwd = nmem_strdup (odr_getmem (q->stream), cp+1); + } + xfree (openpass); + } + } + if (zebra_auth (zh, user, passwd)) + { + r->errcode = 222; + r->errstring = user; + zebra_close (zh); + return r; + } r->handle = zh; return r; } 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; @@ -259,12 +341,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; } @@ -273,21 +359,29 @@ 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; + r->last_in_set = 0; zebra_records_retrieve (zh, q->stream, q->setname, q->comp, q->format, 1, &retrievalRecord); - - if (zh->errCode) + if (zh->errCode) /* non Surrogate Diagnostic */ { r->errcode = zh->errCode; r->errstring = zh->errString; } - else + else if (retrievalRecord.errCode) /* Surrogate Diagnostic */ + { + q->surrogate_flag = 1; + r->errcode = retrievalRecord.errCode; + r->errstring = retrievalRecord.errString; + r->basename = retrievalRecord.base; + } + else /* Database Record */ { r->errcode = 0; r->basename = retrievalRecord.base; @@ -298,22 +392,19 @@ bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num) return r; } -bend_deleteresult *bend_delete (void *handle, bend_deleterequest *q, int *num) -{ - return 0; -} - 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, @@ -340,30 +431,33 @@ 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, rr->input_setnames, + zebra_sort (zh, rr->stream, + rr->num_input_setnames, (const char **) rr->input_setnames, rr->output_setname, rr->sort_sequence, &rr->sort_status); rr->errcode = zh->errCode; rr->errstring = zh->errString; return 0; } -#ifndef WINDOWS -static void pre_init (struct statserv_options_block *sob) +#ifndef WIN32 +static void bend_start (struct statserv_options_block *sob) { - char *pidfile = "zebrasrv.pid"; - int fd = creat (pidfile, 0666); - - if (fd == -1) - logf (LOG_WARN|LOG_ERRNO, "creat %s", pidfile); - else + 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 @@ -374,10 +468,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); }