* Sebastian Hammer, Adam Dickmeiss
*
* $Log: zserver.c,v $
- * Revision 1.18 1995-10-16 14:03:09 quinn
+ * 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
#include <unistd.h>
#include <fcntl.h>
+#include <common.h>
+#include <data1.h>
#include <recctrl.h>
#include <dmalloc.h>
#include "zserver.h"
r.handle = name;
logf (LOG_DEBUG, "bend_init");
- server_info.sets = NULL;
- if (!(server_info.sys_idx_fd = open (FNAME_SYS_IDX, O_RDONLY)))
+
+ if (!common_resource)
{
- logf (LOG_WARN|LOG_ERRNO, "sys_idx open fail");
- r.errcode = 1;
- r.errstring = "sys_idx open fail";
- return &r;
+ 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);
+ }
}
- if (!(server_info.fileDict = dict_open (FNAME_FILE_DICT, 10, 0)))
- {
- logf (LOG_WARN, "dict_open fail: fname dict");
- r.errcode = 1;
- r.errstring = "dict_open fail: fname dict";
- return &r;
- }
+
+ data1_tabpath = res_get(common_resource, "data1_tabpath");
+ server_info.sets = NULL;
+
+ server_info.records = rec_open (0);
if (!(server_info.wordDict = dict_open (FNAME_WORD_DICT, 40, 0)))
{
logf (LOG_WARN, "dict_open fail: word dict");
- dict_close (server_info.fileDict);
r.errcode = 1;
r.errstring = "dict_open fail: word dict";
return &r;
{
logf (LOG_WARN, "is_open fail: word isam");
dict_close (server_info.wordDict);
- dict_close (server_info.fileDict);
r.errcode = 1;
r.errstring = "is_open fail: word isam";
return &r;
r.errstring = 0;
r.hits = 0;
+
odr_reset (server_info.odr);
server_info.errCode = 0;
+ server_info.errString = NULL;
+
+ logf (LOG_LOG, "ResultSet '%s'", q->setname);
switch (q->query->which)
{
case Z_Query_type_1:
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;
oid_value *output_format, char **rec_bufp,
int *rec_lenp)
{
- char record_info[SYS_IDX_ENTRY_LEN];
+ Record rec;
char *fname, *file_type;
RecType rt;
struct recRetrieveCtrl retrieveCtrl;
- if (lseek (zi->sys_idx_fd, sysno * SYS_IDX_ENTRY_LEN,
- SEEK_SET) == -1)
- {
- logf (LOG_FATAL|LOG_ERRNO, "Retrieve: lseek of sys_idx");
- exit (1);
- }
- if (read (zi->sys_idx_fd, record_info, SYS_IDX_ENTRY_LEN) == -1)
- {
- logf (LOG_FATAL|LOG_ERRNO, "Retrieve: read of sys_idx");
- exit (1);
- }
- file_type = record_info;
- fname = record_info + strlen(record_info) + 1;
+ rec = rec_get (zi->records, sysno);
+ file_type = rec->info[recInfo_fileType];
+ fname = rec->info[recInfo_filename];
+
if (!(rt = recType_byName (file_type)))
{
logf (LOG_FATAL|LOG_ERRNO, "Retrieve: Cannot handle type %s",
*output_format = VAL_SUTRS;
*rec_bufp = msg;
*rec_lenp = strlen (msg);
+ rec_rm (&rec);
return 0; /* or 14: System error in presenting records */
}
retrieveCtrl.localno = sysno;
*rec_bufp = retrieveCtrl.rec_buf;
*rec_lenp = retrieveCtrl.rec_len;
close (retrieveCtrl.fd);
+ rec_rm (&rec);
+
return retrieveCtrl.diagnostic;
}
return &r;
}
r.errcode = record_fetch (&server_info, records[0].sysno,
- records[0].score, q->stream,
- q->format, q->comp, &r.format, &r.record, &r.len);
+ records[0].score, q->stream, q->format,
+ q->comp, &r.format, &r.record, &r.len);
+ resultSetSysnoDel (&server_info, records, 1);
return &r;
}
odr_reset (server_info.odr);
server_info.errCode = 0;
+ server_info.errString = 0;
- r.errstring = 0;
r.term_position = q->term_position;
r.num_entries = q->num_entries;
- r.errcode = rpn_scan (&server_info, server_info.odr, q->term,
+ r.errcode = rpn_scan (&server_info, q->term,
+ q->num_bases, q->basenames,
&r.term_position,
&r.num_entries, &r.entries, &status);
+ r.errstring = server_info.errString;
r.status = status;
return &r;
}
void bend_close (void *handle)
{
- dict_close (server_info.fileDict);
dict_close (server_info.wordDict);
is_close (server_info.wordIsam);
- close (server_info.sys_idx_fd);
+ rec_close (&server_info.records);
return;
}
int main (int argc, char **argv)
{
- char *base_name = "base";
+ struct statserv_options_block *sob;
+
+ sob = statserv_getcontrol ();
+ strcpy (sob->configname, "base");
+ statserv_setcontrol (sob);
- if (!(common_resource = res_open (base_name)))
- {
- logf (LOG_FATAL, "Cannot open resource `%s'", base_name);
- exit (1);
- }
return statserv_main (argc, argv);
}
projects / idzebra-moved-to-github.git / blobdiff