X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=1b063b25bf5577b1a540012c170dfa1049b872fd;hb=2b17f33968c38dfe50b7710da1c9e5004da9cf8b;hp=66217cd48f5d02a292313bf83688e247d3df5a34;hpb=81a75ae20b5b250309a70de51bfdf8de0019f882;p=idzebra-moved-to-github.git diff --git a/index/zserver.c b/index/zserver.c index 66217cd..1b063b2 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -1,9 +1,26 @@ -/* - * Copyright (C) 1995-2002, Index Data - * All rights reserved. - * - * $Id: zserver.c,v 1.87 2002-04-05 08:46:26 adam Exp $ - */ +/* $Id: zserver.c,v 1.99 2002-09-17 21:17:37 adam Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 + Index Data Aps + +This file is part of the Zebra server. + +Zebra is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +Zebra is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with Zebra; see the file LICENSE.zebra. If not, write to the +Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. +*/ + + #include #include @@ -16,9 +33,7 @@ #endif #include -#ifdef ASN_COMPILED #include -#endif #include "zserver.h" @@ -49,20 +64,15 @@ bend_initresult *bend_init (bend_initrequest *q) q->bend_fetch = bend_fetch; q->bend_scan = bend_scan; -#if ZMBOL - q->implementation_name = "Z'mbol Information Server"; - q->implementation_version = "Z'mbol " ZEBRAVER; -#else q->implementation_name = "Zebra Information Server"; q->implementation_version = "Zebra " ZEBRAVER; -#endif logf (LOG_DEBUG, "bend_init"); sob = statserv_getcontrol (); if (!(zh = zebra_open (sob->handle))) { - yaz_log (LOG_FATAL, "Failed to open config `%s'", sob->configname); + yaz_log (LOG_WARN, "Failed to read config `%s'", sob->configname); r->errcode = 1; return r; } @@ -89,6 +99,38 @@ bend_initresult *bend_init (bend_initrequest *q) return r; } r->handle = zh; + if (q->charneg_request) /* characater set and langauge negotiation? */ + { + char **charsets = 0; + int num_charsets; + char **langs = 0; + int num_langs = 0; + int selected = 0; + int i; + + NMEM nmem = nmem_create (); + yaz_log (LOG_LOG, "character set and language negotiation"); + + yaz_get_proposal_charneg (nmem, q->charneg_request, + &charsets, &num_charsets, + &langs, &num_langs, &selected); + for (i = 0; i < num_charsets; i++) + { + yaz_log (LOG_LOG, "charset %d %s", i, charsets[i]); + + if (odr_set_charset (q->decode, "UTF-8", charsets[i]) == 0) + { + odr_set_charset (q->stream, charsets[i], "UTF-8"); + if (selected) + zebra_record_encoding (zh, charsets[i]); + q->charneg_response = + yaz_set_response_charneg (q->stream, charsets[i], + 0, selected); + break; + } + } + nmem_destroy (nmem); + } return r; } @@ -97,11 +139,12 @@ static void search_terms (ZebraHandle zh, bend_search_rr *r) int count; int no_terms; int i; + int type; struct Z_External *ext; Z_SearchInfoReport *sr; /* get no of terms for result set */ - zebra_resultSetTerms (zh, r->setname, -1, &count, &no_terms); + no_terms = zebra_resultSetTerms (zh, r->setname, 0, 0, 0, 0, 0); if (!no_terms) return; @@ -129,8 +172,10 @@ static void search_terms (ZebraHandle zh, bend_search_rr *r) for (i = 0; isetname, i, - &count, &no_terms); + char outbuf[1024]; + size_t len = sizeof(outbuf); + zebra_resultSetTerms (zh, r->setname, i, + &count, &type, outbuf, &len); sr->elements[i] = odr_malloc (r->stream, sizeof(**sr->elements)); sr->elements[i]->subqueryId = 0; @@ -145,14 +190,25 @@ static void search_terms (ZebraHandle zh, bend_search_rr *r) odr_malloc (r->stream, sizeof(Z_QueryExpressionTerm)); term = odr_malloc (r->stream, sizeof(Z_Term)); sr->elements[i]->subqueryExpression->u.term->queryTerm = term; - - term->which = Z_Term_general; - term->u.general = odr_malloc (r->stream, sizeof(Odr_oct)); - term->u.general->buf = odr_strdup (r->stream, termz); - - term->u.general->len = strlen (termz); - term->u.general->size = strlen (termz); - + switch (type) + { + case Z_Term_characterString: + yaz_log (LOG_DEBUG, "term as characterString"); + term->which = Z_Term_characterString; + term->u.characterString = odr_strdup (r->stream, outbuf); + break; + case Z_Term_general: + yaz_log (LOG_DEBUG, "term as general"); + term->which = Z_Term_general; + term->u.general = odr_malloc (r->stream, sizeof(*term->u.general)); + term->u.general->size = term->u.general->len = len; + term->u.general->buf = odr_malloc (r->stream, len); + memcpy (term->u.general->buf, outbuf, len); + break; + default: + term->which = Z_Term_general; + term->u.null = odr_nullval(); + } sr->elements[i]->subqueryExpression->u.term->termComment = 0; sr->elements[i]->subqueryInterpretation = 0; sr->elements[i]->subqueryRecommendation = 0; @@ -300,12 +356,13 @@ static int es_admin_request (ZebraHandle zh, Z_AdminEsRequest *r) yaz_log(LOG_LOG, "adm-drop"); break; case Z_ESAdminOriginPartToKeep_create: - yaz_log(LOG_LOG, "adm-create"); + yaz_log(LOG_LOG, "adm-create %s", r->toKeep->databaseName); 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); + zebra_admin_import_begin (zh, r->toKeep->databaseName, + r->toKeep->u.import->recordType); break; case Z_ESAdminOriginPartToKeep_refresh: yaz_log(LOG_LOG, "adm-refresh"); @@ -379,118 +436,6 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) zebra_result (zh, &rr->errcode, &rr->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(yaz_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(yaz_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; @@ -534,24 +479,43 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) 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 (zebra_select_database(zh, toKeep->databaseName)) + return 0; } + else + { + yaz_log (LOG_WARN, "no database supplied for ES Update"); + rr->errcode = 1008; + rr->errstring = "database"; + return 0; + } if (notToKeep) { int i; + zebra_begin_trans (zh); for (i = 0; i < notToKeep->num; i++) { Z_External *rec = notToKeep->elements[i]->record; + struct oident *oident = 0; + Odr_oct *recid = notToKeep->elements[i]->u.opaque; + if (!recid) + { + rr->errcode = 224; + rr->errstring = "record Id not supplied"; + break; + } + if (notToKeep->elements[i]->which != + Z_IUSuppliedRecords_elem_opaque) + { + rr->errcode = 224; + rr->errstring = "only opaque record ID supported"; + break; + } + if (rec->direct_reference) { - struct oident *oident; oident = oid_getentbyoid(rec->direct_reference); if (oident) yaz_log (LOG_LOG, "record %d type %s", i, @@ -579,7 +543,63 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) rec->u.octet_aligned->len, rec->u.octet_aligned->buf); } + if (oident && oident->value != VAL_TEXT_XML) + { + rr->errcode = 224; + rr->errstring = "only XML update supported"; + break; + } + if (rec->which == Z_External_octet) + { + int action = 0; + + if (*toKeep->action == + Z_IUOriginPartToKeep_recordInsert) + action = 1; + if (*toKeep->action == + Z_IUOriginPartToKeep_recordReplace) + action = 2; + if (*toKeep->action == + Z_IUOriginPartToKeep_recordDelete) + action = 3; + if (*toKeep->action == + Z_IUOriginPartToKeep_specialUpdate) + action = 1; + + if (!action) + { + rr->errcode = 224; + rr->errstring = "unsupported ES Update action"; + break; + } + else + { + int r = zebra_admin_exchange_record ( + zh, toKeep->databaseName, + rec->u.octet_aligned->buf, + rec->u.octet_aligned->len, + recid->buf, recid->len, + action); + if (r && *toKeep->action == + Z_IUOriginPartToKeep_specialUpdate) + { + r = zebra_admin_exchange_record ( + zh, toKeep->databaseName, + rec->u.octet_aligned->buf, + rec->u.octet_aligned->len, + recid->buf, recid->len, + 2); + } + if (r) + { + rr->errcode = 224; + rr->errstring = "record exchange failed"; + break; + } + } + } } + zebra_end_trans (zh); } } } @@ -587,6 +607,7 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) { yaz_log (LOG_WARN, "Unknown Extended Service(%d)", rr->esr->taskSpecificParameters->which); + rr->errcode = 221; } return 0; @@ -616,10 +637,21 @@ static void bend_start (struct statserv_options_block *sob) if (sob->handle) zebra_stop((ZebraService) sob->handle); sob->handle = zebra_start(sob->configname); + if (!sob->handle) + { + yaz_log (LOG_FATAL, "Failed to read config `%s'", sob->configname); + exit (1); + } } static void bend_stop(struct statserv_options_block *sob) { +#ifdef WIN32 + +#else + if (!sob->inetd) + unlink ("zebrasrv.pid"); +#endif if (sob->handle) { ZebraService service = sob->handle; @@ -635,7 +667,9 @@ int main (int argc, char **argv) strcpy (sob->configname, "zebra.cfg"); sob->bend_start = bend_start; sob->bend_stop = bend_stop; - +#ifdef WIN32 + strcpy (sob->service_display_name, "Zebra Server"); +#endif statserv_setcontrol (sob); return statserv_main (argc, argv, bend_init, bend_close);