X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzserver.c;h=1df6afde6dc4f03aed72504193d51171bee2b5d4;hp=acaf62c5fa79e2a74a9af93039f62d0beec7ea0e;hb=7e75317bed8eecabcb57e59b16093a32238738e2;hpb=75a4bfb9aee40405a751320769d74fd890f2c0b4 diff --git a/index/zserver.c b/index/zserver.c index acaf62c..1df6afd 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -1,548 +1,562 @@ /* - * Copyright (C) 1995-1996, Index Data I/S + * Copyright (C) 1995-2000, Index Data * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: zserver.c,v $ - * 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.83 2002-02-20 17:30:01 adam Exp $ */ + #include #include -#include #include - -#include -#include -#include -#include - -#define USE_TIMES 1 -#ifdef __linux__ -#define USE_TIMES 1 +#ifdef WIN32 +#include +#include +#else +#include #endif -#if USE_TIMES -#include +#include +#ifdef ASN_COMPILED +#include #endif -#include "zserver.h" -ZServerInfo server_info; +#include "zserver.h" -#if USE_TIMES -static struct tms tms1; -static struct tms tms2; +#ifndef ZEBRASDR +#define ZEBRASDR 0 +#endif +#if ZEBRASDR +#include "zebrasdr.h" #endif -static int register_lock (ZServerInfo *zi) +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) { - time_t lastChange; - int state = zebraServerLockGetState(&lastChange); + bend_initresult *r = (bend_initresult *) + odr_malloc (q->stream, sizeof(*r)); + ZebraHandle zh; + struct statserv_options_block *sob; + char *user = NULL; + char *passwd = NULL; + + r->errcode = 0; + r->errstring = 0; + q->bend_sort = bend_sort; + 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; + +#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 - switch (state) + logf (LOG_DEBUG, "bend_init"); + + sob = statserv_getcontrol (); + if (!(zh = zebra_open (sob->handle))) { - case 'c': - state = 1; - break; - default: - state = 0; + logf (LOG_FATAL, "Failed to open Zebra `%s'", sob->configname); + r->errcode = 1; + return r; } - zebraServerLock (state); -#if USE_TIMES - times (&tms1); -#endif - if (zi->registerState == state) + if (q->auth) { - if (zi->registerChange >= lastChange) - return 0; - logf (LOG_LOG, "Register completely updated since last access"); + if (q->auth->which == Z_IdAuthentication_open) + { + char *openpass = xstrdup (q->auth->u.open); + char *cp = strchr (openpass, '/'); + if (cp) + { + *cp = '\0'; + user = nmem_strdup (odr_getmem (q->stream), openpass); + passwd = nmem_strdup (odr_getmem (q->stream), cp+1); + } + xfree (openpass); + } } - else if (zi->registerState == -1) - logf (LOG_LOG, "Reading register using state %d pid=%ld", state, - (long) getpid()); - else - logf (LOG_LOG, "Register has changed state from %d to %d", - zi->registerState, state); - zi->registerChange = lastChange; - if (zi->records) + if (zebra_auth (zh->service, user, passwd)) { - zebTargetInfo_close (zi->zti, 0); - dict_close (zi->dict); - if (zi->isam) - is_close (zi->isam); - if (zi->isamc) - isc_close (zi->isamc); - rec_close (&zi->records); + r->errcode = 222; + r->errstring = user; + zebra_close (zh); + return r; } - bf_cache (state); - zi->registerState = state; - zi->records = rec_open (0); - if (!(zi->dict = dict_open (FNAME_DICT, 40, 0))) - return -1; - zi->isam = NULL; - zi->isamc = NULL; - if (res_get_match (common_resource, "isam", "c", NULL)) - { - if (!(zi->isamc = isc_open (FNAME_ISAMC, 0, key_isamc_m()))) - return -1; + r->handle = zh; + return r; +} - } - else +int bend_search (void *handle, bend_search_rr *r) +{ + ZebraHandle zh = (ZebraHandle) handle; + + r->hits = 0; + r->errcode = 0; + r->errstring = NULL; + + logf (LOG_LOG, "ResultSet '%s'", r->setname); + switch (r->query->which) { - if (!(zi->isam = is_open (FNAME_ISAM, key_compare, 0, - sizeof (struct it_key)))) - return -1; + 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; + break; + case Z_Query_type_2: + r->errcode = 107; + r->errstring = "type-2"; + break; + default: + r->errcode = 107; } - zi->zti = zebTargetInfo_open (zi->records, 0); - init_charmap (); return 0; } -static void register_unlock (ZServerInfo *zi) +int bend_fetch (void *handle, bend_fetch_rr *r) { - static int waitSec = -1; - -#if USE_TIMES - times (&tms2); - logf (LOG_LOG, "user/system: %ld/%ld", - (long) (tms2.tms_utime - tms1.tms_utime), - (long) (tms2.tms_stime - tms1.tms_stime)); -#endif - if (waitSec == -1) + ZebraHandle zh = (ZebraHandle) handle; + ZebraRetrievalRecord retrievalRecord; + + retrievalRecord.position = r->number; + + 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 */ { - char *s = res_get (common_resource, "debugRequestWait"); - if (s) - waitSec = atoi (s); - else - waitSec = 0; + r->errcode = zh->errCode; + r->errstring = zh->errString; } - if (waitSec > 0) - sleep (waitSec); - if (zi->registerState != -1) - zebraServerUnlock (zi->registerState); -} - -bend_initresult *bend_init (bend_initrequest *q) -{ - static bend_initresult r; - static char *name = "zserver"; - - r.errcode = 0; - r.errstring = 0; - r.handle = name; - - logf (LOG_DEBUG, "bend_init"); - - if (!common_resource) + else if (retrievalRecord.errCode) /* Surrogate Diagnostic */ { - struct statserv_options_block *sob; - - sob = statserv_getcontrol (); - logf (LOG_LOG, "Reading resources from %s", sob->configname); - if (!(common_resource = res_open (sob->configname))) - { - logf (LOG_FATAL, "Cannot open resource `%s'", sob->configname); - exit (1); - } - bf_lockDir (res_get (common_resource, "lockDir")); - data1_set_tabpath (res_get(common_resource, "profilePath")); + r->surrogate_flag = 1; + r->errcode = retrievalRecord.errCode; + r->errstring = retrievalRecord.errString; + r->basename = retrievalRecord.base; } - server_info.sets = NULL; - server_info.registerState = -1; /* trigger open of registers! */ - server_info.registerChange = 0; - - server_info.records = NULL; - server_info.odr = odr_createmem (ODR_ENCODE); - return &r; + else /* Database Record */ + { + r->errcode = 0; + r->basename = retrievalRecord.base; + r->record = retrievalRecord.buf; + r->len = retrievalRecord.len; + r->output_format = retrievalRecord.format; + } + return 0; } -bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd) +static int bend_scan (void *handle, bend_scan_rr *r) { - static bend_searchresult r; - - r.errcode = 0; - r.errstring = 0; - r.hits = 0; - - register_lock (&server_info); - odr_reset (server_info.odr); - server_info.errCode = 0; - server_info.errString = NULL; - - logf (LOG_LOG, "ResultSet '%s'", q->setname); - switch (q->query->which) + ZebraScanEntry *entries; + ZebraHandle zh = (ZebraHandle) handle; + int is_partial, i; + + 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) + r->status = BEND_SCAN_PARTIAL; + else + r->status = BEND_SCAN_SUCCESS; + for (i = 0; i < r->num_entries; i++) { - case Z_Query_type_1: case Z_Query_type_101: - r.errcode = rpn_search (&server_info, q->query->u.type_1, - q->num_bases, q->basenames, q->setname, - &r.hits); - r.errstring = server_info.errString; - break; - default: - r.errcode = 107; + r->entries[i].term = entries[i].term; + r->entries[i].occurrences = entries[i].occurrences; } - register_unlock (&server_info); - return &r; + r->errcode = zh->errCode; + r->errstring = zh->errString; + return 0; } -static int record_offset; - -static int record_ext_read (void *fh, char *buf, size_t count) +void bend_close (void *handle) { - return read (*((int*) fh), buf, count); + zebra_close ((ZebraHandle) handle); + xmalloc_trav("bend_close"); + nmem_print_list(); } -static off_t record_ext_seek (void *fh, off_t offset) +int bend_sort (void *handle, bend_sort_rr *rr) { - return lseek (*((int*) fh), offset + record_offset, SEEK_SET); -} + ZebraHandle zh = (ZebraHandle) handle; -static int record_int_pos; -static char *record_int_buf; -static int record_int_len; - -static off_t record_int_seek (void *fh, off_t offset) -{ - return (off_t) (record_int_pos = offset); + 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; + return 0; } -static int record_int_read (void *fh, char *buf, size_t count) +int bend_delete (void *handle, bend_delete_rr *rr) { - int l = record_int_len - record_int_pos; - if (l <= 0) - return 0; - l = (l < count) ? l : count; - memcpy (buf, record_int_buf + record_int_pos, l); - record_int_pos += l; - return l; + ZebraHandle zh = (ZebraHandle) handle; + + rr->delete_status = zebra_deleleResultSet(zh, rr->function, + rr->num_setnames, rr->setnames, + rr->statuses); + return 0; } -static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream, - oid_value input_format, Z_RecordComposition *comp, - oid_value *output_format, char **rec_bufp, - int *rec_lenp, char **basenamep) +static int es_admin_request (ZebraHandle zh, Z_AdminEsRequest *r) { - Record rec; - char *fname, *file_type, *basename; - RecType rt; - int fd = -1; - struct recRetrieveCtrl retrieveCtrl; - char subType[128]; - - rec = rec_get (zi->records, sysno); - if (!rec) + switch (r->toKeep->which) { - char *msg = "Record is deleted\n"; - *output_format = VAL_SUTRS; - *rec_bufp = msg; - *rec_lenp = strlen (msg); - logf (LOG_DEBUG, "rec_get fail on sysno=%d", sysno); - return 0; + case Z_ESAdminOriginPartToKeep_reIndex: + yaz_log(LOG_LOG, "adm-reindex"); + break; + case Z_ESAdminOriginPartToKeep_truncate: + yaz_log(LOG_LOG, "adm-truncate"); + break; + case Z_ESAdminOriginPartToKeep_drop: + yaz_log(LOG_LOG, "adm-drop"); + break; + case Z_ESAdminOriginPartToKeep_create: + yaz_log(LOG_LOG, "adm-create"); + 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); + break; + case Z_ESAdminOriginPartToKeep_refresh: + yaz_log(LOG_LOG, "adm-refresh"); + break; + case Z_ESAdminOriginPartToKeep_commit: + yaz_log(LOG_LOG, "adm-commit"); + break; + case Z_ESAdminOriginPartToKeep_shutdown: + yaz_log(LOG_LOG, "shutdown"); + zebra_admin_shutdown(zh); + break; + case Z_ESAdminOriginPartToKeep_start: + yaz_log(LOG_LOG, "start"); + zebra_admin_start(zh); + break; + default: + yaz_log(LOG_LOG, "unknown admin"); + zh->errCode = 1001; } - file_type = rec->info[recInfo_fileType]; - fname = rec->info[recInfo_filename]; - basename = rec->info[recInfo_databaseName]; - *basenamep = odr_malloc (stream, strlen(basename)+1); - strcpy (*basenamep, basename); - - if (!(rt = recType_byName (file_type, subType))) + if (r->toKeep->databaseName) { - logf (LOG_FATAL|LOG_ERRNO, "Retrieve: Cannot handle type %s", - file_type); - exit (1); + yaz_log(LOG_LOG, "database %s", r->toKeep->databaseName); } - logf (LOG_DEBUG, "retrieve localno=%d score=%d", sysno, score); - if (rec->size[recInfo_storeData] > 0) + return 0; +} + +static int es_admin (ZebraHandle zh, Z_Admin *r) +{ + switch (r->which) { - retrieveCtrl.readf = record_int_read; - retrieveCtrl.seekf = record_int_seek; - record_int_len = rec->size[recInfo_storeData]; - record_int_buf = rec->info[recInfo_storeData]; - record_int_pos = 0; - logf (LOG_DEBUG, "Internal retrieve. %d bytes", record_int_len); + case Z_Admin_esRequest: + es_admin_request (zh, r->u.esRequest); + break; + case Z_Admin_taskPackage: + yaz_log (LOG_LOG, "adm taskpackage (unhandled)"); + break; + default: + zh->errCode = 1001; + break; } - else - { - if ((fd = open (fname, O_RDONLY)) == -1) - { - char *msg = "Record doesn't exist\n"; - logf (LOG_WARN|LOG_ERRNO, "Retrieve: Open record file %s", fname); - *output_format = VAL_SUTRS; - *rec_bufp = msg; - *rec_lenp = strlen (msg); - rec_rm (&rec); - return 0; /* or 14: System error in presenting records */ - } - - memcpy (&record_offset, rec->info[recInfo_offset], - sizeof(record_offset)); - retrieveCtrl.fh = &fd; - retrieveCtrl.readf = record_ext_read; - retrieveCtrl.seekf = record_ext_seek; - - record_ext_seek (retrieveCtrl.fh, 0); - } - retrieveCtrl.subType = subType; - retrieveCtrl.localno = sysno; - retrieveCtrl.score = score; - retrieveCtrl.odr = stream; - retrieveCtrl.input_format = retrieveCtrl.output_format = input_format; - retrieveCtrl.comp = comp; - retrieveCtrl.diagnostic = 0; - (*rt->retrieve)(&retrieveCtrl); - *output_format = retrieveCtrl.output_format; - *rec_bufp = retrieveCtrl.rec_buf; - *rec_lenp = retrieveCtrl.rec_len; - if (fd != -1) - close (fd); - rec_rm (&rec); - - return retrieveCtrl.diagnostic; + return 0; } -bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num) +int bend_segment (void *handle, bend_segment_rr *rr) { - static bend_fetchresult r; - int positions[2]; - ZServerSetSysno *records; - - register_lock (&server_info); - - r.errstring = 0; - r.last_in_set = 0; - r.basename = "base"; + ZebraHandle zh = (ZebraHandle) handle; + Z_Segment *segment = rr->segment; - odr_reset (server_info.odr); - server_info.errCode = 0; + if (segment->num_segmentRecords) + zebra_admin_import_segment (zh, rr->segment); + else + zebra_admin_import_end (zh); + return 0; +} - positions[0] = q->number; - records = resultSetSysnoGet (&server_info, q->setname, 1, positions); - if (!records) +int bend_esrequest (void *handle, bend_esrequest_rr *rr) +{ + ZebraHandle zh = (ZebraHandle) handle; + + yaz_log(LOG_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); + + if (!rr->esr->taskSpecificParameters) { - logf (LOG_DEBUG, "resultSetRecordGet, error"); - r.errcode = 13; - register_unlock (&server_info); - return &r; + yaz_log (LOG_WARN, "No task specific parameters"); } - if (!records[0].sysno) + else if (rr->esr->taskSpecificParameters->which == Z_External_ESAdmin) { - r.errcode = 13; - logf (LOG_DEBUG, "Out of range. pos=%d", q->number); - register_unlock (&server_info); - return &r; + 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; + } + } + else if (rr->esr->taskSpecificParameters->which == Z_External_update) + { + Z_IUUpdate *up = rr->esr->taskSpecificParameters->u.update; + yaz_log (LOG_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"); + if (toKeep->action) + { + switch (*toKeep->action) + { + case Z_IUOriginPartToKeep_recordInsert: + yaz_log (LOG_LOG, "recordInsert"); + break; + case Z_IUOriginPartToKeep_recordReplace: + yaz_log (LOG_LOG, "recordUpdate"); + break; + case Z_IUOriginPartToKeep_recordDelete: + yaz_log (LOG_LOG, "recordDelete"); + break; + case Z_IUOriginPartToKeep_elementUpdate: + yaz_log (LOG_LOG, "elementUpdate"); + break; + case Z_IUOriginPartToKeep_specialUpdate: + yaz_log (LOG_LOG, "specialUpdate"); + break; + case Z_ESAdminOriginPartToKeep_shutdown: + yaz_log (LOG_LOG, "shutDown"); + break; + case Z_ESAdminOriginPartToKeep_start: + yaz_log (LOG_LOG, "start"); + break; + default: + yaz_log (LOG_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; + } + if (notToKeep) + { + int i; + for (i = 0; i < notToKeep->num; i++) + { + Z_External *rec = notToKeep->elements[i]->record; + + if (rec->direct_reference) + { + struct oident *oident; + oident = oid_getentbyoid(rec->direct_reference); + if (oident) + yaz_log (LOG_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 ...", + rec->u.sutrs->len, + rec->u.sutrs->buf); + else + yaz_log (LOG_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 ...", + rec->u.octet_aligned->len, + rec->u.octet_aligned->buf); + else + yaz_log (LOG_LOG, "%d bytes\n%s", + rec->u.octet_aligned->len, + rec->u.octet_aligned->buf); + } + } + } + } + } + else + { + yaz_log (LOG_WARN, "Unknown Extended Service(%d)", + rr->esr->taskSpecificParameters->which); + } - r.errcode = record_fetch (&server_info, records[0].sysno, - records[0].score, q->stream, q->format, - q->comp, &r.format, &r.record, &r.len, - &r.basename); - resultSetSysnoDel (&server_info, records, 1); - register_unlock (&server_info); - return &r; -} - -bend_deleteresult *bend_delete (void *handle, bend_deleterequest *q, int *num) -{ - register_lock (&server_info); - register_unlock (&server_info); return 0; } -bend_scanresult *bend_scan (void *handle, bend_scanrequest *q, int *num) +static void bend_start (struct statserv_options_block *sob) { - static bend_scanresult r; - int status; - - register_lock (&server_info); - odr_reset (server_info.odr); - server_info.errCode = 0; - server_info.errString = 0; - - r.term_position = q->term_position; - r.num_entries = q->num_entries; - r.errcode = rpn_scan (&server_info, q->term, - q->attributeset, - q->num_bases, q->basenames, - &r.term_position, - &r.num_entries, &r.entries, &status); - r.errstring = server_info.errString; - r.status = status; - register_unlock (&server_info); - return &r; +#ifdef WIN32 + +#else + if (!sob->inetd) + { + char *pidfile = "zebrasrv.pid"; + int fd = creat (pidfile, 0666); + if (fd == -1) + logf (LOG_WARN|LOG_ERRNO, "creat %s", pidfile); + 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); } -void bend_close (void *handle) +static void bend_stop(struct statserv_options_block *sob) { - if (server_info.records) + if (sob->handle) { - resultSetDestroy (&server_info); - dict_close (server_info.dict); - if (server_info.isam) - is_close (server_info.isam); - if (server_info.isamc) - isc_close (server_info.isamc); - rec_close (&server_info.records); - register_unlock (&server_info); + ZebraService service = sob->handle; + zebra_stop(service); } - return; } int main (int argc, char **argv) @@ -551,7 +565,10 @@ int main (int argc, char **argv) sob = statserv_getcontrol (); strcpy (sob->configname, FNAME_CONFIG); + sob->bend_start = bend_start; + sob->bend_stop = bend_stop; + statserv_setcontrol (sob); - return statserv_main (argc, argv); + return statserv_main (argc, argv, bend_init, bend_close); }