X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=index%2Findex.h;h=8e7b995fc1a81fa571219bc73bd956f3aa06810e;hb=316086745a698f6c5a5e64a285cf1e764e3315b0;hp=39ad8809b2413ceb510dc702c674f0ed8f84c0cc;hpb=73bedd5ba9152c9c107b502fae65723b551aff09;p=idzebra-moved-to-github.git

diff --git a/index/index.h b/index/index.h
index 39ad880..8e7b995 100644
--- a/index/index.h
+++ b/index/index.h
@@ -1,6 +1,6 @@
-/* $Id: index.h,v 1.124 2004-10-26 15:32:11 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: index.h,v 1.132 2005-04-13 13:03:47 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -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
@@ -33,10 +34,10 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #endif
 #include <sys/stat.h>
 
-#include <dict.h>
-#include <isams.h>
-#include <isamc.h>
-#include <isamb.h>
+#include <idzebra/dict.h>
+#include <idzebra/isams.h>
+#include <idzebra/isamc.h>
+#include <idzebra/isamb.h>
 #include <d1_absyn.h>
 #include <idzebra/recgrs.h>
 #include "recindex.h"
@@ -182,13 +183,6 @@ char *encode_key_int (int d, char *bp);
 void encode_key_write (char *k, struct encode_info *i, FILE *outf);
 void encode_key_flush (struct encode_info *i, FILE *outf);
 
-typedef struct {
-    char *term;
-    char *db;
-    zint sysno;
-    int score;
-} *ZebraPosSet;
-
 typedef struct zebra_set *ZebraSet;
 
 typedef struct zebra_rank_class {
@@ -352,7 +346,7 @@ void 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, 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);
@@ -368,12 +362,6 @@ ZebraSet 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);
-
-
-ZebraPosSet zebraPosSetCreate (ZebraHandle zh, const char *name,
-			       int num, int *positions);
-void zebraPosSetDestroy (ZebraHandle zh, ZebraPosSet records, int num);
-
 void resultSetSort (ZebraHandle zh, NMEM nmem,
 		    int num_input_setnames, const char **input_setnames,
 		    const char *output_setname,
@@ -410,7 +398,8 @@ extern struct rank_control *rankliv_class;
 int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, ODR stream,
 			oid_value input_format, Z_RecordComposition *comp,
 			oid_value *output_format, char **rec_bufp,
-			int *rec_lenp, char **basenamep);
+			int *rec_lenp, char **basenamep,
+			char **addinfo);
 
 void extract_get_fname_tmp (ZebraHandle zh, char *fname, int no);