X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=553e6fbc11677b7bca2cbbb7adbb22660c518896;hb=b7918920dd34b8c4c93e8d3095203e236523f453;hp=0aa0b12a8cc9a3eb6b33fb7c83f8346dcd632716;hpb=40ca1d08c1d83b92e0b90951d918b252c61c63b2;p=idzebra-moved-to-github.git diff --git a/index/zserver.c b/index/zserver.c index 0aa0b12..553e6fb 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -4,7 +4,28 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: zserver.c,v $ - * Revision 1.13 1995-10-06 14:38:00 adam + * 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 + * 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. * @@ -68,33 +89,38 @@ 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.odr = odr_createmem (ODR_ENCODE); @@ -111,12 +137,14 @@ bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd) odr_reset (server_info.odr); server_info.errCode = 0; + server_info.errString = NULL; 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; @@ -130,8 +158,9 @@ static int record_read (int fd, char *buf, size_t 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) + 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; @@ -157,17 +186,22 @@ static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream, file_type); exit (1); } + logf (LOG_DEBUG, "retrieve localno=%d score=%d", sysno, score); if ((retrieveCtrl.fd = open (fname, O_RDONLY)) == -1) { - logf (LOG_FATAL|LOG_ERRNO, "Retrieve: Open record file %s", fname); - exit (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 */ } - 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.comp = comp; retrieveCtrl.diagnostic = 0; (*rt->retrieve)(&retrieveCtrl); *output_format = retrieveCtrl.output_format; @@ -205,8 +239,9 @@ bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num) return &r; } r.errcode = record_fetch (&server_info, records[0].sysno, - records[0].score, q->stream, - q->format, &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; } @@ -218,16 +253,20 @@ bend_deleteresult *bend_delete (void *handle, bend_deleterequest *q, int *num) bend_scanresult *bend_scan (void *handle, bend_scanrequest *q, int *num) { static bend_scanresult r; + int status; 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); + &r.num_entries, &r.entries, &status); + r.errstring = server_info.errString; + r.status = status; return &r; }