X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=2c9c981fbbcd3d552627926c70da4401882ddbf2;hb=dc030e8fbc67937e0fa1812f6ce4a8ab728d092c;hp=27c4aa233c3f5572d3c006801de46516e2b9773f;hpb=6c9fcd3b5d3108702fa1ffc92dab4ab6060f9a19;p=idzebra-moved-to-github.git

diff --git a/index/index.h b/index/index.h
index 27c4aa2..2c9c981 100644
--- a/index/index.h
+++ b/index/index.h
@@ -1,4 +1,4 @@
-/* $Id: index.h,v 1.129 2005-01-15 19:38:25 adam Exp $
+/* $Id: index.h,v 1.135 2005-04-28 08:20:40 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -24,8 +24,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #define INDEX_H
 
 #include <time.h>
+#include <stdlib.h>
 #include <idzebra/version.h>
-#include <zebrautl.h>
+#include <idzebra/util.h>
 #include <sortidx.h>
 
 #if HAVE_SYS_TIMES_H
@@ -305,6 +306,9 @@ struct zebra_session {
     int m_explain_database;
     int m_flag_rw;
     int m_file_verbose_limit;
+
+    void *store_data_buf;
+    size_t store_data_size;
 };
 
 struct rank_control {
@@ -334,18 +338,20 @@ struct term_set_list {
     struct term_set_entry *last;
 };
 
-RSET rpn_search (ZebraHandle zh, NMEM mem, NMEM rset_nmem,
-		 Z_RPNQuery *rpn, int num_bases, char **basenames, 
-		 const char *setname, ZebraSet sset);
-
+ZEBRA_RES rpn_search_top(ZebraHandle zh, Z_RPNStructure *zs,
+			 oid_value attributeSet, 
+			 NMEM stream, NMEM rset_nmem,
+			 Z_SortKeySpecList *sort_sequence,
+			 int num_bases, char **basenames,
+			 RSET *result_set);
 
-void rpn_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, RSET limit_set, int return_zero);
+ZEBRA_RES rpn_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, RSET limit_set, int return_zero);
 
-RSET rset_trunc (ZebraHandle zh, ISAMS_P *isam_p, int no,
+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,
                  const struct key_control *kctrl, int scope);
@@ -355,9 +361,9 @@ void resultSetAddTerm (ZebraHandle zh, ZebraSet s, int reg_type,
 		       int use, const char *term);
 ZebraSet resultSetAdd (ZebraHandle zh, const char *name, int ov);
 ZebraSet resultSetGet (ZebraHandle zh, const char *name);
-ZebraSet resultSetAddRPN (ZebraHandle zh, NMEM m, Z_RPNQuery *rpn,
-                          int num_bases, char **basenames,
-                          const char *setname);
+ZEBRA_RES resultSetAddRPN (ZebraHandle zh, NMEM m, Z_RPNQuery *rpn,
+		     int num_bases, char **basenames,
+		     const char *setname);
 RSET resultSetRef (ZebraHandle zh, const char *resultSetId);
 void resultSetDestroy (ZebraHandle zh, int num_names, char **names,
 		       int *statuses);
@@ -404,16 +410,16 @@ void extract_get_fname_tmp (ZebraHandle zh, char *fname, int no);
 
 void zebra_index_merge (ZebraHandle zh);
 
-int buffer_extract_record (ZebraHandle zh, 
-			   const char *buf, size_t buf_size,
-			   int delete_flag,
-			   int test_mode, 
-			   const char *recordType,
-			   SYSNO *sysno,
-			   const char *match_criteria,
-			   const char *fname,
-			   int force_update,
-			   int allow_update);
+ZEBRA_RES buffer_extract_record (ZebraHandle zh, 
+				 const char *buf, size_t buf_size,
+				 int delete_flag,
+				 int test_mode, 
+				 const char *recordType,
+				 SYSNO *sysno,
+				 const char *match_criteria,
+				 const char *fname,
+				 int force_update,
+				 int allow_update);
 
 #if 0
 int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
@@ -453,8 +459,8 @@ int explain_extract (void *handle, Record rec, data1_node *n);
 int fileExtract (ZebraHandle zh, SYSNO *sysno, const char *fname,
 		 int deleteFlag);
 
-int zebra_begin_read (ZebraHandle zh);
-int zebra_end_read (ZebraHandle zh);
+ZEBRA_RES zebra_begin_read (ZebraHandle zh);
+ZEBRA_RES zebra_end_read (ZebraHandle zh);
 
 int zebra_file_stat (const char *file_name, struct stat *buf,
                      int follow_links);