Comment zebra_result_set_term_{no,info}.

[idzebra-moved-to-github.git] / index / index.h

diff --git a/index/index.h b/index/index.h
index 6d656ac..3f952f2 100644 (file)
--- a/index/index.h
+++ b/index/index.h
@@ -1,4 +1,4 @@
-/* $Id: index.h,v 1.141 2005-06-07 11:36:38 adam Exp $
+/* $Id: index.h,v 1.145 2005-06-23 06:45:46 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -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;
@@ -266,6 +270,7 @@ struct zebra_session {
 
     char **basenames;
     int num_basenames;
+    zint approx_limit;
     char *reg_name;
     char *path_reg;
 
@@ -368,7 +373,8 @@ 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);
+               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,
@@ -473,8 +479,13 @@ ZEBRA_RES zebra_snippets_hit_vector(ZebraHandle zh, const char *setname,
 
 void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
                               int cmd, struct recKeys *reckeys);
+#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);