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

diff --git a/index/index.h b/index/index.h
index d9ed54e..e058b3b 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.151 2005-09-16 09:58:39 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -54,7 +54,7 @@ YAZ_BEGIN_CDECL
 
 #define IT_MAX_WORD 256
 
-#define IT_KEY_LEVEL_MAX 4
+#define IT_KEY_LEVEL_MAX 5
 struct it_key {
     int  len;
     zint mem[IT_KEY_LEVEL_MAX];
@@ -199,11 +199,15 @@ struct recKeys {
     void *codec_handle;
 };
 
+#if NATTR
+
+#else
 struct sortKeys {
     int buf_used;
     int buf_max;
     char *buf;
 };
+#endif
 
 struct zebra_register {
     char *name;
@@ -231,10 +235,10 @@ struct zebra_register {
     int active; /* 0=shutdown, 1=enabled and inactive, 2=activated */
 
     struct recKeys keys;
-#if 1
-    struct sortKeys sortKeys;
+#if NATTR
+    struct recKeys sortKeys;
 #else
-    struct sortKey *sortKeys;
+    struct sortKeys sortKeys;
 #endif
     char **key_buf;
     size_t ptr_top;
@@ -246,7 +250,6 @@ struct zebra_register {
 struct zebra_service {
     int stop_flag;
     Res global_res;
-    char *configName;
     struct zebra_session *sessions;
     struct zebra_register *regs;
     Zebra_mutex_cond session_lock;
@@ -266,6 +269,7 @@ struct zebra_session {
 
     char **basenames;
     int num_basenames;
+    zint approx_limit;
     char *reg_name;
     char *path_reg;
 
@@ -278,6 +282,7 @@ struct zebra_session {
     int destroyed;
     ZebraSet sets;
     Res res;
+    Res session_res;
     char *user_perm;
     int errCode;
     zint hits;
@@ -288,6 +293,8 @@ struct zebra_session {
 #endif
     int  shadow_enable;
 
+    int m_staticrank;
+
     zint records_inserted;
     zint records_updated;
     zint records_deleted;
@@ -309,6 +316,7 @@ struct zebra_session {
 
     void *store_data_buf;
     size_t store_data_size;
+    NMEM nmem_error;
 
     struct zebra_limit *m_limit;
 };
@@ -326,7 +334,8 @@ struct rank_control {
      *	int rssize;	// number of records in result set (estimate?)
      */
     void (*end)(struct zebra_register *reg, void *set_handle);
-    int (*calc)(void *set_handle, zint sysno);
+    int (*calc)(void *set_handle, zint sysno, zint staticrank,
+		int *stop_flag);
     void (*add)(void *set_handle, int seqno, TERMID term);
 };
 
@@ -363,10 +372,12 @@ 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,
+		zint hits_limit, const char *term_ref_id);
 
 void resultSetAddTerm (ZebraHandle zh, ZebraSet s, int reg_type,
 		       const char *db, int set,
@@ -379,14 +390,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);
@@ -408,11 +421,12 @@ void zebraRankDestroy (struct zebra_register *reg);
 int att_getentbyatt(ZebraHandle zh, attent *res, oid_value set, int att,
 		const char *sattr);
 
-extern struct rank_control *rank1_class;
-extern struct rank_control *rankzv_class;
-extern struct rank_control *rankliv_class;
+extern struct rank_control *rank_1_class;
+extern struct rank_control *rank_zv_class;
+extern struct rank_control *rank_static_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,10 +474,22 @@ 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);
+                              int cmd, struct recKeys *reckeys,
+			      zint staticrank);
+#if NATTR
+void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
+                            int cmd, struct recKeys *skp);
+#else
 void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
                             int cmd, struct sortKeys *skp);
+#endif
 void extract_schema_add (struct recExtractCtrl *p, Odr_oid *oid);
 void extract_token_add (RecWord *p);
 int explain_extract (void *handle, Record rec, data1_node *n);
@@ -488,6 +514,17 @@ 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);
+
+void zebra_term_untrans(ZebraHandle zh, int reg_type,
+			char *dst, const char *src);
+
 YAZ_END_CDECL
 
 #endif