/*
- * 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.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 <recctrl.h>
#include <backend.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.recordBuf = NULL;
return &r;
}
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, 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);
+ }
+ retrieveCtrl.odr = stream;
+ retrieveCtrl.readf = record_read;
+ retrieveCtrl.input_format = input_format;
+ (*rt->retrieve)(&retrieveCtrl);
+ *output_format = retrieveCtrl.output_format;
+ *rec_bufp = retrieveCtrl.rec_buf;
+ *rec_lenp = retrieveCtrl.rec_len;
+ close (retrieveCtrl.fd);
+ return 0;
+}
+
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";
+ xfree (server_info.recordBuf);
+ server_info.recordBuf = NULL;
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, q->stream,
+ q->format, &r.format, &r.record, &r.len);
return &r;
}
dict_close (server_info.wordDict);
is_close (server_info.wordIsam);
close (server_info.sys_idx_fd);
+ xfree (server_info.recordBuf);
+ server_info.recordBuf = NULL;
return;
}