X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=797a884f2ab3f08199aa831b0664b8bbb8089e00;hb=9af45a7f129664e5f802ff1cdfce08fbce8b1adb;hp=c36ccaf2a7032b633a4a8ee2882e608addddfb19;hpb=889c4058f1b6330d51f9f26fea7c1fe2148c85e8;p=idzebra-moved-to-github.git diff --git a/index/zserver.c b/index/zserver.c index c36ccaf..797a884 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -4,7 +4,26 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: zserver.c,v $ - * Revision 1.6 1995-09-08 08:53:22 adam + * 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 @@ -30,10 +49,9 @@ #include #include -#include "zserver.h" - -#include +#include #include +#include "zserver.h" ZServerInfo server_info; @@ -75,7 +93,7 @@ bend_initresult *bend_init (bend_initrequest *q) r.errstring = "is_open fail: wordisam"; return &r; } - server_info.recordBuf = NULL; + server_info.odr = odr_createmem (ODR_ENCODE); return &r; } @@ -87,6 +105,8 @@ bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd) r.errstring = 0; r.hits = 0; + odr_reset (server_info.odr); + server_info.errCode = 0; switch (q->query->which) { case Z_Query_type_1: @@ -100,38 +120,85 @@ bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd) 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 = 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"; - xfree (server_info.recordBuf); - server_info.recordBuf = NULL; + 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; - server_info.recordBuf = r.record = xmalloc (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; } @@ -142,22 +209,17 @@ bend_deleteresult *bend_delete (void *handle, bend_deleterequest *q, int *num) 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; + 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); return &r; } @@ -167,8 +229,6 @@ void bend_close (void *handle) 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; }