X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=ceeb56f684d417faad174494389fc89f1b12b774;hb=c33ea56e3771c3b80ba66ef8fda3a09cad171ebb;hp=7d992aef05a38d35066119b24191f08e31dfcfba;hpb=65120d727892457382342a9efc7bee7da1e27d07;p=idzebra-moved-to-github.git diff --git a/index/zserver.c b/index/zserver.c index 7d992ae..ceeb56f 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -1,6 +1,6 @@ -/* $Id: zserver.c,v 1.101 2003-01-13 10:56:09 oleg Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 - Index Data Aps +/* $Id: zserver.c,v 1.149 2006-08-14 10:40:15 adam Exp $ + Copyright (C) 1995-2006 + Index Data ApS This file is part of the Zebra server. @@ -15,25 +15,31 @@ 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. -*/ - +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ -#include #include +#include +#include #include #ifdef WIN32 #include #include -#else +#include +#endif +#if HAVE_UNISTD_H #include #endif +#include #include #include +#include +#include + +#include #include "zserver.h" @@ -67,15 +73,16 @@ 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 (YLOG_DEBUG, "bend_init"); sob = statserv_getcontrol (); - if (!(zh = zebra_open (sob->handle))) + if (!(zh = zebra_open (sob->handle, 0))) { - yaz_log (LOG_WARN, "Failed to read config `%s'", sob->configname); - r->errcode = 1; + yaz_log (YLOG_WARN, "Failed to read config `%s'", sob->configname); + r->errcode = YAZ_BIB1_PERMANENT_SYSTEM_ERROR; return r; } + r->handle = zh; if (q->auth) { if (q->auth->which == Z_IdAuthentication_open) @@ -90,15 +97,20 @@ 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)) + if (zebra_auth(zh, user, passwd) != ZEBRA_OK) { - r->errcode = 222; + r->errcode = YAZ_BIB1_INIT_AC_BAD_USERID_AND_OR_PASSWORD; r->errstring = user; - zebra_close (zh); return r; } - r->handle = zh; if (q->charneg_request) /* characater set and langauge negotiation? */ { char **charsets = 0; @@ -107,75 +119,68 @@ bend_initresult *bend_init (bend_initrequest *q) int num_langs = 0; int selected = 0; int i; - char *right_name; + NMEM nmem = nmem_create(); - NMEM nmem = nmem_create (); - yaz_log (LOG_LOG, "character set and language negotiation"); + yaz_log (YLOG_LOG, "character set and language negotiation"); yaz_get_proposal_charneg (nmem, q->charneg_request, &charsets, &num_charsets, &langs, &num_langs, &selected); - - right_name = (char *)nmem_malloc(nmem, 32); - + for (i = 0; i < num_charsets; i++) { - *right_name = '\0'; - + 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")) { - strcpy(right_name, "WINDOWS-1251"); - } else if (!yaz_matchstr(charsets[i], "koi")) { - strcpy(right_name, "KOI8-R"); + right_name = "WINDOWS-1251"; + } else if (!yaz_matchstr(charsets[i], "koi")) { + right_name = "KOI8-R"; } else if (!yaz_matchstr(charsets[i], "iso")) { - strcpy(right_name, "ISO-8859-5"); + right_name = "ISO-8859-5"; } else if (!yaz_matchstr(charsets[i], "dos")) { - strcpy(right_name, "CP866"); - } else if (!yaz_matchstr(charsets[i], "uni")) { - strcpy(right_name, "UTF-8"); - } else { - strcpy(right_name, charsets[i]); - } - - logf (LOG_LOG, "charset %d %s (right name is %s)", i, - charsets[i], right_name); - - if (odr_set_charset (q->decode, "UTF-8", right_name) == 0) - { - odr_set_charset (q->stream, right_name, "UTF-8"); - if (selected) - zebra_record_encoding (zh, right_name); + 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); + zebra_octet_term_encoding(zh, right_name); q->charneg_response = - yaz_set_response_charneg (q->stream, right_name, + yaz_set_response_charneg (q->stream, charsets[i], 0, selected); break; } else { - yaz_log(LOG_LOG, "odr_set_charset(): charset name %s unsupported", - right_name); + yaz_log (YLOG_LOG, "charset %d %s (proper name %s): unsupported", i, + charsets[i], right_name); } } - nmem_destroy (nmem); + nmem_destroy(nmem); } return r; } -static void search_terms (ZebraHandle zh, bend_search_rr *r) +static void search_terms(ZebraHandle zh, bend_search_rr *r) { - int count; int no_terms; int i; - int type; + int type = Z_Term_general; struct Z_External *ext; Z_SearchInfoReport *sr; - /* get no of terms for result set */ - no_terms = zebra_resultSetTerms (zh, r->setname, 0, 0, 0, 0, 0); + zebra_result_set_term_no(zh, r->setname, &no_terms); if (!no_terms) return; @@ -202,34 +207,37 @@ static void search_terms (ZebraHandle zh, bend_search_rr *r) sizeof(*sr->elements)); for (i = 0; isetname, 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, - sizeof(bool_t)); - *sr->elements[i]->fullQuery = 0; - sr->elements[i]->subqueryExpression = + const char *term_ref_id = 0; + + zebra_result_set_term_info(zh, r->setname, i, + &count, &approx, outbuf, &len, + &term_ref_id); + se = sr->elements[i] = odr_malloc (r->stream, sizeof(**sr->elements)); + se->subqueryId = term_ref_id ? + odr_strdup(r->stream, term_ref_id) : 0; + + se->fullQuery = odr_intdup(r->stream, 0); + se->subqueryExpression = odr_malloc (r->stream, sizeof(Z_QueryExpression)); - sr->elements[i]->subqueryExpression->which = + se->subqueryExpression->which = Z_QueryExpression_term; - sr->elements[i]->subqueryExpression->u.term = + se->subqueryExpression->u.term = odr_malloc (r->stream, sizeof(Z_QueryExpressionTerm)); term = odr_malloc (r->stream, sizeof(Z_Term)); - sr->elements[i]->subqueryExpression->u.term->queryTerm = term; + se->subqueryExpression->u.term->queryTerm = term; 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; @@ -240,45 +248,52 @@ static void search_terms (ZebraHandle zh, bend_search_rr *r) 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); - sr->elements[i]->subqueryWeight = 0; - sr->elements[i]->resultsByDB = 0; + se->subqueryExpression->u.term->termComment = 0; + se->subqueryInterpretation = 0; + se->subqueryRecommendation = 0; + if (count > 2147483646) + count = 2147483647; + se->subqueryCount = odr_intdup(r->stream, CAST_ZINT_TO_INT(count)); + se->subqueryWeight = 0; + se->resultsByDB = 0; } } -int bend_search (void *handle, bend_search_rr *r) +int bend_search(void *handle, bend_search_rr *r) { ZebraHandle zh = (ZebraHandle) handle; + zint zhits = 0; + ZEBRA_RES res; - r->hits = 0; - r->errcode = 0; - r->errstring = NULL; - - if (zebra_select_databases (zh, r->num_bases, - (const char **) r->basenames)) + res = zebra_select_databases (zh, r->num_bases, + (const char **) r->basenames); + if (res != ZEBRA_OK) { zebra_result (zh, &r->errcode, &r->errstring); return 0; } - logf (LOG_LOG, "ResultSet '%s'", r->setname); + yaz_log (YLOG_DEBUG, "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->setname, &r->hits); - zebra_result (zh, &r->errcode, &r->errstring); - if (!r->errcode) + res = zebra_search_RPN(zh, r->stream, r->query->u.type_1, + r->setname, &zhits); + if (res != ZEBRA_OK) + zebra_result(zh, &r->errcode, &r->errstring); + else + { + if (zhits > 2147483646) + zhits = 2147483647; + r->hits = CAST_ZINT_TO_INT(zhits); search_terms (zh, r); + } break; case Z_Query_type_2: - r->errcode = 107; + r->errcode = YAZ_BIB1_QUERY_TYPE_UNSUPP; r->errstring = "type-2"; break; default: - r->errcode = 107; + r->errcode = YAZ_BIB1_QUERY_TYPE_UNSUPP; } return 0; } @@ -288,24 +303,28 @@ int bend_fetch (void *handle, bend_fetch_rr *r) { ZebraHandle zh = (ZebraHandle) handle; ZebraRetrievalRecord retrievalRecord; + ZEBRA_RES res; retrievalRecord.position = r->number; r->last_in_set = 0; - zebra_records_retrieve (zh, r->stream, r->setname, r->comp, - r->request_format, 1, &retrievalRecord); - zebra_result (zh, &r->errcode, &r->errstring); - /* non Surrogate Diagnostic OR Surrogate Diagnostic */ - if (r->errcode == 0 && retrievalRecord.errCode) + res = zebra_records_retrieve (zh, r->stream, r->setname, r->comp, + r->request_format, 1, &retrievalRecord); + if (res != ZEBRA_OK) { + /* non-surrogate diagnostic */ + zebra_result (zh, &r->errcode, &r->errstring); + } + else if (retrievalRecord.errCode) + { + /* surrogate diagnostic (diagnostic per record) */ r->surrogate_flag = 1; r->errcode = retrievalRecord.errCode; r->errstring = retrievalRecord.errString; r->basename = retrievalRecord.base; } - else if (r->errcode == 0) /* Database Record */ + else { - r->errcode = 0; r->basename = retrievalRecord.base; r->record = retrievalRecord.buf; r->len = retrievalRecord.len; @@ -319,29 +338,45 @@ static int bend_scan (void *handle, bend_scan_rr *r) ZebraScanEntry *entries; ZebraHandle zh = (ZebraHandle) handle; int is_partial, i; + ZEBRA_RES res; - if (zebra_select_databases (zh, r->num_bases, - (const char **) r->basenames)) + res = zebra_select_databases(zh, r->num_bases, + (const char **) r->basenames); + if (res != ZEBRA_OK) { zebra_result (zh, &r->errcode, &r->errstring); return 0; } + if (r->step_size != 0 && *r->step_size != 0) { + r->errcode = YAZ_BIB1_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, - r->attributeset, - &r->term_position, - &r->num_entries, &entries, &is_partial); - if (is_partial) - r->status = BEND_SCAN_PARTIAL; + res = zebra_scan(zh, r->stream, r->term, + r->attributeset, + &r->term_position, + &r->num_entries, &entries, &is_partial, + 0 /* setname */); + if (res == ZEBRA_OK) + { + if (is_partial) + r->status = BEND_SCAN_PARTIAL; + else + r->status = BEND_SCAN_SUCCESS; + for (i = 0; i < r->num_entries; i++) + { + r->entries[i].term = entries[i].term; + r->entries[i].occurrences = + CAST_ZINT_TO_INT(entries[i].occurrences); + } + } else - r->status = BEND_SCAN_SUCCESS; - for (i = 0; i < r->num_entries; i++) { - r->entries[i].term = entries[i].term; - r->entries[i].occurrences = entries[i].occurrences; + r->status = BEND_SCAN_PARTIAL; + zebra_result(zh, &r->errcode, &r->errstring); } - zebra_result (zh, &r->errcode, &r->errstring); return 0; } @@ -356,10 +391,11 @@ int bend_sort (void *handle, bend_sort_rr *rr) { ZebraHandle zh = (ZebraHandle) handle; - zebra_sort (zh, rr->stream, - rr->num_input_setnames, (const char **) rr->input_setnames, - rr->output_setname, rr->sort_sequence, &rr->sort_status); - zebra_result (zh, &rr->errcode, &rr->errstring); + if (zebra_sort (zh, rr->stream, + rr->num_input_setnames, (const char **) rr->input_setnames, + rr->output_setname, rr->sort_sequence, &rr->sort_status) + != ZEBRA_OK) + zebra_result (zh, &rr->errcode, &rr->errstring); return 0; } @@ -367,73 +403,88 @@ int bend_delete (void *handle, bend_delete_rr *rr) { ZebraHandle zh = (ZebraHandle) handle; - rr->delete_status = zebra_deleleResultSet(zh, rr->function, + rr->delete_status = zebra_deleteResultSet(zh, rr->function, rr->num_setnames, rr->setnames, rr->statuses); return 0; } -static int es_admin_request (ZebraHandle zh, Z_AdminEsRequest *r) +static void es_admin_request (bend_esrequest_rr *rr, ZebraHandle zh, Z_AdminEsRequest *r) { + ZEBRA_RES res = ZEBRA_OK; + 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"); + rr->errcode = YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED; + rr->errstring = "adm-reindex not implemented yet"; break; case Z_ESAdminOriginPartToKeep_truncate: - yaz_log(LOG_LOG, "adm-truncate"); + rr->errcode = YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED; + rr->errstring = "adm-reindex not implemented yet"; + yaz_log(YLOG_LOG, "adm-truncate"); break; case Z_ESAdminOriginPartToKeep_drop: - yaz_log(LOG_LOG, "adm-drop"); + yaz_log(YLOG_LOG, "adm-drop"); + res = zebra_drop_database (zh, r->toKeep->databaseName); break; case Z_ESAdminOriginPartToKeep_create: - yaz_log(LOG_LOG, "adm-create %s", r->toKeep->databaseName); - zebra_admin_create (zh, r->toKeep->databaseName); + yaz_log(YLOG_LOG, "adm-create %s", r->toKeep->databaseName); + res = 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, - r->toKeep->u.import->recordType); + yaz_log(YLOG_LOG, "adm-import"); + res = 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) + { + if (zebra_select_database(zh, r->toKeep->databaseName) != + ZEBRA_OK) + yaz_log(YLOG_WARN, "zebra_select_database failed in " + "adm-commit"); + } + zebra_commit(zh); break; case Z_ESAdminOriginPartToKeep_shutdown: - yaz_log(LOG_LOG, "shutdown"); - zebra_admin_shutdown(zh); + yaz_log(YLOG_LOG, "shutdown"); + res = 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"); + rr->errcode = YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED; + rr->errstring = "adm-reindex not implemented yet"; } - return 0; + if (res != ZEBRA_OK) + zebra_result(zh, &rr->errcode, &rr->errstring); } -static int es_admin (ZebraHandle zh, Z_Admin *r) +static void es_admin (bend_esrequest_rr *rr, 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; + es_admin_request (rr, zh, r->u.esRequest); + return; default: break; } - - return 0; + yaz_log (YLOG_WARN, "adm taskpackage (unhandled)"); + rr->errcode = YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED; + rr->errstring = "adm-task package (unhandled)"; } int bend_segment (void *handle, bend_segment_rr *rr) @@ -452,131 +503,134 @@ 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) { - es_admin (zh, rr->esr->taskSpecificParameters->u.adminService); - - zebra_result (zh, &rr->errcode, &rr->errstring); + es_admin(rr, zh, rr->esr->taskSpecificParameters->u.adminService); } 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); + yaz_log (YLOG_LOG, "database: %s", toKeep->databaseName); if (zebra_select_database(zh, toKeep->databaseName)) return 0; } else { - yaz_log (LOG_WARN, "no database supplied for ES Update"); - rr->errcode = 1008; + yaz_log (YLOG_WARN, "no database supplied for ES Update"); + rr->errcode = + YAZ_BIB1_ES_MISSING_MANDATORY_PARAMETER_FOR_SPECIFIED_FUNCTION_; rr->errstring = "database"; return 0; } - if (notToKeep) + if (zebra_begin_trans(zh, 1) != ZEBRA_OK) + { + zebra_result(zh, &rr->errcode, &rr->errstring); + } + else { int i; - zebra_begin_trans (zh); - for (i = 0; i < notToKeep->num; i++) + for (i = 0; notToKeep && i < notToKeep->num; i++) { Z_External *rec = notToKeep->elements[i]->record; struct oident *oident = 0; - Odr_oct *recid = notToKeep->elements[i]->u.opaque; + Odr_oct *opaque_recid = 0; + SYSNO *sysno = 0; + SYSNO sysno_tmp; - 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 (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_tmp = *notToKeep->elements[i]->u.number; + sysno = &sysno_tmp; + break; + } } - if (rec->direct_reference) { 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->errcode = YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED; rr->errstring = "only XML update supported"; break; } @@ -595,50 +649,104 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) action = 3; if (*toKeep->action == Z_IUOriginPartToKeep_specialUpdate) - action = 1; + action = 4; if (!action) { - rr->errcode = 224; + rr->errcode = + YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED; rr->errstring = "unsupported ES Update action"; break; } - else - { + else if (opaque_recid) + { int r = zebra_admin_exchange_record ( - zh, toKeep->databaseName, - rec->u.octet_aligned->buf, + zh, + (const char *) rec->u.octet_aligned->buf, rec->u.octet_aligned->len, - recid->buf, recid->len, + (const char *) opaque_recid->buf, + opaque_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"; + zebra_result(zh, &rr->errcode, + &rr->errstring); break; } - } + } + else + { + ZEBRA_RES r = ZEBRA_FAIL; + switch(action) { + case 1: + r = zebra_insert_record( + zh, + 0, /* recordType */ + sysno, + 0, /* match */ + 0, /* fname */ + (const char *) rec->u.octet_aligned->buf, + rec->u.octet_aligned->len, + 0); + if (r == ZEBRA_FAIL) + { + rr->errcode = + YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED; + rr->errstring = "insert_record failed"; + } + break; + case 2: + case 4: + r = zebra_update_record( + zh, + 0, /* recordType */ + sysno, + 0, /* match */ + 0, /* fname */ + (const char *) rec->u.octet_aligned->buf, + rec->u.octet_aligned->len, + 1); + if (r == ZEBRA_FAIL) + { + rr->errcode = + YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED; + rr->errstring = "update_record failed"; + } + break; + case 3: + r = zebra_delete_record( + zh, + 0, /* recordType */ + sysno, + 0, /* match */ + 0, /* fname */ + (const char *) rec->u.octet_aligned->buf, + rec->u.octet_aligned->len, + 0); + if (r == ZEBRA_FAIL) + { + rr->errcode = + YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED; + rr->errstring = "delete_record failed"; + } + break; + } + } } } - zebra_end_trans (zh); + if (zebra_end_trans (zh) != ZEBRA_OK) + { + yaz_log(YLOG_WARN, "zebra_end_trans failed for" + " extended service operation"); + } } } } else { - yaz_log (LOG_WARN, "Unknown Extended Service(%d)", + yaz_log (YLOG_WARN, "Unknown Extended Service(%d)", rr->esr->taskSpecificParameters->which); - rr->errcode = 221; + rr->errcode = YAZ_BIB1_ES_EXTENDED_SERVICE_TYPE_UNSUPP; } return 0; @@ -646,33 +754,57 @@ 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); - 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) @@ -680,14 +812,12 @@ static void bend_stop(struct statserv_options_block *sob) #ifdef WIN32 #else - /* - * Fixme! Why commets?, because the first chaild process to invoke bend_stop(). - * - - if (!sob->inetd) - unlink ("zebrasrv.pid"); - */ - + if (!sob->inetd && sob->handle) + { + char pidfname[4096]; + zebra_pidfname(sob->handle, pidfname); + unlink (pidfname); + } #endif if (sob->handle) { @@ -711,3 +841,11 @@ int main (int argc, char **argv) return statserv_main (argc, argv, bend_init, bend_close); } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +