X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.h;h=18bde7d51cfd83f8a4dbbf65c1f7f7c4e2f7871b;hb=3726bf6622da6a8b983bb4cbb7d654e84c3216d7;hp=098ab508f86ecec0b013642dd7424a4744d6d9af;hpb=f3fb9ca751f7bca28706c951df4ea9d22106c6a8;p=idzebra-moved-to-github.git diff --git a/index/zserver.h b/index/zserver.h index 098ab50..18bde7d 100644 --- a/index/zserver.h +++ b/index/zserver.h @@ -1,10 +1,49 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: zserver.h,v $ - * Revision 1.32 1998-05-27 16:57:47 adam + * Revision 1.43 1999-07-14 10:59:27 adam + * Changed functions isc_getmethod, isams_getmethod. + * Improved fatal error handling (such as missing EXPLAIN schema). + * + * Revision 1.42 1999/05/26 07:49:13 adam + * C++ compilation. + * + * Revision 1.41 1999/05/12 13:08:06 adam + * First version of ISAMS. + * + * Revision 1.40 1998/11/16 16:03:45 adam + * Moved loggin utilities to Yaz. Was implemented in file zlogs.c. + * + * Revision 1.39 1998/10/16 08:14:35 adam + * Updated record control system. + * + * Revision 1.38 1998/09/22 10:03:44 adam + * Changed result sets to be persistent in the sense that they can + * be re-searched if needed. + * Fixed memory leak in rsm_or. + * + * Revision 1.37 1998/09/02 13:53:22 adam + * Extra parameter decode added to search routines to implement + * persistent queries. + * + * Revision 1.36 1998/06/24 12:16:16 adam + * Support for relations on text operands. Open range support in + * DFA module (i.e. [-j], [g-]). + * + * Revision 1.35 1998/06/23 15:33:35 adam + * Added feature to specify sort criteria in query (type 7 specifies + * sort flags). + * + * Revision 1.34 1998/06/22 11:36:50 adam + * Added authentication check facility to zebra. + * + * Revision 1.33 1998/06/12 12:22:14 adam + * Work on Zebra API. + * + * Revision 1.32 1998/05/27 16:57:47 adam * Zebra returns surrogate diagnostic for single records when * appropriate. * @@ -114,16 +153,7 @@ * */ - -#ifndef USE_TIMES -#ifdef __linux__ -#define USE_TIMES 1 -#else -#define USE_TIMES 0 -#endif -#endif - -#if USE_TIMES +#if HAVE_SYS_TIMES_H #include #endif @@ -131,9 +161,15 @@ #include #include +#include #include "index.h" +#include "zebraapi.h" #include "zinfo.h" +#ifdef __cplusplus +extern "C" { +#endif + typedef struct { int sysno; int score; @@ -156,6 +192,7 @@ struct zebra_info { SortIdx sortIdx; ISAM isam; ISAMC isamc; + ISAMS isams; Records records; int errCode; int hits; @@ -168,16 +205,16 @@ struct zebra_info { ZebraLockHandle server_lock_cmt; ZebraLockHandle server_lock_org; char *server_path_prefix; -#if USE_TIMES +#if HAVE_SYS_TIMES_H struct tms tms1; struct tms tms2; #endif ZebraMaps zebra_maps; ZebraRankClass rank_classes; + RecTypes recTypes; + Passwd_db passwd_db; }; -typedef struct zebra_info *ZebraHandle; - struct rank_control { char *name; void *(*create)(ZebraHandle zh); @@ -188,15 +225,10 @@ struct rank_control { void (*add)(void *set_handle, int seqno, int term_index); }; -void rpn_search (ZebraHandle zh, ODR stream, +RSET rpn_search (ZebraHandle zh, NMEM mem, Z_RPNQuery *rpn, int num_bases, char **basenames, - const char *setname); - + const char *setname, ZebraSet sset); -typedef struct { - int occurrences; - char *term; -} ZebraScanEntry; void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, oid_value attributeset, @@ -207,9 +239,10 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, RSET rset_trunc (ZebraHandle zh, ISAM_P *isam_p, int no, const char *term, int length_term, const char *flags); -ZebraSet resultSetAdd (ZebraHandle zh, const char *name, - int ov, RSET rset, int *hits); +ZebraSet resultSetAdd (ZebraHandle zh, const char *name, int ov); ZebraSet resultSetGet (ZebraHandle zh, const char *name); +ZebraSet resultSetAddRPN (ZebraHandle zh, ODR stream, ODR decode, Z_RPNQuery *rpn, int num_bases, char **basenames, + const char *setname); RSET resultSetRef (ZebraHandle zh, Z_ResultSetId *resultSetId); void resultSetDestroy (ZebraHandle zh); @@ -217,19 +250,20 @@ ZebraPosSet zebraPosSetCreate (ZebraHandle zh, const char *name, int num, int *positions); void zebraPosSetDestroy (ZebraHandle zh, ZebraPosSet records, int num); -void resultSetSort (ZebraHandle zh, ODR stream, - int num_input_setnames, char **input_setnames, - char *output_setname, Z_SortKeySpecList *sort_sequence, - int *sort_status); +void resultSetSort (ZebraHandle zh, NMEM nmem, + int num_input_setnames, const char **input_setnames, + const char *output_setname, + Z_SortKeySpecList *sort_sequence, int *sort_status); +void resultSetSortSingle (ZebraHandle zh, NMEM nmem, + ZebraSet sset, RSET rset, + Z_SortKeySpecList *sort_sequence, int *sort_status); +void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset); void zebra_sort (ZebraHandle zh, ODR stream, - int num_input_setnames, char **input_setnames, - char *output_setname, Z_SortKeySpecList *sort_sequence, + int num_input_setnames, const char **input_setnames, + const char *output_setname, Z_SortKeySpecList *sort_sequence, int *sort_status); -void zlog_rpn (Z_RPNQuery *rpn); -void zlog_scan (Z_AttributesPlusTerm *zapt, oid_value ast); - int zebra_server_lock_init (ZebraHandle zh); int zebra_server_lock_destroy (ZebraHandle zh); int zebra_server_lock (ZebraHandle zh, int lockCommit); @@ -250,36 +284,11 @@ int att_getentbyatt(ZebraHandle zh, attent *res, oid_value set, int att); extern struct rank_control *rank1_class; -ZebraHandle zebra_open (const char *host, const char *configName); -void zebra_search_rpn (ZebraHandle zh, ODR stream, - Z_RPNQuery *query, int num_bases, char **basenames, - const char *setname); - -typedef struct { - int errCode; - char *errString; - int position; - char *buf; - int len; - oid_value format; - char *base; -} ZebraRetrievalRecord; - -void zebra_records_retrieve (ZebraHandle zh, ODR stream, - const char *setname, Z_RecordComposition *comp, - oid_value input_format, - int num_recs, ZebraRetrievalRecord *recs); - int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream, oid_value input_format, Z_RecordComposition *comp, oid_value *output_format, char **rec_bufp, int *rec_lenp, char **basenamep); -void zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, - oid_value attributeset, - int num_bases, char **basenames, - int *position, int *num_entries, ZebraScanEntry **list, - int *is_partial); - -void zebra_close (ZebraHandle zh); - +#ifdef __cplusplus +} +#endif