X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=131f12cb209a9a75f15f0e6d39fa80b99d6f58aa;hb=be32b4e5c154545c2b91b76144d6cbf1238f969a;hp=d9ed54e1c81a5d69fc3d9799bb6c4d72142e8660;hpb=e8899adeac7c35feef7b93af73c2026245b2a205;p=idzebra-moved-to-github.git

diff --git a/index/index.h b/index/index.h
index d9ed54e..131f12c 100644
--- a/index/index.h
+++ b/index/index.h
@@ -1,4 +1,4 @@
-/* $Id: index.h,v 1.137 2005-05-09 19:57:35 adam Exp $
+/* $Id: index.h,v 1.143 2005-06-09 10:39:53 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -266,6 +266,7 @@ struct zebra_session {
 
     char **basenames;
     int num_basenames;
+    zint approx_limit;
     char *reg_name;
     char *path_reg;
 
@@ -309,6 +310,7 @@ struct zebra_session {
 
     void *store_data_buf;
     size_t store_data_size;
+    NMEM nmem_error;
 
     struct zebra_limit *m_limit;
 };
@@ -363,10 +365,11 @@ ZEBRA_RES rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
 		    int *position, int *num_entries, ZebraScanEntry **list,
 		    int *is_partial, RSET limit_set, int return_zero);
 
-RSET rset_trunc (ZebraHandle zh, ISAM_P *isam_p, int no,
-		 const char *term, int length_term, const char *flags,
-                 int preserve_position, int term_type, NMEM rset_nmem,
-                 struct rset_key_control *kctrl, int scope);
+RSET rset_trunc(ZebraHandle zh, ISAM_P *isam_p, int no,
+		const char *term, int length_term, const char *flags,
+		int preserve_position, int term_type, NMEM rset_nmem,
+		struct rset_key_control *kctrl, int scope,
+		struct ord_list *ol, int reg_type);
 
 void resultSetAddTerm (ZebraHandle zh, ZebraSet s, int reg_type,
 		       const char *db, int set,
@@ -379,14 +382,16 @@ ZEBRA_RES resultSetAddRPN (ZebraHandle zh, NMEM m, Z_RPNQuery *rpn,
 RSET resultSetRef (ZebraHandle zh, const char *resultSetId);
 void resultSetDestroy (ZebraHandle zh, int num_names, char **names,
 		       int *statuses);
-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, NMEM nmem);
+ZEBRA_RES resultSetSort (ZebraHandle zh, NMEM nmem,
+			 int num_input_setnames, const char **input_setnames,
+			 const char *output_setname,
+			 Z_SortKeySpecList *sort_sequence, int *sort_status);
+ZEBRA_RES resultSetSortSingle (ZebraHandle zh, NMEM nmem,
+			       ZebraSet sset, RSET rset,
+			       Z_SortKeySpecList *sort_sequence,
+			       int *sort_status);
+ZEBRA_RES resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset,
+			 NMEM nmem);
 void resultSetInvalidate (ZebraHandle zh);
 
 int zebra_server_lock_init (ZebraService zh);
@@ -412,7 +417,8 @@ extern struct rank_control *rank1_class;
 extern struct rank_control *rankzv_class;
 extern struct rank_control *rankliv_class;
 
-int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, ODR stream,
+int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, 
+			zebra_snippets *hit_snippet, ODR stream,
 			oid_value input_format, Z_RecordComposition *comp,
 			oid_value *output_format, char **rec_bufp,
 			int *rec_lenp, char **basenamep,
@@ -460,6 +466,12 @@ off_t zebra_record_int_tell (void *fh);
 int zebra_record_int_read (void *fh, char *buf, size_t count);
 void zebra_record_int_end (void *fh, off_t offset);
 
+void print_rec_keys(ZebraHandle zh, struct recKeys *reckeys);
+ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh, struct recKeys *reckeys,
+				  zebra_snippets *snippets);
+ZEBRA_RES zebra_snippets_hit_vector(ZebraHandle zh, const char *setname,
+				    zint sysno, zebra_snippets *snippets);
+
 void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
                               int cmd, struct recKeys *reckeys);
 void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
@@ -488,6 +500,14 @@ void iscz1_encode (void *vp, char **dst, const char **src);
 Dict dict_open_res (BFiles bfs, const char *name, int cache, int rw,
 		    int compact_flag, Res res);
 
+void zebra_setError(ZebraHandle zh, int code, const char *addinfo);
+void zebra_setError_zint(ZebraHandle zh, int code, zint i);
+
+void zebra_term_untrans_iconv(ZebraHandle zh, NMEM stream, int reg_type,
+			      char **dst, const char *src);
+
+ZEBRA_RES zebra_get_hit_vector(ZebraHandle zh, const char *setname, zint sysno);
+
 YAZ_END_CDECL
 
 #endif