/*
- * Copyright (C) 1995, Index Data I/S
+ * Copyright (C) 1994-1995, Index Data I/S
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: zserver.c,v $
- * Revision 1.4 1995-09-06 10:33:04 adam
+ * 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
#include <unistd.h>
#include <fcntl.h>
-#include "zserver.h"
-
-#include <backend.h>
+#include <recctrl.h>
#include <dmalloc.h>
+#include "zserver.h"
ZServerInfo server_info;
r.errstring = "dict_open fail: filedict";
return &r;
}
- if (!(server_info.fileDict = dict_open (FNAME_FILE_DICT, 5, 0)))
+ if (!(server_info.fileDict = dict_open (FNAME_FILE_DICT, 10, 0)))
{
r.errcode = 1;
r.errstring = "dict_open fail: filedict";
return &r;
}
- if (!(server_info.wordDict = dict_open (FNAME_WORD_DICT, 20, 0)))
+ if (!(server_info.wordDict = dict_open (FNAME_WORD_DICT, 40, 0)))
{
dict_close (server_info.fileDict);
r.errcode = 1;
r.errstring = "dict_open fail: worddict";
return &r;
}
- if (!(server_info.wordIsam = is_open (FNAME_WORD_ISAM, key_compare, 0)))
+ if (!(server_info.wordIsam = is_open (FNAME_WORD_ISAM, key_compare, 0,
+ sizeof (struct it_key))))
{
dict_close (server_info.wordDict);
dict_close (server_info.fileDict);
r.errstring = "is_open fail: wordisam";
return &r;
}
+ server_info.odr = odr_createmem (ODR_ENCODE);
return &r;
}
r.errstring = 0;
r.hits = 0;
+ odr_reset (server_info.odr);
+ server_info.errCode = 0;
switch (q->query->which)
{
case Z_Query_type_1:
return &r;
}
+static int record_read (int fd, char *buf, size_t count)
+{
+ return read (fd, buf, count);
+}
+
+static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream,
+ oid_value input_format, oid_value *output_format,
+ char **rec_bufp, int *rec_lenp)
+{
+ char record_info[SYS_IDX_ENTRY_LEN];
+ 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;
+ if (!(rt = recType_byName (file_type)))
+ {
+ logf (LOG_FATAL|LOG_ERRNO, "Retrieve: Cannot handle type %s",
+ file_type);
+ exit (1);
+ }
+ if ((retrieveCtrl.fd = open (fname, O_RDONLY)) == -1)
+ {
+ logf (LOG_FATAL|LOG_ERRNO, "Retrieve: Open record file %s", fname);
+ exit (1);
+ }
+ logf (LOG_DEBUG, "retrieve localno=%d score=%d", sysno, score);
+ retrieveCtrl.localno = sysno;
+ retrieveCtrl.score = score;
+ retrieveCtrl.odr = stream;
+ retrieveCtrl.readf = record_read;
+ retrieveCtrl.input_format = retrieveCtrl.output_format = input_format;
+ retrieveCtrl.diagnostic = 0;
+ (*rt->retrieve)(&retrieveCtrl);
+ *output_format = retrieveCtrl.output_format;
+ *rec_bufp = retrieveCtrl.rec_buf;
+ *rec_lenp = retrieveCtrl.rec_len;
+ close (retrieveCtrl.fd);
+ return retrieveCtrl.diagnostic;
+}
+
bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num)
{
static bend_fetchresult r;
int positions[2];
- ZServerRecord *records;
+ ZServerSetSysno *records;
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 = resultSetRecordGet (&server_info, q->setname, 1, positions);
+ records = resultSetSysnoGet (&server_info, q->setname, 1, positions);
if (!records)
{
logf (LOG_DEBUG, "resultSetRecordGet, error");
r.errcode = 13;
return &r;
}
- if (!records[0].buf)
+ if (!records[0].sysno)
{
r.errcode = 13;
logf (LOG_DEBUG, "Out of range. pos=%d", q->number);
return &r;
}
- r.len = records[0].size;
- r.record = malloc (r.len+1);
- strcpy (r.record, records[0].buf);
- resultSetRecordDel (&server_info, records, 1);
- r.format = VAL_SUTRS;
- r.errcode = 0;
+ r.errcode = record_fetch (&server_info, records[0].sysno,
+ records[0].score, q->stream,
+ q->format, &r.format, &r.record, &r.len);
return &r;
}
bend_scanresult *bend_scan (void *handle, bend_scanrequest *q, int *num)
{
- static struct scan_entry list[200];
- static char buf[200][200];
static bend_scanresult r;
- int i;
+ int status;
+
+ odr_reset (server_info.odr);
+ server_info.errCode = 0;
+ r.errstring = 0;
r.term_position = q->term_position;
r.num_entries = q->num_entries;
- r.entries = list;
- for (i = 0; i < r.num_entries; i++)
- {
- list[i].term = buf[i];
- sprintf(list[i].term, "term-%d", i+1);
- list[i].occurrences = rand() % 100000;
- }
- r.errcode = 0;
- r.errstring = 0;
+ r.errcode = rpn_scan (&server_info, server_info.odr, q->term,
+ &r.term_position,
+ &r.num_entries, &r.entries, &status);
+ r.status = status;
return &r;
}
projects / idzebra-moved-to-github.git / blobdiff