X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=index%2Fzserver.c;h=82df2c43c9fc8a92c684c6308440f67b73879f81;hb=0d1685e5db9bf74ff80a4b483754532a73fcbb74;hp=863780af7af83946c43c8baa8921cffd9c3e75ac;hpb=2811f2e2fb2101a75e89e8b3e0358635e86ab71d;p=idzebra-moved-to-github.git diff --git a/index/zserver.c b/index/zserver.c index 863780a..82df2c4 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -4,7 +4,47 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: zserver.c,v $ - * Revision 1.9 1995-10-02 15:18:52 adam + * Revision 1.22 1995-11-16 15:34:55 adam + * Uses new record management system in both indexer and server. + * + * Revision 1.21 1995/11/01 16:25:52 quinn + * *** empty log message *** + * + * 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. + * + * 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 @@ -40,8 +80,9 @@ #include #include +#include +#include #include -#include #include #include "zserver.h" @@ -56,36 +97,46 @@ bend_initresult *bend_init (bend_initrequest *q) r.errstring = 0; r.handle = name; + logf (LOG_DEBUG, "bend_init"); + data1_tabpath = res_get(common_resource, "data1_tabpath"); server_info.sets = NULL; +#if RECORD_BASE + server_info.records = rec_open (0); +#else 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; } +#endif 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; } @@ -97,12 +148,16 @@ 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; + 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; @@ -115,15 +170,25 @@ 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) +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) { +#if RECORD_BASE + Record rec; +#else char record_info[SYS_IDX_ENTRY_LEN]; +#endif char *fname, *file_type; RecType rt; struct recRetrieveCtrl retrieveCtrl; +#if RECORD_BASE + rec = rec_get (zi->records, sysno); + file_type = rec->info[0]; + fname = rec->info[1]; +#else if (lseek (zi->sys_idx_fd, sysno * SYS_IDX_ENTRY_LEN, SEEK_SET) == -1) { @@ -137,26 +202,42 @@ static int record_fetch (ZServerInfo *zi, int sysno, ODR stream, } file_type = record_info; fname = record_info + strlen(record_info) + 1; +#endif + 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) { - 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); +#if RECORD_BASE + rec_rm (rec); +#endif + 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 = input_format; + 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); +#if RECORD_BASE + rec_rm (rec); +#endif return retrieveCtrl.diagnostic; } @@ -170,8 +251,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) @@ -186,8 +268,10 @@ bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num) logf (LOG_DEBUG, "Out of range. pos=%d", q->number); return &r; } - r.errcode = record_fetch (&server_info, records[0].sysno, q->stream, - q->format, &r.format, &r.record, &r.len); + r.errcode = record_fetch (&server_info, records[0].sysno, + records[0].score, q->stream, q->format, + q->comp, &r.format, &r.record, &r.len); + resultSetSysnoDel (&server_info, records, 1); return &r; } @@ -198,22 +282,21 @@ 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; + server_info.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, q->term, + q->num_bases, q->basenames, + &r.term_position, + &r.num_entries, &r.entries, &status); + r.errstring = server_info.errString; + r.status = status; return &r; } @@ -222,9 +305,11 @@ void bend_close (void *handle) dict_close (server_info.fileDict); dict_close (server_info.wordDict); is_close (server_info.wordIsam); +#if RECORD_BASE + rec_close (&server_info.records); +#else close (server_info.sys_idx_fd); - xfree (server_info.recordBuf); - server_info.recordBuf = NULL; +#endif return; }