X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=90a805732d61a10dda8518ad888e6cce0bf3685d;hb=ae5e5891ad52a6e7c1717afe5954039538f81236;hp=e1413f298fdf7076e625246cf54897cc4f01b20c;hpb=083d994896c30d9c560580daa19c9ca370901e3a;p=idzebra-moved-to-github.git diff --git a/index/zserver.c b/index/zserver.c index e1413f2..90a8057 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -4,7 +4,42 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: zserver.c,v $ - * Revision 1.7 1995-09-27 16:17:32 adam + * 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 + * More work on relational op. + * + * Revision 1.16 1995/10/13 12:26:44 adam + * Optimization of truncation. + * + * Revision 1.15 1995/10/12 12:40:55 adam + * Bug fixes in rpn_prox. + * + * 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 @@ -33,10 +68,9 @@ #include #include -#include "zserver.h" - -#include +#include #include +#include "zserver.h" ZServerInfo server_info; @@ -49,36 +83,41 @@ bend_initresult *bend_init (bend_initrequest *q) r.errstring = 0; r.handle = name; + logf (LOG_DEBUG, "bend_init"); server_info.sets = NULL; if (!(server_info.sys_idx_fd = open (FNAME_SYS_IDX, O_RDONLY))) { + logf (LOG_WARN|LOG_ERRNO, "sys_idx open fail"); r.errcode = 1; - r.errstring = "dict_open fail: filedict"; + r.errstring = "sys_idx open fail"; return &r; } 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: filedict"; + r.errstring = "dict_open fail: fname dict"; return &r; } 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: worddict"; + r.errstring = "dict_open fail: word dict"; return &r; } if (!(server_info.wordIsam = is_open (FNAME_WORD_ISAM, key_compare, 0, sizeof (struct it_key)))) { + 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: wordisam"; + r.errstring = "is_open fail: word isam"; return &r; } - server_info.recordBuf = NULL; + server_info.odr = odr_createmem (ODR_ENCODE); return &r; } @@ -90,6 +129,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: @@ -103,6 +144,65 @@ 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, int score, ODR stream, + oid_value input_format, Z_RecordComposition *comp, + 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); + } + logf (LOG_DEBUG, "retrieve localno=%d score=%d", sysno, score); + if ((retrieveCtrl.fd = open (fname, O_RDONLY)) == -1) + { + char *msg = "Record doesn't exist"; + logf (LOG_WARN|LOG_ERRNO, "Retrieve: Open record file %s", fname); + *output_format = VAL_SUTRS; + *rec_bufp = msg; + *rec_lenp = strlen (msg); + return 0; /* or 14: System error in presenting records */ + } + retrieveCtrl.localno = sysno; + retrieveCtrl.score = score; + retrieveCtrl.odr = stream; + retrieveCtrl.readf = record_read; + 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; + close (retrieveCtrl.fd); + return retrieveCtrl.diagnostic; +} + bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num) { static bend_fetchresult r; @@ -113,8 +213,9 @@ bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num) 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 = resultSetSysnoGet (&server_info, q->setname, 1, positions); if (!records) @@ -129,14 +230,9 @@ bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num) logf (LOG_DEBUG, "Out of range. pos=%d", q->number); return &r; } -#if 0 - 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; -#endif + r.errcode = record_fetch (&server_info, records[0].sysno, + records[0].score, q->stream, + q->format, q->comp, &r.format, &r.record, &r.len); return &r; } @@ -147,22 +243,19 @@ 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; + 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; } @@ -172,8 +265,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; }