X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=24b7648d4b2602612f63fafe315a257dd6e36d6a;hb=fc9684841bbfad0b625e7365b99bae7b7df737df;hp=c935479740a3590ae19c8c9b85782a37e66498b9;hpb=f1a944fbdac20e88bf55918f2a4f66c301d684e2;p=idzebra-moved-to-github.git diff --git a/index/zserver.c b/index/zserver.c index c935479..24b7648 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -1,9 +1,26 @@ -/* - * Copyright (C) 1995-2000, Index Data - * All rights reserved. - * - * $Id: zserver.c,v 1.84 2002-03-20 20:24:30 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 + +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 @@ -15,20 +32,12 @@ #include #endif -#include -#ifdef ASN_COMPILED +#include #include -#endif +#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); static int bend_esrequest (void *handle, bend_esrequest_rr *rr); @@ -56,20 +65,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"); + yaz_log (LOG_DEBUG, "bend_init"); sob = statserv_getcontrol (); if (!(zh = zebra_open (sob->handle))) { - logf (LOG_FATAL, "Failed to open Zebra `%s'", sob->configname); + yaz_log (LOG_WARN, "Failed to read config `%s'", sob->configname); r->errcode = 1; return r; } @@ -88,7 +92,7 @@ bend_initresult *bend_init (bend_initrequest *q) xfree (openpass); } } - if (zebra_auth (zh->service, user, passwd)) + if (zebra_auth (zh, user, passwd)) { r->errcode = 222; r->errstring = user; @@ -96,6 +100,63 @@ 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++) + { + 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 (!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) + { + 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, right_name); + q->charneg_response = + yaz_set_response_charneg (q->stream, right_name, + 0, selected); + break; + } else { + yaz_log (LOG_LOG, "charset %d %s (proper name %s): unsupported", i, + charsets[i], right_name); + } + } + nmem_destroy(nmem); + } return r; } @@ -104,11 +165,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; @@ -136,8 +198,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; @@ -152,14 +216,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; @@ -177,15 +252,19 @@ int bend_search (void *handle, bend_search_rr *r) r->errcode = 0; r->errstring = NULL; - logf (LOG_LOG, "ResultSet '%s'", r->setname); + if (zebra_select_databases (zh, r->num_bases, + (const char **) r->basenames)) + { + zebra_result (zh, &r->errcode, &r->errstring); + return 0; + } + yaz_log (LOG_LOG, "ResultSet '%s'", r->setname); switch (r->query->which) { case Z_Query_type_1: case Z_Query_type_101: 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; + r->setname, &r->hits); + zebra_result (zh, &r->errcode, &r->errstring); if (!r->errcode) search_terms (zh, r); break; @@ -210,19 +289,16 @@ int bend_fetch (void *handle, bend_fetch_rr *r) r->last_in_set = 0; 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; - r->errstring = zh->errString; - } - else if (retrievalRecord.errCode) /* Surrogate Diagnostic */ + zebra_result (zh, &r->errcode, &r->errstring); + /* non Surrogate Diagnostic OR Surrogate Diagnostic */ + if (r->errcode == 0 && retrievalRecord.errCode) { r->surrogate_flag = 1; r->errcode = retrievalRecord.errCode; r->errstring = retrievalRecord.errString; r->basename = retrievalRecord.base; } - else /* Database Record */ + else if (r->errcode == 0) /* Database Record */ { r->errcode = 0; r->basename = retrievalRecord.base; @@ -238,12 +314,17 @@ static int bend_scan (void *handle, bend_scan_rr *r) ZebraScanEntry *entries; ZebraHandle zh = (ZebraHandle) handle; int is_partial, i; - + + if (zebra_select_databases (zh, r->num_bases, + (const char **) r->basenames)) + { + zebra_result (zh, &r->errcode, &r->errstring); + return 0; + } 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) @@ -255,8 +336,7 @@ static int bend_scan (void *handle, bend_scan_rr *r) r->entries[i].term = entries[i].term; r->entries[i].occurrences = entries[i].occurrences; } - r->errcode = zh->errCode; - r->errstring = zh->errString; + zebra_result (zh, &r->errcode, &r->errstring); return 0; } @@ -274,8 +354,7 @@ int bend_sort (void *handle, bend_sort_rr *rr) 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; + zebra_result (zh, &rr->errcode, &rr->errstring); return 0; } @@ -303,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"); @@ -326,7 +406,6 @@ static int es_admin_request (ZebraHandle zh, Z_AdminEsRequest *r) break; default: yaz_log(LOG_LOG, "unknown admin"); - zh->errCode = 1001; } if (r->toKeep->databaseName) { @@ -346,7 +425,6 @@ static int es_admin (ZebraHandle zh, Z_Admin *r) yaz_log (LOG_LOG, "adm taskpackage (unhandled)"); break; default: - zh->errCode = 1001; break; } @@ -381,120 +459,8 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) 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(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; - } + + zebra_result (zh, &rr->errcode, &rr->errstring); } else if (rr->esr->taskSpecificParameters->which == Z_External_update) { @@ -539,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, @@ -584,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); } } } @@ -592,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; @@ -607,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]; @@ -621,10 +663,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; @@ -637,10 +690,12 @@ int main (int argc, char **argv) struct statserv_options_block *sob; sob = statserv_getcontrol (); - strcpy (sob->configname, FNAME_CONFIG); + 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);