X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=12f4e5e9319bd7bebc2fb5c0d5a837c55b4225c7;hb=fbb8cf7bf8582db044949d488ca9dcdbb92f352b;hp=85ff5d9a3de8eb4f9980a5c1219082c8f3e6e5a6;hpb=3c5f6226f97612c0d6ac40591f600587c5ffa858;p=idzebra-moved-to-github.git diff --git a/index/zserver.c b/index/zserver.c index 85ff5d9..12f4e5e 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -1,10 +1,44 @@ /* - * Copyright (C) 1995-1999, Index Data + * Copyright (C) 1995-2000, Index Data * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss * * $Log: zserver.c,v $ - * Revision 1.67 1999-02-02 14:51:14 adam + * Revision 1.79 2000-05-09 10:56:50 adam + * Added call to xmalloc/nmem debugging functions. + * + * Revision 1.78 2000/04/05 09:49:35 adam + * On Unix, zebra/z'mbol uses automake. + * + * Revision 1.77 2000/03/20 19:08:36 adam + * Added remote record import using Z39.50 extended services and Segment + * Requests. + * + * Revision 1.76 2000/03/15 15:00:31 adam + * First work on threaded version. + * + * 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 @@ -253,8 +287,10 @@ #include #endif -#include -#include +#include +#ifdef ASN_COMPILED +#include +#endif #include "zserver.h" @@ -266,10 +302,17 @@ #endif static int bend_sort (void *handle, bend_sort_rr *rr); +static int bend_delete (void *handle, bend_delete_rr *rr); +static int bend_esrequest (void *handle, bend_esrequest_rr *rr); +static int bend_segment (void *handle, bend_segment_rr *rr); +static int bend_search (void *handle, bend_search_rr *r); +static int bend_fetch (void *handle, bend_fetch_rr *r); +static int bend_scan (void *handle, bend_scan_rr *r); 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; @@ -278,11 +321,20 @@ bend_initresult *bend_init (bend_initrequest *q) r->errcode = 0; r->errstring = 0; q->bend_sort = bend_sort; + q->bend_delete = bend_delete; + q->bend_esrequest = bend_esrequest; + q->bend_segment = bend_segment; + q->bend_search = bend_search; + q->bend_fetch = bend_fetch; + q->bend_scan = bend_scan; + + q->implementation_name = "Z'mbol Information Server"; + q->implementation_version = "Z'mbol 1.0"; logf (LOG_DEBUG, "bend_init"); sob = statserv_getcontrol (); - if (!(zh = zebra_open (sob->configname))) + if (!(zh = zebra_open (sob->handle))) { logf (LOG_FATAL, "Failed to open Zebra `%s'", sob->configname); r->errcode = 1; @@ -303,7 +355,7 @@ bend_initresult *bend_init (bend_initrequest *q) xfree (openpass); } } - if (zebra_auth (zh, user, passwd)) + if (zebra_auth (zh->service, user, passwd)) { r->errcode = 222; r->errstring = user; @@ -314,21 +366,20 @@ bend_initresult *bend_init (bend_initrequest *q) return r; } -bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd) +int bend_search (void *handle, bend_search_rr *r) { - ZebraHandle zh = handle; - bend_searchresult *r = odr_malloc (q->stream, sizeof(*r)); + ZebraHandle zh = (ZebraHandle) handle; r->hits = 0; r->errcode = 0; r->errstring = NULL; - logf (LOG_LOG, "ResultSet '%s'", q->setname); - switch (q->query->which) + logf (LOG_LOG, "ResultSet '%s'", r->setname); + switch (r->query->which) { case Z_Query_type_1: case Z_Query_type_101: - zebra_search_rpn (zh, q->decode, q->stream, q->query->u.type_1, - q->num_bases, q->basenames, q->setname); + zebra_search_rpn (zh, r->decode, r->stream, r->query->u.type_1, + r->num_bases, r->basenames, r->setname); r->errcode = zh->errCode; r->errstring = zh->errString; r->hits = zh->hits; @@ -340,20 +391,19 @@ bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd) default: r->errcode = 107; } - return r; + return 0; } -bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num) +int bend_fetch (void *handle, bend_fetch_rr *r) { - ZebraHandle zh = handle; - bend_fetchresult *r = odr_malloc (q->stream, sizeof(*r)); + ZebraHandle zh = (ZebraHandle) handle; ZebraRetrievalRecord retrievalRecord; - retrievalRecord.position = q->number; + retrievalRecord.position = r->number; r->last_in_set = 0; - zebra_records_retrieve (zh, q->stream, q->setname, q->comp, - q->format, 1, &retrievalRecord); + zebra_records_retrieve (zh, r->stream, r->setname, r->comp, + r->request_format, 1, &retrievalRecord); if (zh->errCode) /* non Surrogate Diagnostic */ { r->errcode = zh->errCode; @@ -361,7 +411,7 @@ bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num) } else if (retrievalRecord.errCode) /* Surrogate Diagnostic */ { - q->surrogate_flag = 1; + r->surrogate_flag = 1; r->errcode = retrievalRecord.errCode; r->errstring = retrievalRecord.errString; r->basename = retrievalRecord.base; @@ -372,25 +422,22 @@ bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num) r->basename = retrievalRecord.base; r->record = retrievalRecord.buf; r->len = retrievalRecord.len; - r->format = retrievalRecord.format; + r->output_format = retrievalRecord.format; } - return r; + return 0; } -bend_scanresult *bend_scan (void *handle, bend_scanrequest *q, int *num) +static int bend_scan (void *handle, bend_scan_rr *r) { ZebraScanEntry *entries; - ZebraHandle zh = handle; - bend_scanresult *r = odr_malloc (q->stream, sizeof(*r)); + ZebraHandle zh = (ZebraHandle) handle; 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); - zebra_scan (zh, q->stream, q->term, - q->attributeset, - q->num_bases, q->basenames, + r->entries = (struct scan_entry *) + odr_malloc (r->stream, sizeof(*r->entries) * r->num_entries); + zebra_scan (zh, r->stream, r->term, + r->attributeset, + r->num_bases, r->basenames, &r->term_position, &r->num_entries, &entries, &is_partial); if (is_partial) @@ -404,17 +451,19 @@ bend_scanresult *bend_scan (void *handle, bend_scanrequest *q, int *num) } r->errcode = zh->errCode; r->errstring = zh->errString; - return r; + return 0; } void bend_close (void *handle) { zebra_close ((ZebraHandle) handle); + xmalloc_trav("bend_close"); + nmem_print_list(); } 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, @@ -424,24 +473,358 @@ int bend_sort (void *handle, bend_sort_rr *rr) return 0; } -#ifndef WIN32 -static void pre_init (struct statserv_options_block *sob) +int bend_delete (void *handle, bend_delete_rr *rr) +{ + ZebraHandle zh = (ZebraHandle) handle; + + rr->delete_status = zebra_deleleResultSet(zh, rr->function, + rr->num_setnames, rr->setnames, + rr->statuses); + return 0; +} + +static int es_admin_request (ZebraHandle zh, Z_AdminEsRequest *r) { - char *pidfile = "zebrasrv.pid"; - int fd = creat (pidfile, 0666); + switch (r->toKeep->which) + { + case Z_ESAdminOriginPartToKeep_reIndex: + yaz_log(LOG_LOG, "adm-reindex"); + break; + case Z_ESAdminOriginPartToKeep_truncate: + yaz_log(LOG_LOG, "adm-truncate"); + break; + case Z_ESAdminOriginPartToKeep_drop: + yaz_log(LOG_LOG, "adm-drop"); + break; + case Z_ESAdminOriginPartToKeep_create: + yaz_log(LOG_LOG, "adm-create"); + zebra_admin_create (zh, r->toKeep->databaseName); + break; + case Z_ESAdminOriginPartToKeep_import: + yaz_log(LOG_LOG, "adm-import"); + zebra_admin_import_begin (zh, r->toKeep->databaseName); + break; + case Z_ESAdminOriginPartToKeep_refresh: + yaz_log(LOG_LOG, "adm-refresh"); + break; + case Z_ESAdminOriginPartToKeep_commit: + yaz_log(LOG_LOG, "adm-commit"); + break; + case Z_ESAdminOriginPartToKeep_shutdown: + yaz_log(LOG_LOG, "shutdown"); + zebra_admin_shutdown(zh); + break; + case Z_ESAdminOriginPartToKeep_start: + yaz_log(LOG_LOG, "start"); + zebra_admin_start(zh); + break; + default: + yaz_log(LOG_LOG, "unknown admin"); + zh->errCode = 1001; + } + if (r->toKeep->databaseName) + { + yaz_log(LOG_LOG, "database %s", r->toKeep->databaseName); + } + return 0; +} + +static int es_admin (ZebraHandle zh, Z_Admin *r) +{ + switch (r->which) + { + case Z_Admin_esRequest: + es_admin_request (zh, r->u.esRequest); + break; + case Z_Admin_taskPackage: + yaz_log (LOG_LOG, "adm taskpackage (unhandled)"); + break; + default: + zh->errCode = 1001; + break; + } + + return 0; +} + +int bend_segment (void *handle, bend_segment_rr *rr) +{ + ZebraHandle zh = (ZebraHandle) handle; + Z_Segment *segment = rr->segment; + + if (segment->num_segmentRecords) + zebra_admin_import_segment (zh, rr->segment); + else + zebra_admin_import_end (zh); + return 0; +} + +int bend_esrequest (void *handle, bend_esrequest_rr *rr) +{ + ZebraHandle zh = (ZebraHandle) handle; - if (fd == -1) - logf (LOG_WARN|LOG_ERRNO, "creat %s", pidfile); + yaz_log(LOG_LOG, "function: %d", *rr->esr->function); + if (rr->esr->packageName) + yaz_log(LOG_LOG, "packagename: %s", rr->esr->packageName); + yaz_log(LOG_LOG, "Waitaction: %d", *rr->esr->waitAction); + + if (!rr->esr->taskSpecificParameters) + { + yaz_log (LOG_WARN, "No task specific parameters"); + } + else if (rr->esr->taskSpecificParameters->which == Z_External_ESAdmin) + { + es_admin (zh, rr->esr->taskSpecificParameters->u.adminService); + rr->errcode = zh->errCode; + rr->errstring = zh->errString; + } + else if (rr->esr->taskSpecificParameters->which == Z_External_itemOrder) + { + Z_ItemOrder *it = rr->esr->taskSpecificParameters->u.itemOrder; + yaz_log (LOG_LOG, "Received ItemOrder"); + switch (it->which) + { +#ifdef ASN_COMPILED + case Z_IOItemOrder_esRequest: +#else + case Z_ItemOrder_esRequest: +#endif + { + Z_IORequest *ir = it->u.esRequest; + Z_IOOriginPartToKeep *k = ir->toKeep; + Z_IOOriginPartNotToKeep *n = ir->notToKeep; + + if (k && k->contact) + { + if (k->contact->name) + yaz_log(LOG_LOG, "contact name %s", k->contact->name); + if (k->contact->phone) + yaz_log(LOG_LOG, "contact phone %s", k->contact->phone); + if (k->contact->email) + yaz_log(LOG_LOG, "contact email %s", k->contact->email); + } + if (k->addlBilling) + { + yaz_log(LOG_LOG, "Billing info (not shown)"); + } + + if (n->resultSetItem) + { + yaz_log(LOG_LOG, "resultsetItem"); + yaz_log(LOG_LOG, "setId: %s", n->resultSetItem->resultSetId); + yaz_log(LOG_LOG, "item: %d", *n->resultSetItem->item); + } +#ifdef ASN_COMPILED + if (n->itemRequest) + { + Z_External *r = (Z_External*) n->itemRequest; + ILL_ItemRequest *item_req = 0; + ILL_Request *ill_req = 0; + if (r->direct_reference) + { + oident *ent = oid_getentbyoid(r->direct_reference); + if (ent) + yaz_log(LOG_LOG, "OID %s", ent->desc); + if (ent && ent->value == VAL_ISO_ILL_1) + { + yaz_log (LOG_LOG, "ItemRequest"); + if (r->which == ODR_EXTERNAL_single) + { + odr_setbuf(rr->decode, + r->u.single_ASN1_type->buf, + r->u.single_ASN1_type->len, 0); + + if (!ill_ItemRequest (rr->decode, &item_req, 0, 0)) + { + yaz_log (LOG_LOG, + "Couldn't decode ItemRequest %s near %d", + odr_errmsg(odr_geterror(rr->decode)), + odr_offset(rr->decode)); + yaz_log(LOG_LOG, "PDU dump:"); + odr_dumpBER(log_file(), + r->u.single_ASN1_type->buf, + r->u.single_ASN1_type->len); + } + if (rr->print) + { + ill_ItemRequest (rr->print, &item_req, 0, + "ItemRequest"); + odr_reset (rr->print); + } + } + if (!item_req && r->which == ODR_EXTERNAL_single) + { + yaz_log (LOG_LOG, "ILLRequest"); + odr_setbuf(rr->decode, + r->u.single_ASN1_type->buf, + r->u.single_ASN1_type->len, 0); + + if (!ill_Request (rr->decode, &ill_req, 0, 0)) + { + yaz_log (LOG_LOG, + "Couldn't decode ILLRequest %s near %d", + odr_errmsg(odr_geterror(rr->decode)), + odr_offset(rr->decode)); + yaz_log(LOG_LOG, "PDU dump:"); + odr_dumpBER(log_file(), + r->u.single_ASN1_type->buf, + r->u.single_ASN1_type->len); + } + if (rr->print) + { + ill_Request (rr->print, &ill_req, 0, + "ILLRequest"); + odr_reset (rr->print); + } + } + } + } + if (item_req) + { + yaz_log (LOG_LOG, "ILL protocol version = %d", + *item_req->protocol_version_num); + } + } +#endif + } + break; + } + } + else if (rr->esr->taskSpecificParameters->which == Z_External_update) + { + Z_IUUpdate *up = rr->esr->taskSpecificParameters->u.update; + yaz_log (LOG_LOG, "Received DB Update"); + if (up->which == Z_IUUpdate_esRequest) + { + Z_IUUpdateEsRequest *esRequest = up->u.esRequest; + Z_IUOriginPartToKeep *toKeep = esRequest->toKeep; + Z_IUSuppliedRecords *notToKeep = esRequest->notToKeep; + + yaz_log (LOG_LOG, "action"); + if (toKeep->action) + { + switch (*toKeep->action) + { + case Z_IUOriginPartToKeep_recordInsert: + yaz_log (LOG_LOG, "recordInsert"); + break; + case Z_IUOriginPartToKeep_recordReplace: + yaz_log (LOG_LOG, "recordUpdate"); + break; + case Z_IUOriginPartToKeep_recordDelete: + yaz_log (LOG_LOG, "recordDelete"); + break; + case Z_IUOriginPartToKeep_elementUpdate: + yaz_log (LOG_LOG, "elementUpdate"); + break; + case Z_IUOriginPartToKeep_specialUpdate: + yaz_log (LOG_LOG, "specialUpdate"); + break; + case Z_ESAdminOriginPartToKeep_shutdown: + yaz_log (LOG_LOG, "shutDown"); + break; + case Z_ESAdminOriginPartToKeep_start: + yaz_log (LOG_LOG, "start"); + break; + default: + yaz_log (LOG_LOG, " unknown (%d)", *toKeep->action); + } + } + if (toKeep->databaseName) + { + yaz_log (LOG_LOG, "database: %s", toKeep->databaseName); + if (!strcmp(toKeep->databaseName, "fault")) + { + rr->errcode = 109; + rr->errstring = toKeep->databaseName; + } + if (!strcmp(toKeep->databaseName, "accept")) + rr->errcode = -1; + } + if (notToKeep) + { + int i; + for (i = 0; i < notToKeep->num; i++) + { + Z_External *rec = notToKeep->elements[i]->record; + + if (rec->direct_reference) + { + struct oident *oident; + oident = oid_getentbyoid(rec->direct_reference); + if (oident) + yaz_log (LOG_LOG, "record %d type %s", i, + oident->desc); + } + switch (rec->which) + { + case Z_External_sutrs: + if (rec->u.octet_aligned->len > 170) + yaz_log (LOG_LOG, "%d bytes:\n%.168s ...", + rec->u.sutrs->len, + rec->u.sutrs->buf); + else + yaz_log (LOG_LOG, "%d bytes:\n%s", + rec->u.sutrs->len, + rec->u.sutrs->buf); + break; + case Z_External_octet: + if (rec->u.octet_aligned->len > 170) + yaz_log (LOG_LOG, "%d bytes:\n%.168s ...", + rec->u.octet_aligned->len, + rec->u.octet_aligned->buf); + else + yaz_log (LOG_LOG, "%d bytes\n%s", + rec->u.octet_aligned->len, + rec->u.octet_aligned->buf); + } + } + } + } + } else { - char pidstr[30]; + yaz_log (LOG_WARN, "Unknown Extended Service(%d)", + rr->esr->taskSpecificParameters->which); - sprintf (pidstr, "%ld", (long) getpid ()); - write (fd, pidstr, strlen(pidstr)); - close (fd); } + return 0; } + +static void bend_start (struct statserv_options_block *sob) +{ +#ifdef WIN32 + +#else + if (!sob->inetd) + { + 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); + } + } #endif + if (sob->handle) + zebra_stop((ZebraService) sob->handle); + sob->handle = zebra_start(sob->configname); +} + +static void bend_stop(struct statserv_options_block *sob) +{ + if (sob->handle) + { + ZebraService service = sob->handle; + zebra_stop(service); + } +} int main (int argc, char **argv) { @@ -449,13 +832,10 @@ int main (int argc, char **argv) sob = statserv_getcontrol (); strcpy (sob->configname, FNAME_CONFIG); -#ifndef WIN32 - sob->pre_init = pre_init; -#endif + sob->bend_start = bend_start; + sob->bend_stop = bend_stop; + statserv_setcontrol (sob); -#if ZEBRASDR - zebraSdr_std (); -#endif - return statserv_main (argc, argv); + return statserv_main (argc, argv, bend_init, bend_close); }