X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=index%2Fzserver.h;h=04547fb869b377ddac7fa3345c832e70149c8088;hb=0d1685e5db9bf74ff80a4b483754532a73fcbb74;hp=60cb91ce5c2feaa1bac3c97197c4fb97428fcee2;hpb=8c1de7f1c9610a8da280fe93d785054ce86e7330;p=idzebra-moved-to-github.git diff --git a/index/zserver.h b/index/zserver.h index 60cb91c..04547fb 100644 --- a/index/zserver.h +++ b/index/zserver.h @@ -4,7 +4,26 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: zserver.h,v $ - * Revision 1.7 1995-10-06 10:43:57 adam + * Revision 1.13 1995-11-16 15:34:56 adam + * Uses new record management system in both indexer and server. + * + * Revision 1.12 1995/10/27 14:00:12 adam + * Implemented detection of database availability. + * + * Revision 1.11 1995/10/17 18:02:12 adam + * New feature: databases. Implemented as prefix to words in dictionary. + * + * Revision 1.10 1995/10/09 16:18:38 adam + * Function dict_lookup_grep got extra client data parameter. + * + * Revision 1.9 1995/10/06 14:38:01 adam + * New result set method: r_score. + * Local no (sysno) and score is transferred to retrieveCtrl. + * + * Revision 1.8 1995/10/06 13:52:06 adam + * Bug fixes. Handler may abort further scanning. + * + * Revision 1.7 1995/10/06 10:43:57 adam * Scan added. 'occurrences' in scan entries not set yet. * * Revision 1.6 1995/09/28 09:19:48 adam @@ -28,17 +47,17 @@ * */ -#include "index.h" #include #include -typedef struct { - size_t size; - char *buf; -} ZServerRecord; +#include "index.h" +#if RECORD_BASE +#include "recindex.h" +#endif typedef struct { int sysno; + int score; } ZServerSetSysno; typedef struct ZServerSet_ { @@ -53,8 +72,11 @@ typedef struct { Dict wordDict; ISAM wordIsam; Dict fileDict; +#if RECORD_BASE + Records records; +#else int sys_idx_fd; - char *recordBuf; +#endif int errCode; char *errString; ODR odr; @@ -64,12 +86,14 @@ int rpn_search (ZServerInfo *zi, Z_RPNQuery *rpn, int num_bases, char **basenames, const char *setname, int *hits); -int rpn_scan (ZServerInfo *zi, ODR odr, Z_AttributesPlusTerm *zapt, - int *position, int *num_entries, struct scan_entry **list); +int rpn_scan (ZServerInfo *zi, Z_AttributesPlusTerm *zapt, + int num_bases, char **basenames, + int *position, int *num_entries, struct scan_entry **list, + int *status); ZServerSet *resultSetAdd (ZServerInfo *zi, const char *name, int ov, RSET rset); ZServerSet *resultSetGet (ZServerInfo *zi, const char *name); ZServerSetSysno *resultSetSysnoGet (ZServerInfo *zi, const char *name, int num, int *positions); -void resultSetRecordDel (ZServerInfo *zi, ZServerRecord *records, int num); +void resultSetSysnoDel (ZServerInfo *zi, ZServerSetSysno *records, int num);