X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=24b7648d4b2602612f63fafe315a257dd6e36d6a;hb=fc9684841bbfad0b625e7365b99bae7b7df737df;hp=3c0aae9e663706d992c1ee4a62111f06cf8ad98e;hpb=b91ce3324c28145911b703dfe4e4c0ddb12d6532;p=idzebra-moved-to-github.git diff --git a/index/zserver.c b/index/zserver.c index 3c0aae9..24b7648 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -1,4 +1,4 @@ -/* $Id: zserver.c,v 1.91 2002-08-05 14:08:08 adam Exp $ +/* $Id: zserver.c,v 1.104 2003-03-04 23:30:20 adam Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 Index Data Aps @@ -32,10 +32,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #endif -#include -#ifdef ASN_COMPILED +#include #include -#endif +#include #include "zserver.h" @@ -69,12 +68,12 @@ bend_initresult *bend_init (bend_initrequest *q) q->implementation_name = "Zebra Information Server"; q->implementation_version = "Zebra " ZEBRAVER; - logf (LOG_DEBUG, "bend_init"); + yaz_log (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; } @@ -109,29 +108,54 @@ bend_initresult *bend_init (bend_initrequest *q) int num_langs = 0; int selected = 0; int i; + NMEM nmem = nmem_create(); - 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]); + const char *right_name = ""; + /* + * FIXME! It is like rudiment :-)) + * We have to support this short names of character sets, + * because a lot servers in Russia to use own in during + * character set and language negotiation still. + */ - if (odr_set_charset (q->decode, "UTF-8", charsets[i]) == 0) + if (!yaz_matchstr(charsets[i], "win")) { + right_name = "WINDOWS-1251"; + } else if (!yaz_matchstr(charsets[i], "koi")) { + right_name = "KOI8-R"; + } else if (!yaz_matchstr(charsets[i], "iso")) { + right_name = "ISO-8859-5"; + } else if (!yaz_matchstr(charsets[i], "dos")) { + right_name = "CP866"; + } else if (!yaz_matchstr(charsets[i], "uni")) { + right_name = "UTF-8"; + } else { + right_name = charsets[i]; + } + if (odr_set_charset (q->decode, "UTF-8", right_name) == 0) { - odr_set_charset (q->stream, charsets[i], "UTF-8"); + yaz_log (LOG_LOG, "charset %d %s (proper name %s): OK", i, + charsets[i], right_name); + odr_set_charset (q->stream, right_name, "UTF-8"); if (selected) - zebra_record_encoding (zh, charsets[i]); - q->charneg_response = - yaz_set_response_charneg (q->stream, charsets[i], + zebra_record_encoding (zh, right_name); + q->charneg_response = + yaz_set_response_charneg (q->stream, right_name, 0, selected); - break; + break; + } else { + yaz_log (LOG_LOG, "charset %d %s (proper name %s): unsupported", i, + charsets[i], right_name); } } - nmem_destroy (nmem); + nmem_destroy(nmem); } return r; } @@ -195,12 +219,12 @@ static void search_terms (ZebraHandle zh, bend_search_rr *r) switch (type) { case Z_Term_characterString: - yaz_log (LOG_LOG, "term as 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_LOG, "term as 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; @@ -234,7 +258,7 @@ int bend_search (void *handle, bend_search_rr *r) zebra_result (zh, &r->errcode, &r->errstring); return 0; } - logf (LOG_LOG, "ResultSet '%s'", r->setname); + yaz_log (LOG_LOG, "ResultSet '%s'", r->setname); switch (r->query->which) { case Z_Query_type_1: case Z_Query_type_101: @@ -358,12 +382,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"); @@ -437,118 +462,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; @@ -592,24 +505,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, 1); 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, @@ -637,7 +569,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); } } } @@ -645,6 +633,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; @@ -660,7 +649,7 @@ 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); + yaz_log (LOG_WARN|LOG_ERRNO, "creat %s", pidfile); else { char pidstr[30]; @@ -674,6 +663,11 @@ 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) @@ -699,7 +693,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);