X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzserver.c;h=600248a2918347e9e0547566f9538b1d38613363;hp=9f0572c2827ea3b657d9410ae7f00bcb85edc0c3;hb=5437b50633032595afe6f87dc0f989bc92a5aea8;hpb=2b1851bd5565e3d21f9cf9a37661a584c063b75f diff --git a/index/zserver.c b/index/zserver.c index 9f0572c..600248a 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -1,9 +1,24 @@ -/* - * Copyright (C) 1995-2000, Index Data - * All rights reserved. - * - * $Id: zserver.c,v 1.85 2002-04-04 14:14:13 adam Exp $ - */ +/* $Id: zserver.c,v 1.123 2004-11-19 10:27:08 heikki Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 + 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 @@ -11,14 +26,17 @@ #ifdef WIN32 #include #include +#include #else #include #endif -#include -#ifdef ASN_COMPILED +#include +#include #include -#endif +#include + +#include #include "zserver.h" @@ -49,23 +67,19 @@ 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 (YLOG_DEBUG, "bend_init"); sob = statserv_getcontrol (); if (!(zh = zebra_open (sob->handle))) { - logf (LOG_FATAL, "Failed to open Zebra `%s'", sob->configname); + yaz_log (YLOG_WARN, "Failed to read config `%s'", sob->configname); r->errcode = 1; return r; } + r->handle = zh; if (q->auth) { if (q->auth->which == Z_IdAuthentication_open) @@ -80,28 +94,92 @@ bend_initresult *bend_init (bend_initrequest *q) } xfree (openpass); } + else if (q->auth->which == Z_IdAuthentication_idPass) + { + Z_IdPass *idPass = q->auth->u.idPass; + + user = idPass->userId; + passwd = idPass->password; + } } if (zebra_auth (zh, user, passwd)) { r->errcode = 222; r->errstring = user; - zebra_close (zh); 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 (YLOG_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 (YLOG_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, charsets[i], + 0, selected); + break; + } else { + yaz_log (YLOG_LOG, "charset %d %s (proper name %s): unsupported", i, + charsets[i], right_name); + } + } + nmem_destroy(nmem); + } return r; } static void search_terms (ZebraHandle zh, bend_search_rr *r) { - int count; + zint count = 0; int no_terms; int i; + int type = Z_Term_general; 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 = 0; /* zebra_resultSetTerms (zh, r->setname, 0, 0, 0, 0, 0); */ + /* FIXME - Rsets don't know number of terms no more ??? */ if (!no_terms) return; @@ -129,9 +207,13 @@ 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); + /* FIXME - Can we just skip this ??? */ + /* + 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; sr->elements[i]->fullQuery = odr_malloc (r->stream, @@ -145,18 +227,31 @@ 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 (YLOG_DEBUG, "term as characterString"); + term->which = Z_Term_characterString; + term->u.characterString = odr_strdup (r->stream, outbuf); + break; + case Z_Term_general: + yaz_log (YLOG_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; - sr->elements[i]->subqueryCount = odr_intdup (r->stream, count); + if (count > 2000000000) + count = 2000000000; + sr->elements[i]->subqueryCount = odr_intdup (r->stream, (int) count); sr->elements[i]->subqueryWeight = 0; sr->elements[i]->resultsByDB = 0; } @@ -176,11 +271,11 @@ 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 (YLOG_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, + zebra_search_RPN (zh, r->stream, r->query->u.type_1, r->setname, &r->hits); zebra_result (zh, &r->errcode, &r->errstring); if (!r->errcode) @@ -233,8 +328,17 @@ static int bend_scan (void *handle, bend_scan_rr *r) ZebraHandle zh = (ZebraHandle) handle; int is_partial, i; - zebra_select_databases (zh, r->num_bases, (const char **) r->basenames); - + if (zebra_select_databases (zh, r->num_bases, + (const char **) r->basenames)) + { + zebra_result (zh, &r->errcode, &r->errstring); + return 0; + } + if (r->step_size != 0 && *r->step_size != 0) { + r->errcode = 205; /* "Only zero step size supported for Scan" */ + r->errstring = 0; + return 0; + } r->entries = (struct scan_entry *) odr_malloc (r->stream, sizeof(*r->entries) * r->num_entries); zebra_scan (zh, r->stream, r->term, @@ -284,45 +388,50 @@ int bend_delete (void *handle, bend_delete_rr *rr) static int es_admin_request (ZebraHandle zh, Z_AdminEsRequest *r) { + if (r->toKeep->databaseName) + { + yaz_log(YLOG_LOG, "adm request database %s", r->toKeep->databaseName); + } switch (r->toKeep->which) { case Z_ESAdminOriginPartToKeep_reIndex: - yaz_log(LOG_LOG, "adm-reindex"); + yaz_log(YLOG_LOG, "adm-reindex"); break; case Z_ESAdminOriginPartToKeep_truncate: - yaz_log(LOG_LOG, "adm-truncate"); + yaz_log(YLOG_LOG, "adm-truncate"); break; case Z_ESAdminOriginPartToKeep_drop: - yaz_log(LOG_LOG, "adm-drop"); + yaz_log(YLOG_LOG, "adm-drop"); + zebra_drop_database (zh, r->toKeep->databaseName); break; case Z_ESAdminOriginPartToKeep_create: - yaz_log(LOG_LOG, "adm-create"); - zebra_admin_create (zh, r->toKeep->databaseName); + yaz_log(YLOG_LOG, "adm-create %s", r->toKeep->databaseName); + zebra_create_database (zh, r->toKeep->databaseName); break; case Z_ESAdminOriginPartToKeep_import: - yaz_log(LOG_LOG, "adm-import"); - zebra_admin_import_begin (zh, r->toKeep->databaseName); + yaz_log(YLOG_LOG, "adm-import"); + zebra_admin_import_begin (zh, r->toKeep->databaseName, + r->toKeep->u.import->recordType); break; case Z_ESAdminOriginPartToKeep_refresh: - yaz_log(LOG_LOG, "adm-refresh"); + yaz_log(YLOG_LOG, "adm-refresh"); break; case Z_ESAdminOriginPartToKeep_commit: - yaz_log(LOG_LOG, "adm-commit"); + yaz_log(YLOG_LOG, "adm-commit"); + if (r->toKeep->databaseName) + zebra_select_database(zh, r->toKeep->databaseName); + zebra_commit(zh); break; case Z_ESAdminOriginPartToKeep_shutdown: - yaz_log(LOG_LOG, "shutdown"); + yaz_log(YLOG_LOG, "shutdown"); zebra_admin_shutdown(zh); break; case Z_ESAdminOriginPartToKeep_start: - yaz_log(LOG_LOG, "start"); + yaz_log(YLOG_LOG, "start"); zebra_admin_start(zh); break; default: - yaz_log(LOG_LOG, "unknown admin"); - } - if (r->toKeep->databaseName) - { - yaz_log(LOG_LOG, "database %s", r->toKeep->databaseName); + yaz_log(YLOG_LOG, "unknown admin"); } return 0; } @@ -335,7 +444,7 @@ static int es_admin (ZebraHandle zh, Z_Admin *r) es_admin_request (zh, r->u.esRequest); break; case Z_Admin_taskPackage: - yaz_log (LOG_LOG, "adm taskpackage (unhandled)"); + yaz_log (YLOG_LOG, "adm taskpackage (unhandled)"); break; default: break; @@ -360,14 +469,14 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) { ZebraHandle zh = (ZebraHandle) handle; - yaz_log(LOG_LOG, "function: %d", *rr->esr->function); + yaz_log(YLOG_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); + yaz_log(YLOG_LOG, "packagename: %s", rr->esr->packageName); + yaz_log(YLOG_LOG, "Waitaction: %d", *rr->esr->waitAction); if (!rr->esr->taskSpecificParameters) { - yaz_log (LOG_WARN, "No task specific parameters"); + yaz_log (YLOG_WARN, "No task specific parameters"); } else if (rr->esr->taskSpecificParameters->which == Z_External_ESAdmin) { @@ -375,214 +484,222 @@ 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; - yaz_log (LOG_LOG, "Received DB Update"); + yaz_log (YLOG_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"); + yaz_log (YLOG_LOG, "action"); if (toKeep->action) { switch (*toKeep->action) { case Z_IUOriginPartToKeep_recordInsert: - yaz_log (LOG_LOG, "recordInsert"); + yaz_log (YLOG_LOG, "recordInsert"); break; case Z_IUOriginPartToKeep_recordReplace: - yaz_log (LOG_LOG, "recordUpdate"); + yaz_log (YLOG_LOG, "recordUpdate"); break; case Z_IUOriginPartToKeep_recordDelete: - yaz_log (LOG_LOG, "recordDelete"); + yaz_log (YLOG_LOG, "recordDelete"); break; case Z_IUOriginPartToKeep_elementUpdate: - yaz_log (LOG_LOG, "elementUpdate"); + yaz_log (YLOG_LOG, "elementUpdate"); break; case Z_IUOriginPartToKeep_specialUpdate: - yaz_log (LOG_LOG, "specialUpdate"); + yaz_log (YLOG_LOG, "specialUpdate"); break; case Z_ESAdminOriginPartToKeep_shutdown: - yaz_log (LOG_LOG, "shutDown"); + yaz_log (YLOG_LOG, "shutDown"); break; case Z_ESAdminOriginPartToKeep_start: - yaz_log (LOG_LOG, "start"); + yaz_log (YLOG_LOG, "start"); break; default: - yaz_log (LOG_LOG, " unknown (%d)", *toKeep->action); + yaz_log (YLOG_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; + yaz_log (YLOG_LOG, "database: %s", toKeep->databaseName); + + if (zebra_select_database(zh, toKeep->databaseName)) + return 0; } + else + { + yaz_log (YLOG_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 *opaque_recid = 0; + SYSNO sysno = 0; + if (notToKeep->elements[i]->u.opaque) + { + switch(notToKeep->elements[i]->which) + { + case Z_IUSuppliedRecords_elem_opaque: + opaque_recid = notToKeep->elements[i]->u.opaque; + break; /* OK, recid already set */ + case Z_IUSuppliedRecords_elem_number: + sysno = *notToKeep->elements[i]->u.number; + 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, + yaz_log (YLOG_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 ...", + yaz_log (YLOG_LOG, "%d bytes:\n%.168s ...", rec->u.sutrs->len, rec->u.sutrs->buf); else - yaz_log (LOG_LOG, "%d bytes:\n%s", + yaz_log (YLOG_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 ...", + yaz_log (YLOG_LOG, "%d bytes:\n%.168s ...", rec->u.octet_aligned->len, rec->u.octet_aligned->buf); else - yaz_log (LOG_LOG, "%d bytes\n%s", + yaz_log (YLOG_LOG, "%d bytes\n%s", 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 = 4; + + if (!action) + { + rr->errcode = 224; + rr->errstring = "unsupported ES Update action"; + break; + } + else if (opaque_recid) + { + int r = zebra_admin_exchange_record ( + zh, + rec->u.octet_aligned->buf, + rec->u.octet_aligned->len, + opaque_recid->buf, opaque_recid->len, + action); + if (r) + { + rr->errcode = 224; + rr->errstring = "record exchange failed"; + break; + } + } + else + { + int r = -1; + switch(action) { + case 1: + r = zebra_insert_record( + zh, + 0, /* recordType */ + &sysno, + 0, /* match */ + 0, /* fname */ + rec->u.octet_aligned->buf, + rec->u.octet_aligned->len, + 0); + if (r) + { + rr->errcode = 224; + rr->errstring = "insert_record failed"; + } + break; + case 2: + case 4: + r = zebra_update_record( + zh, + 0, /* recordType */ + &sysno, + 0, /* match */ + 0, /* fname */ + rec->u.octet_aligned->buf, + rec->u.octet_aligned->len, + 1); + if (r) + { + rr->errcode = 224; + rr->errstring = "update_record failed"; + } + break; + case 3: + r = zebra_delete_record( + zh, + 0, /* recordType */ + &sysno, + 0, /* match */ + 0, /* fname */ + rec->u.octet_aligned->buf, + rec->u.octet_aligned->len, + 0); + if (r) + { + rr->errcode = 224; + rr->errstring = "delete_record failed"; + } + break; + } + } + } } + zebra_end_trans (zh); } } } else { - yaz_log (LOG_WARN, "Unknown Extended Service(%d)", + yaz_log (YLOG_WARN, "Unknown Extended Service(%d)", rr->esr->taskSpecificParameters->which); + rr->errcode = 221; } return 0; @@ -590,32 +707,71 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) 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 (YLOG_FATAL, "Failed to read config `%s'", sob->configname); + exit (1); + } #ifdef WIN32 #else if (!sob->inetd) { - char *pidfile = "zebrasrv.pid"; - int fd = creat (pidfile, 0666); + char pidfname[4096]; + struct flock area; + int fd; + + zebra_pidfname(sob->handle, pidfname); + + fd = open (pidfname, O_EXCL|O_WRONLY|O_CREAT, 0666); if (fd == -1) - logf (LOG_WARN|LOG_ERRNO, "creat %s", pidfile); + { + if (errno != EEXIST) + { + yaz_log(YLOG_FATAL|YLOG_ERRNO, "lock file %s", pidfname); + exit(1); + } + fd = open(pidfname, O_RDWR, 0666); + if (fd == -1) + { + yaz_log(YLOG_FATAL|YLOG_ERRNO, "lock file %s", pidfname); + exit(1); + } + } + area.l_type = F_WRLCK; + area.l_whence = SEEK_SET; + area.l_len = area.l_start = 0L; + if (fcntl (fd, F_SETLK, &area) == -1) + { + yaz_log(YLOG_ERRNO|YLOG_FATAL, "Zebra server already running"); + exit(1); + } 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) { +#ifdef WIN32 + +#else + if (!sob->inetd && sob->handle) + { + char pidfname[4096]; + zebra_pidfname(sob->handle, pidfname); + unlink (pidfname); + } +#endif if (sob->handle) { ZebraService service = sob->handle; @@ -631,7 +787,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);