/*
- * Copyright (C) 1995-1996, Index Data I/S
+ * Copyright (C) 1995-1999, Index Data
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: zserver.c,v $
- * Revision 1.40 1996-06-04 10:19:02 adam
+ * 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
* Initial work on z39 server.
*
*/
+
#include <stdio.h>
#include <assert.h>
-#include <unistd.h>
#include <fcntl.h>
+#ifdef WIN32
+#include <io.h>
+#include <process.h>
+#else
+#include <unistd.h>
+#endif
-#include <common.h>
-#include <data1.h>
-#include <recctrl.h>
-#include <dmalloc.h>
-#include "zserver.h"
-
-ZServerInfo server_info;
-
-static int register_lock (ZServerInfo *zi)
-{
- time_t lastChange;
- int state = zebraServerLockGetState(&lastChange);
+#include <yaz/data1.h>
- switch (state)
- {
- case 'c':
- state = 1;
- break;
- default:
- state = 0;
- }
- zebraServerLock (state);
- 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->wordDict);
- is_close (zi->wordIsam);
- rec_close (&zi->records);
- }
- bf_cache (state);
- zi->registerState = state;
- zi->records = rec_open (0);
- if (!(zi->wordDict = dict_open (FNAME_WORD_DICT, 40, 0)))
- return -1;
- if (!(zi->wordIsam = is_open (FNAME_WORD_ISAM, key_compare, 0,
- sizeof (struct it_key))))
- return -1;
- zi->zti = zebTargetInfo_open (zi->records, 0);
- init_charmap ();
- return 0;
-}
+#include "zserver.h"
-static void register_unlock (ZServerInfo *zi)
-{
- static int waitSec = -1;
+#ifndef ZEBRASDR
+#define ZEBRASDR 0
+#endif
+#if ZEBRASDR
+#include "zebrasdr.h"
+#endif
- if (waitSec == -1)
- {
- char *s = res_get (common_resource, "debugRequestWait");
- if (s)
- waitSec = atoi (s);
- else
- waitSec = 0;
- }
- if (waitSec > 0)
- sleep (waitSec);
- if (zi->registerState != -1)
- zebraServerUnlock (zi->registerState);
-}
+static int bend_sort (void *handle, bend_sort_rr *rr);
+static int bend_delete (void *handle, bend_delete_rr *rr);
bend_initresult *bend_init (bend_initrequest *q)
{
- static bend_initresult r;
- static char *name = "zserver";
+ 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 = name;
+ r->errcode = 0;
+ r->errstring = 0;
+ q->bend_sort = bend_sort;
+ q->bend_delete = bend_delete;
+
+ q->implementation_name = "Z'mbol Information Server";
+ q->implementation_version = "Z'mbol 1.0";
logf (LOG_DEBUG, "bend_init");
- if (!common_resource)
+ sob = statserv_getcontrol ();
+ if (!(zh = zebra_open (sob->configname)))
{
- 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, "lockPath"));
- data1_tabpath = res_get(common_resource, "profilePath");
+ logf (LOG_FATAL, "Failed to open Zebra `%s'", sob->configname);
+ r->errcode = 1;
+ return r;
}
- server_info.sets = NULL;
- server_info.registerState = -1; /* trigger open of registers! */
- server_info.registerChange = 0;
-
- server_info.records = NULL;
- server_info.wordDict = NULL;
- server_info.wordIsam = NULL;
- server_info.odr = odr_createmem (ODR_ENCODE);
- return &r;
+ 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, 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)
{
- 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;
-
+ 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)
{
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;
+ 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;
break;
+ case Z_Query_type_2:
+ r->errcode = 107;
+ r->errstring = "type-2";
+ break;
default:
- r.errcode = 107;
+ r->errcode = 107;
}
- register_unlock (&server_info);
- return &r;
-}
-
-static int record_offset;
-
-static int record_ext_read (void *fh, char *buf, size_t count)
-{
- return read (*((int*) fh), buf, count);
-}
-
-static off_t record_ext_seek (void *fh, off_t offset)
-{
- return lseek (*((int*) fh), offset + record_offset, SEEK_SET);
+ return r;
}
-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);
-}
-
-static int record_int_read (void *fh, char *buf, size_t count)
-{
- 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;
-}
-
-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)
+bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num)
{
- Record rec;
- char *fname, *file_type;
- RecType rt;
- int fd = -1;
- struct recRetrieveCtrl retrieveCtrl;
- char subType[128];
-
- rec = rec_get (zi->records, sysno);
- if (!rec)
+ ZebraHandle zh = (ZebraHandle) handle;
+ bend_fetchresult *r = (bend_fetchresult *)
+ odr_malloc (q->stream, sizeof(*r));
+ ZebraRetrievalRecord retrievalRecord;
+
+ retrievalRecord.position = q->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 */
{
- 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;
+ r->errcode = zh->errCode;
+ r->errstring = zh->errString;
}
- file_type = rec->info[recInfo_fileType];
- fname = rec->info[recInfo_filename];
-
- if (!(rt = recType_byName (file_type, subType)))
+ else if (retrievalRecord.errCode) /* Surrogate Diagnostic */
{
- logf (LOG_FATAL|LOG_ERRNO, "Retrieve: Cannot handle type %s",
- file_type);
- exit (1);
+ q->surrogate_flag = 1;
+ r->errcode = retrievalRecord.errCode;
+ r->errstring = retrievalRecord.errString;
+ r->basename = retrievalRecord.base;
}
- logf (LOG_DEBUG, "retrieve localno=%d score=%d", sysno, score);
- if (rec->size[recInfo_storeData] > 0)
+ else /* Database Record */
{
- 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);
+ r->errcode = 0;
+ r->basename = retrievalRecord.base;
+ r->record = retrievalRecord.buf;
+ r->len = retrievalRecord.len;
+ r->format = retrievalRecord.format;
}
- 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 r;
}
-bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num)
+bend_scanresult *bend_scan (void *handle, bend_scanrequest *q, int *num)
{
- static bend_fetchresult r;
- int positions[2];
- ZServerSetSysno *records;
-
- register_lock (&server_info);
-
- r.errstring = 0;
- r.last_in_set = 0;
- r.basename = "base";
-
- odr_reset (server_info.odr);
- server_info.errCode = 0;
-
- positions[0] = q->number;
- records = resultSetSysnoGet (&server_info, q->setname, 1, positions);
- if (!records)
- {
- logf (LOG_DEBUG, "resultSetRecordGet, error");
- r.errcode = 13;
- register_unlock (&server_info);
- return &r;
- }
- if (!records[0].sysno)
+ 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;
+
+ 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,
+ &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.errcode = 13;
- logf (LOG_DEBUG, "Out of range. pos=%d", q->number);
- register_unlock (&server_info);
- return &r;
+ r->entries[i].term = entries[i].term;
+ r->entries[i].occurrences = entries[i].occurrences;
}
- r.errcode = record_fetch (&server_info, records[0].sysno,
- records[0].score, q->stream, q->format,
- q->comp, &r.format, &r.record, &r.len);
- resultSetSysnoDel (&server_info, records, 1);
- register_unlock (&server_info);
- return &r;
+ r->errcode = zh->errCode;
+ r->errstring = zh->errString;
+ return r;
}
-bend_deleteresult *bend_delete (void *handle, bend_deleterequest *q, int *num)
+void bend_close (void *handle)
{
- register_lock (&server_info);
- register_unlock (&server_info);
- return 0;
+ zebra_close ((ZebraHandle) handle);
}
-bend_scanresult *bend_scan (void *handle, bend_scanrequest *q, int *num)
+int bend_sort (void *handle, bend_sort_rr *rr)
{
- static bend_scanresult r;
- int status;
+ 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;
+}
- register_lock (&server_info);
- odr_reset (server_info.odr);
- server_info.errCode = 0;
- server_info.errString = 0;
+int bend_delete (void *handle, bend_delete_rr *rr)
+{
+ ZebraHandle zh = (ZebraHandle) handle;
- 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;
+ rr->delete_status = zebra_deleleResultSet(zh, rr->function,
+ rr->num_setnames, rr->setnames,
+ rr->statuses);
+ return 0;
}
-void bend_close (void *handle)
+#ifndef WIN32
+static void bend_start (struct statserv_options_block *sob)
{
- if (server_info.records)
+ if (!sob->inetd)
{
- dict_close (server_info.wordDict);
- is_close (server_info.wordIsam);
- rec_close (&server_info.records);
- register_unlock (&server_info);
+ 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);
+ }
}
- return;
}
+#endif
int main (int argc, char **argv)
{
sob = statserv_getcontrol ();
strcpy (sob->configname, FNAME_CONFIG);
+#ifndef WIN32
+ sob->bend_start = bend_start;
+#endif
statserv_setcontrol (sob);
+#if ZEBRASDR
+ zebraSdr_std ();
+#endif
return statserv_main (argc, argv);
}
projects / idzebra-moved-to-github.git / blobdiff