X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzserver.c;h=cfdd3dd5dd1bffcccc12ec76673077d6229154c2;hp=de9ec00a9e55cb7c202b85399565d74c9f29a266;hb=519fefb91135ad52134b9fc4e82b3874f5525a2b;hpb=c41c84a497ae744aa825a90f144c85b54f1cd4bb diff --git a/index/zserver.c b/index/zserver.c index de9ec00..cfdd3dd 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -1,276 +1,26 @@ -/* - * Copyright (C) 1995-1999, Index Data - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: zserver.c,v $ - * Revision 1.77 2000-03-20 19:08:36 adam - * Added remote record import using Z39.50 extended services and Segment - * Requests. - * - * Revision 1.76 2000/03/15 15:00:31 adam - * First work on threaded version. - * - * Revision 1.75 1999/11/30 13:48:04 adam - * Improved installation. Updated for inclusion of YAZ header files. - * - * Revision 1.74 1999/11/29 15:13:26 adam - * Server sets implementationName - and Version. - * - * Revision 1.73 1999/11/04 15:00:45 adam - * Implemented delete result set(s). - * - * Revision 1.71 1999/07/14 10:59:26 adam - * Changed functions isc_getmethod, isams_getmethod. - * Improved fatal error handling (such as missing EXPLAIN schema). - * - * Revision 1.70 1999/06/10 12:14:56 adam - * Fixed to use bend_start instead of pre_init. - * - * Revision 1.69 1999/06/10 09:20:03 adam - * Minor change to pre_init handler. - * - * Revision 1.68 1999/05/26 07:49:13 adam - * C++ compilation. - * - * Revision 1.67 1999/02/02 14:51:14 adam - * Updated WIN32 code specific sections. Changed header. - * - * Revision 1.66 1998/10/28 10:54:41 adam - * SDRKit integration. - * - * Revision 1.65 1998/10/18 07:54:54 adam - * Additional info added for diagnostics 114 (Unsupported use attribute) and - * 121 (Unsupported attribute set). - * - * Revision 1.64 1998/09/22 10:48:21 adam - * Minor changes in search API. - * - * Revision 1.63 1998/09/02 13:53:21 adam - * Extra parameter decode added to search routines to implement - * persistent queries. - * - * Revision 1.62 1998/08/06 14:35:28 adam - * Routine bend_deleterequest removed. - * - * Revision 1.61 1998/06/24 12:16:15 adam - * Support for relations on text operands. Open range support in - * DFA module (i.e. [-j], [g-]). - * - * Revision 1.60 1998/06/22 11:36:49 adam - * Added authentication check facility to zebra. - * - * Revision 1.59 1998/06/12 12:22:13 adam - * Work on Zebra API. - * - * Revision 1.58 1998/05/27 16:57:46 adam - * Zebra returns surrogate diagnostic for single records when - * appropriate. - * - * Revision 1.57 1998/04/03 14:45:18 adam - * Fixed setting of last_in_set in bend_fetch. - * - * Revision 1.56 1998/03/05 08:45:13 adam - * New result set model and modular ranking system. Moved towards - * descent server API. System information stored as "SGML" records. - * - * Revision 1.55 1998/02/10 12:03:06 adam - * Implemented Sort. - * - * Revision 1.54 1998/01/29 13:39:13 adam - * Compress ISAM is default. - * - * Revision 1.53 1998/01/12 15:04:09 adam - * The test option (-s) only uses read-lock (and not write lock). - * - * Revision 1.52 1997/11/18 10:05:08 adam - * Changed character map facility so that admin can specify character - * mapping files for each register type, w, p, etc. - * - * Revision 1.51 1997/10/27 14:33:06 adam - * Moved towards generic character mapping depending on "structure" - * field in abstract syntax file. Fixed a few memory leaks. Fixed - * bug with negative integers when doing searches with relational - * operators. - * - * Revision 1.50 1997/09/29 09:08:36 adam - * Revised locking system to be thread safe for the server. - * - * Revision 1.49 1997/09/25 14:57:23 adam - * Windows NT port. - * - * Revision 1.48 1997/09/17 12:19:19 adam - * Zebra version corresponds to YAZ version 1.4. - * Changed Zebra server so that it doesn't depend on global common_resource. - * - * Revision 1.47 1997/09/04 13:58:36 adam - * New retrieve/extract method tellf (added). - * Added O_BINARY for open calls. - * - * Revision 1.46 1997/07/28 08:30:47 adam - * Server returns diagnostic 14 when record doesn't exist. - * - * Revision 1.45 1996/12/23 15:30:45 adam - * Work on truncation. - * Bug fix: result sets weren't deleted after server shut down. - * - * Revision 1.44 1996/12/11 12:08:01 adam - * Added better compression. - * - * Revision 1.43 1996/11/15 15:03:58 adam - * Logging of execution speed by using the times(2) call. - * - * Revision 1.42 1996/11/08 11:10:36 adam - * Buffers used during file match got bigger. - * Compressed ISAM support everywhere. - * Bug fixes regarding masking characters in queries. - * Redesigned Regexp-2 queries. - * - * Revision 1.41 1996/10/29 14:09:56 adam - * Use of cisam system - enabled if setting isamc is 1. - * - * Revision 1.40 1996/06/04 10:19:02 adam - * Minor changes - removed include of ctype.h. - * - * Revision 1.39 1996/05/31 09:07:05 quinn - * Work on character-set handling - * - * Revision 1.38 1996/05/14 11:34:01 adam - * Scan support in multiple registers/databases. - * - * Revision 1.37 1996/05/14 06:16:48 adam - * Compact use/set bytes used in search service. - * - * Revision 1.36 1996/05/01 13:46:37 adam - * First work on multiple records in one file. - * New option, -offset, to the "unread" command in the filter module. - * - * Revision 1.35 1996/03/26 16:01:14 adam - * New setting lockPath: directory of various lock files. - * - * Revision 1.34 1996/03/20 09:36:46 adam - * Function dict_lookup_grep got extra parameter, init_pos, which marks - * from which position in pattern approximate pattern matching should occur. - * Approximate pattern matching is used in relevance=re-2. - * - * Revision 1.33 1996/01/17 14:57:56 adam - * Prototype changed for reader functions in extract/retrieve. File - * is identified by 'void *' instead of 'int. - * - * Revision 1.32 1995/12/11 09:12:58 adam - * The rec_get function returns NULL if record doesn't exist - will - * happen in the server if the result set records have been deleted since - * the creation of the set (i.e. the search). - * The server saves a result temporarily if it is 'volatile', i.e. the - * set is register dependent. - * - * Revision 1.31 1995/12/08 16:22:56 adam - * Work on update while servers are running. Three lock files introduced. - * The servers reload their registers when necessary, but they don't - * reestablish result sets yet. - * - * Revision 1.30 1995/12/07 17:38:48 adam - * Work locking mechanisms for concurrent updates/commit. - * - * Revision 1.29 1995/12/04 14:22:32 adam - * Extra arg to recType_byName. - * Started work on new regular expression parsed input to - * structured records. - * - * Revision 1.28 1995/11/28 09:09:48 adam - * Zebra config renamed. - * Use setting 'recordId' to identify record now. - * Bug fix in recindex.c: rec_release_blocks was invokeded even - * though the blocks were already released. - * File traversal properly deletes records when needed. - * - * Revision 1.27 1995/11/27 13:58:54 adam - * New option -t. storeStore data implemented in server. - * - * Revision 1.26 1995/11/25 10:24:07 adam - * More record fields - they are enumerated now. - * New options: flagStoreData flagStoreKey. - * - * Revision 1.25 1995/11/21 15:29:13 adam - * Config file 'base' read by default by both indexer and server. - * - * Revision 1.24 1995/11/20 16:59:47 adam - * New update method: the 'old' keys are saved for each records. - * - * Revision 1.23 1995/11/16 17:00:56 adam - * Better logging of rpn query. - * - * Revision 1.22 1995/11/16 15:34:55 adam - * Uses new record management system in both indexer and server. - * - * Revision 1.21 1995/11/01 16:25:52 quinn - * *** empty log message *** - * - * Revision 1.20 1995/10/27 14:00:12 adam - * Implemented detection of database availability. - * - * Revision 1.19 1995/10/17 18:02:11 adam - * New feature: databases. Implemented as prefix to words in dictionary. - * - * Revision 1.18 1995/10/16 14:03:09 quinn - * Changes to support element set names and espec1 - * - * Revision 1.17 1995/10/16 09:32:40 adam - * More work on relational op. - * - * Revision 1.16 1995/10/13 12:26:44 adam - * Optimization of truncation. - * - * Revision 1.15 1995/10/12 12:40:55 adam - * Bug fixes in rpn_prox. - * - * Revision 1.14 1995/10/09 16:18:37 adam - * Function dict_lookup_grep got extra client data parameter. - * - * Revision 1.13 1995/10/06 14:38:00 adam - * New result set method: r_score. - * Local no (sysno) and score is transferred to retrieveCtrl. - * - * Revision 1.12 1995/10/06 13:52:06 adam - * Bug fixes. Handler may abort further scanning. - * - * Revision 1.11 1995/10/06 10:43:57 adam - * Scan added. 'occurrences' in scan entries not set yet. - * - * Revision 1.10 1995/10/02 16:43:32 quinn - * Set default resulting record type in fetch. - * - * Revision 1.9 1995/10/02 15:18:52 adam - * New member in recRetrieveCtrl: diagnostic. - * - * Revision 1.8 1995/09/28 09:19:47 adam - * xfree/xmalloc used everywhere. - * Extract/retrieve method seems to work for text records. - * - * Revision 1.7 1995/09/27 16:17:32 adam - * More work on retrieve. - * - * Revision 1.6 1995/09/08 08:53:22 adam - * Record buffer maintained in server_info. - * - * Revision 1.5 1995/09/06 16:11:18 adam - * Option: only one word key per file. - * - * Revision 1.4 1995/09/06 10:33:04 adam - * More work on present. Some log messages removed. - * - * Revision 1.3 1995/09/05 15:28:40 adam - * More work on search engine. - * - * Revision 1.2 1995/09/04 12:33:43 adam - * Various cleanup. YAZ util used instead. - * - * Revision 1.1 1995/09/04 09:10:41 adam - * More work on index add/del/update. - * Merge sort implemented. - * Initial work on z39 server. - * - */ +/* $Id: zserver.c,v 1.100 2002-10-22 12:51:08 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 @@ -282,24 +32,18 @@ #include #endif -#include -#ifdef ASN_COMPILED +#include #include -#endif #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); static int bend_segment (void *handle, bend_segment_rr *rr); +static int bend_search (void *handle, bend_search_rr *r); +static int bend_fetch (void *handle, bend_fetch_rr *r); +static int bend_scan (void *handle, bend_scan_rr *r); bend_initresult *bend_init (bend_initrequest *q) { @@ -316,16 +60,19 @@ bend_initresult *bend_init (bend_initrequest *q) q->bend_delete = bend_delete; q->bend_esrequest = bend_esrequest; q->bend_segment = bend_segment; + q->bend_search = bend_search; + q->bend_fetch = bend_fetch; + q->bend_scan = bend_scan; - q->implementation_name = "Z'mbol Information Server"; - q->implementation_version = "Z'mbol 1.0"; + q->implementation_name = "Zebra Information Server"; + q->implementation_version = "Zebra " ZEBRAVER; logf (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; } @@ -344,7 +91,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; @@ -352,28 +99,148 @@ 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; } -bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd) +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 */ + no_terms = zebra_resultSetTerms (zh, r->setname, 0, 0, 0, 0, 0); + if (!no_terms) + return; + + r->search_info = odr_malloc (r->stream, sizeof(*r->search_info)); + + r->search_info->num_elements = 1; + r->search_info->list = + odr_malloc (r->stream, sizeof(*r->search_info->list)); + r->search_info->list[0] = + odr_malloc (r->stream, sizeof(**r->search_info->list)); + r->search_info->list[0]->category = 0; + r->search_info->list[0]->which = Z_OtherInfo_externallyDefinedInfo; + ext = odr_malloc (r->stream, sizeof(*ext)); + r->search_info->list[0]->information.externallyDefinedInfo = ext; + ext->direct_reference = + yaz_oidval_to_z3950oid (r->stream, CLASS_USERINFO, VAL_SEARCHRES1); + ext->indirect_reference = 0; + ext->descriptor = 0; + ext->which = Z_External_searchResult1; + sr = odr_malloc (r->stream, sizeof(Z_SearchInfoReport)); + ext->u.searchResult1 = sr; + sr->num = no_terms; + sr->elements = odr_malloc (r->stream, sr->num * + 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 = + odr_malloc (r->stream, sizeof(Z_QueryExpression)); + sr->elements[i]->subqueryExpression->which = + Z_QueryExpression_term; + sr->elements[i]->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; + 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; + sr->elements[i]->subqueryCount = odr_intdup (r->stream, count); + sr->elements[i]->subqueryWeight = 0; + sr->elements[i]->resultsByDB = 0; + } +} + +int bend_search (void *handle, bend_search_rr *r) { ZebraHandle zh = (ZebraHandle) handle; - bend_searchresult *r = (bend_searchresult *) - odr_malloc (q->stream, sizeof(*r)); r->hits = 0; r->errcode = 0; r->errstring = NULL; - logf (LOG_LOG, "ResultSet '%s'", q->setname); - switch (q->query->which) + if (zebra_select_databases (zh, r->num_bases, + (const char **) r->basenames)) + { + zebra_result (zh, &r->errcode, &r->errstring); + return 0; + } + logf (LOG_LOG, "ResultSet '%s'", r->setname); + switch (r->query->which) { case Z_Query_type_1: case Z_Query_type_101: - zebra_search_rpn (zh, q->decode, q->stream, q->query->u.type_1, - q->num_bases, q->basenames, q->setname); - r->errcode = zh->errCode; - r->errstring = zh->errString; - r->hits = zh->hits; + 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) + search_terms (zh, r); break; case Z_Query_type_2: r->errcode = 107; @@ -382,60 +249,56 @@ bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd) default: r->errcode = 107; } - return r; + return 0; } -bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num) + +int bend_fetch (void *handle, bend_fetch_rr *r) { ZebraHandle zh = (ZebraHandle) handle; - bend_fetchresult *r = (bend_fetchresult *) - odr_malloc (q->stream, sizeof(*r)); ZebraRetrievalRecord retrievalRecord; - retrievalRecord.position = q->number; + retrievalRecord.position = r->number; r->last_in_set = 0; - zebra_records_retrieve (zh, q->stream, q->setname, q->comp, - q->format, 1, &retrievalRecord); - if (zh->errCode) /* non Surrogate Diagnostic */ - { - r->errcode = zh->errCode; - r->errstring = zh->errString; - } - else if (retrievalRecord.errCode) /* Surrogate Diagnostic */ + 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) { - q->surrogate_flag = 1; + 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; r->record = retrievalRecord.buf; r->len = retrievalRecord.len; - r->format = retrievalRecord.format; + r->output_format = retrievalRecord.format; } - return r; + return 0; } -bend_scanresult *bend_scan (void *handle, bend_scanrequest *q, int *num) +static int bend_scan (void *handle, bend_scan_rr *r) { ZebraScanEntry *entries; ZebraHandle zh = (ZebraHandle) handle; - bend_scanresult *r = (bend_scanresult *) - odr_malloc (q->stream, sizeof(*r)); int is_partial, i; - - r->term_position = q->term_position; - r->num_entries = q->num_entries; + 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 (q->stream, sizeof(*r->entries) * q->num_entries); - zebra_scan (zh, q->stream, q->term, - q->attributeset, - q->num_bases, q->basenames, + 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) @@ -447,14 +310,15 @@ bend_scanresult *bend_scan (void *handle, bend_scanrequest *q, int *num) r->entries[i].term = entries[i].term; r->entries[i].occurrences = entries[i].occurrences; } - r->errcode = zh->errCode; - r->errstring = zh->errString; - return r; + zebra_result (zh, &r->errcode, &r->errstring); + return 0; } void bend_close (void *handle) { zebra_close ((ZebraHandle) handle); + xmalloc_trav("bend_close"); + nmem_print_list(); } int bend_sort (void *handle, bend_sort_rr *rr) @@ -464,8 +328,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; } @@ -489,15 +352,17 @@ static int es_admin_request (ZebraHandle zh, Z_AdminEsRequest *r) case Z_ESAdminOriginPartToKeep_truncate: yaz_log(LOG_LOG, "adm-truncate"); break; - case Z_ESAdminOriginPartToKeep_delete: - yaz_log(LOG_LOG, "adm-delete"); + case Z_ESAdminOriginPartToKeep_drop: + 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, + r->toKeep->u.import->recordType); break; case Z_ESAdminOriginPartToKeep_refresh: yaz_log(LOG_LOG, "adm-refresh"); @@ -515,7 +380,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) { @@ -535,7 +399,6 @@ static int es_admin (ZebraHandle zh, Z_Admin *r) yaz_log (LOG_LOG, "adm taskpackage (unhandled)"); break; default: - zh->errCode = 1001; break; } @@ -545,8 +408,12 @@ static int es_admin (ZebraHandle zh, Z_Admin *r) int bend_segment (void *handle, bend_segment_rr *rr) { ZebraHandle zh = (ZebraHandle) handle; + Z_Segment *segment = rr->segment; - zebra_admin_import_segment (zh, rr->segment); + if (segment->num_segmentRecords) + zebra_admin_import_segment (zh, rr->segment); + else + zebra_admin_import_end (zh); return 0; } @@ -566,120 +433,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(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(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) { @@ -724,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, @@ -759,7 +533,7 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) rec->u.sutrs->len, rec->u.sutrs->buf); break; - case Z_External_octet : + case Z_External_octet: if (rec->u.octet_aligned->len > 170) yaz_log (LOG_LOG, "%d bytes:\n%.168s ...", rec->u.octet_aligned->len, @@ -769,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); } } } @@ -777,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; @@ -806,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; @@ -822,16 +664,13 @@ 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; - - if (sob->dynamic) - { - sob->dynamic = 0; - sob->threads = 1; - } +#ifdef WIN32 + strcpy (sob->service_display_name, "Zebra Server"); +#endif statserv_setcontrol (sob); - return statserv_main (argc, argv); + return statserv_main (argc, argv, bend_init, bend_close); }