/*
- * Copyright (C) 1995-1997, Index Data I/S
+ * Copyright (C) 1995-2000, Index Data
* All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
*
* $Log: zserver.c,v $
- * Revision 1.51 1997-10-27 14:33:06 adam
+ * Revision 1.81 2001-02-14 21:42:07 adam
+ * Fixed versions as returned in INIT response.
+ *
+ * Revision 1.80 2000/09/05 14:04:05 adam
+ * Updates for prefix 'yaz_' for YAZ log functions.
+ *
+ * Revision 1.79 2000/05/09 10:56:50 adam
+ * Added call to xmalloc/nmem debugging functions.
+ *
+ * Revision 1.78 2000/04/05 09:49:35 adam
+ * On Unix, zebra/z'mbol uses automake.
+ *
+ * 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
* Initial work on z39 server.
*
*/
+
#include <stdio.h>
#include <assert.h>
-#ifdef WINDOWS
+#include <fcntl.h>
+#ifdef WIN32
#include <io.h>
#include <process.h>
#else
#include <unistd.h>
#endif
-#include <fcntl.h>
-
-#include <data1.h>
-#include <recctrl.h>
-#include <dmalloc.h>
-
-#include "zserver.h"
-static int register_lock (ZServerInfo *zi)
-{
- time_t lastChange;
- int state = zebra_server_lock_get_state(zi, &lastChange);
-
- switch (state)
- {
- case 'c':
- state = 1;
- break;
- default:
- state = 0;
- }
- zebra_server_lock (zi, state);
-#if USE_TIMES
- times (&zi->tms1);
+#include <yaz/data1.h>
+#ifdef ASN_COMPILED
+#include <yaz/ill.h>
#endif
- if (zi->registerState == state)
- {
- if (zi->registerChange >= lastChange)
- return 0;
- logf (LOG_LOG, "Register completely updated since last access");
- }
- 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)
- {
- 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);
- }
- bf_cache (zi->bfs, state ? res_get (zi->res, "shadow") : NULL);
- zi->registerState = state;
- zi->records = rec_open (zi->bfs, 0);
- if (!(zi->dict = dict_open (zi->bfs, FNAME_DICT, 40, 0)))
- return -1;
- zi->isam = NULL;
- zi->isamc = NULL;
- if (res_get_match (zi->res, "isam", "c", NULL))
- {
- if (!(zi->isamc = isc_open (zi->bfs, FNAME_ISAMC,
- 0, key_isamc_m(zi->res))))
- return -1;
- }
- else
- {
- if (!(zi->isam = is_open (zi->bfs, FNAME_ISAM, key_compare, 0,
- sizeof (struct it_key), zi->res)))
- return -1;
- }
- zi->zti = zebTargetInfo_open (zi->records, 0);
-
- return 0;
-}
-
-static void register_unlock (ZServerInfo *zi)
-{
- static int waitSec = -1;
+#include "zserver.h"
-#if USE_TIMES
- times (&zi->tms2);
- logf (LOG_LOG, "user/system: %ld/%ld",
- (long) (zi->tms2.tms_utime - zi->tms1.tms_utime),
- (long) (zi->tms2.tms_stime - zi->tms1.tms_stime));
+#ifndef ZEBRASDR
+#define ZEBRASDR 0
#endif
- if (waitSec == -1)
- {
- char *s = res_get (zi->res, "debugRequestWait");
- if (s)
- waitSec = atoi (s);
- else
- waitSec = 0;
- }
-#ifdef WINDOWS
-#else
- if (waitSec > 0)
- sleep (waitSec);
+#if ZEBRASDR
+#include "zebrasdr.h"
#endif
- if (zi->registerState != -1)
- zebra_server_unlock (zi, zi->registerState);
-}
+
+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)
{
- bend_initresult *r = odr_malloc (q->stream, sizeof(*r));
- ZServerInfo *zi = xmalloc (sizeof(*zi));
+ 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;
- r->handle = zi;
+ 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 " VERSION;
+#else
+ q->implementation_name = "Zebra Information Server";
+ q->implementation_version = "Zebra " VERSION;
+#endif
logf (LOG_DEBUG, "bend_init");
sob = statserv_getcontrol ();
- logf (LOG_LOG, "Reading resources from %s", sob->configname);
- if (!(zi->res = res_open (sob->configname)))
+ if (!(zh = zebra_open (sob->handle)))
{
- logf (LOG_FATAL, "Cannot open resource `%s'", sob->configname);
- exit (1);
+ logf (LOG_FATAL, "Failed to open Zebra `%s'", sob->configname);
+ r->errcode = 1;
+ return r;
}
- zebra_server_lock_init (zi);
- zi->dh = data1_create ();
- zi->bfs = bfs_create (res_get (zi->res, "register"));
- bf_lockDir (zi->bfs, res_get (zi->res, "lockDir"));
- data1_set_tabpath (zi->dh, res_get(zi->res, "profilePath"));
- zi->sets = NULL;
- zi->registerState = -1; /* trigger open of registers! */
- zi->registerChange = 0;
-
- zi->records = NULL;
- zi->odr = odr_createmem (ODR_ENCODE);
- zi->registered_sets = NULL;
- zi->zebra_maps = zebra_maps_open (res_get(zi->res, "profilePath"));
+ if (q->auth)
+ {
+ 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);
+ }
+ }
+ if (zebra_auth (zh->service, user, passwd))
+ {
+ r->errcode = 222;
+ r->errstring = user;
+ zebra_close (zh);
+ return r;
+ }
+ r->handle = zh;
return r;
}
-bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd)
+int bend_search (void *handle, bend_search_rr *r)
{
- ZServerInfo *zi = handle;
- bend_searchresult *r = odr_malloc (q->stream, sizeof(*r));
+ ZebraHandle zh = (ZebraHandle) handle;
- r->errcode = 0;
- r->errstring = 0;
r->hits = 0;
-
- register_lock (zi);
- odr_reset (zi->odr);
- zi->errCode = 0;
- zi->errString = NULL;
-
- logf (LOG_LOG, "ResultSet '%s'", q->setname);
- switch (q->query->which)
+ r->errcode = 0;
+ r->errstring = NULL;
+
+ logf (LOG_LOG, "ResultSet '%s'", r->setname);
+ switch (r->query->which)
{
case Z_Query_type_1: case Z_Query_type_101:
- r->errcode = rpn_search (zi, q->query->u.type_1,
- q->num_bases, q->basenames, q->setname,
- &r->hits);
- r->errstring = zi->errString;
+ 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;
}
- register_unlock (zi);
- return r;
+ return 0;
}
-struct fetch_control {
- int record_offset;
- int record_int_pos;
- char *record_int_buf;
- int record_int_len;
- int fd;
-};
-
-static int record_ext_read (void *fh, char *buf, size_t count)
+int bend_fetch (void *handle, bend_fetch_rr *r)
{
- struct fetch_control *fc = fh;
- return read (fc->fd, buf, count);
-}
+ ZebraHandle zh = (ZebraHandle) handle;
+ ZebraRetrievalRecord retrievalRecord;
-static off_t record_ext_seek (void *fh, off_t offset)
-{
- struct fetch_control *fc = fh;
- return lseek (fc->fd, offset + fc->record_offset, SEEK_SET);
+ 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 */
+ {
+ r->errcode = zh->errCode;
+ r->errstring = zh->errString;
+ }
+ else if (retrievalRecord.errCode) /* Surrogate Diagnostic */
+ {
+ r->surrogate_flag = 1;
+ r->errcode = retrievalRecord.errCode;
+ r->errstring = retrievalRecord.errString;
+ r->basename = retrievalRecord.base;
+ }
+ 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;
}
-static off_t record_ext_tell (void *fh)
+static int bend_scan (void *handle, bend_scan_rr *r)
{
- struct fetch_control *fc = fh;
- return lseek (fc->fd, 0, SEEK_CUR) - fc->record_offset;
+ 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++)
+ {
+ r->entries[i].term = entries[i].term;
+ r->entries[i].occurrences = entries[i].occurrences;
+ }
+ r->errcode = zh->errCode;
+ r->errstring = zh->errString;
+ return 0;
}
-static off_t record_int_seek (void *fh, off_t offset)
+void bend_close (void *handle)
{
- struct fetch_control *fc = fh;
- return (off_t) (fc->record_int_pos = offset);
+ zebra_close ((ZebraHandle) handle);
+ xmalloc_trav("bend_close");
+ nmem_print_list();
}
-static off_t record_int_tell (void *fh)
+int bend_sort (void *handle, bend_sort_rr *rr)
{
- struct fetch_control *fc = fh;
- return (off_t) fc->record_int_pos;
+ 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);
+ 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)
{
- struct fetch_control *fc = fh;
- int l = fc->record_int_len - fc->record_int_pos;
- if (l <= 0)
- return 0;
- l = (l < count) ? l : count;
- memcpy (buf, fc->record_int_buf + fc->record_int_pos, l);
- fc->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;
- struct recRetrieveCtrl retrieveCtrl;
- char subType[128];
- struct fetch_control fc;
-
- rec = rec_get (zi->records, sysno);
- if (!rec)
+ switch (r->toKeep->which)
{
- logf (LOG_DEBUG, "rec_get fail on sysno=%d", sysno);
- return 14;
+ 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);
- retrieveCtrl.fh = &fc;
- fc.fd = -1;
- 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;
- retrieveCtrl.tellf = record_int_tell;
- fc.record_int_len = rec->size[recInfo_storeData];
- fc.record_int_buf = rec->info[recInfo_storeData];
- fc.record_int_pos = 0;
- logf (LOG_DEBUG, "Internal retrieve. %d bytes", fc.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 ((fc.fd = open (fname, O_BINARY|O_RDONLY)) == -1)
- {
- logf (LOG_WARN|LOG_ERRNO, "Retrieve fail; missing file: %s",
- fname);
- rec_rm (&rec);
- return 14;
- }
- memcpy (&fc.record_offset, rec->info[recInfo_offset],
- sizeof(fc.record_offset));
-
- retrieveCtrl.readf = record_ext_read;
- retrieveCtrl.seekf = record_ext_seek;
- retrieveCtrl.tellf = record_ext_tell;
- 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;
- retrieveCtrl.dh = zi->dh;
- (*rt->retrieve)(&retrieveCtrl);
- *output_format = retrieveCtrl.output_format;
- *rec_bufp = retrieveCtrl.rec_buf;
- *rec_lenp = retrieveCtrl.rec_len;
- if (fc.fd != -1)
- close (fc.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)
{
- ZServerInfo *zi = handle;
- bend_fetchresult *r = odr_malloc (q->stream, sizeof(*r));
- int positions[2];
- ZServerSetSysno *records;
+ ZebraHandle zh = (ZebraHandle) handle;
+ Z_Segment *segment = rr->segment;
- register_lock (zi);
-
- r->errstring = 0;
- r->last_in_set = 0;
- r->basename = "base";
+ if (segment->num_segmentRecords)
+ zebra_admin_import_segment (zh, rr->segment);
+ else
+ zebra_admin_import_end (zh);
+ return 0;
+}
- odr_reset (zi->odr);
- zi->errCode = 0;
+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);
- positions[0] = q->number;
- records = resultSetSysnoGet (zi, q->setname, 1, positions);
- if (!records)
+ if (!rr->esr->taskSpecificParameters)
{
- logf (LOG_DEBUG, "resultSetRecordGet, error");
- r->errcode = 13;
- register_unlock (zi);
- 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 (zi);
- 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 (zi, records[0].sysno,
- records[0].score, q->stream, q->format,
- q->comp, &r->format, &r->record, &r->len,
- &r->basename);
- resultSetSysnoDel (zi, records, 1);
- register_unlock (zi);
- return r;
-}
-
-bend_deleteresult *bend_delete (void *handle, bend_deleterequest *q, int *num)
-{
- ZServerInfo *zi = handle;
- register_lock (zi);
- register_unlock (zi);
return 0;
}
-bend_scanresult *bend_scan (void *handle, bend_scanrequest *q, int *num)
+static void bend_start (struct statserv_options_block *sob)
{
- ZServerInfo *zi = handle;
- bend_scanresult *r = odr_malloc (q->stream, sizeof(*r));
- int status;
-
- register_lock (zi);
- odr_reset (zi->odr);
- zi->errCode = 0;
- zi->errString = 0;
-
- r->term_position = q->term_position;
- r->num_entries = q->num_entries;
- r->errcode = rpn_scan (zi, q->term,
- q->attributeset,
- q->num_bases, q->basenames,
- &r->term_position,
- &r->num_entries, &r->entries, &status);
- r->errstring = zi->errString;
- r->status = status;
- register_unlock (zi);
- return r;
-}
-
-void bend_close (void *handle)
-{
- ZServerInfo *zi = handle;
-
- if (zi->records)
+#ifdef WIN32
+
+#else
+ if (!sob->inetd)
{
- resultSetDestroy (zi);
- 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);
- register_unlock (zi);
+ 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);
+ }
}
- odr_destroy (zi->odr);
- zebra_maps_close (zi->zebra_maps);
- bfs_destroy (zi->bfs);
- data1_destroy (zi->dh);
- zebra_server_lock_destroy (zi);
-
- res_close (zi->res);
- xfree (zi);
+#endif
+ if (sob->handle)
+ zebra_stop((ZebraService) sob->handle);
+ sob->handle = zebra_start(sob->configname);
}
-#ifndef WINDOWS
-static void pre_init (struct statserv_options_block *sob)
+static void bend_stop(struct statserv_options_block *sob)
{
- char *pidfile = "zebrasrv.pid";
- int fd = creat (pidfile, 0666);
-
- if (fd == -1)
- logf (LOG_WARN|LOG_ERRNO, "creat %s", pidfile);
- else
+ if (sob->handle)
{
- char pidstr[30];
-
- sprintf (pidstr, "%ld", (long) getpid ());
- write (fd, pidstr, strlen(pidstr));
- close (fd);
+ ZebraService service = sob->handle;
+ zebra_stop(service);
}
}
-#endif
int main (int argc, char **argv)
{
sob = statserv_getcontrol ();
strcpy (sob->configname, FNAME_CONFIG);
-#ifndef WINDOWS
- sob->pre_init = pre_init;
-#endif
+ 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);
}