X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=5fdc519e7a33e31bd8dd1ac810520317694a2cda;hb=fdbaae03ebe22fb5ede3b0e857fe7691e1d55b28;hp=d32ada48885fdfb228998768a125a72af62cd953;hpb=8ee402d79e37344b08c2b54ad45b50e8327a6c03;p=idzebra-moved-to-github.git

diff --git a/index/index.h b/index/index.h
index d32ada4..5fdc519 100644
--- a/index/index.h
+++ b/index/index.h
@@ -1,6 +1,6 @@
-/* $Id: index.h,v 1.121 2004-09-27 10:44:49 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: index.h,v 1.131 2005-03-30 09:25:23 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -24,9 +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 <zebramap.h>
+#include <idzebra/util.h>
 #include <sortidx.h>
 
 #if HAVE_SYS_TIMES_H
@@ -34,12 +34,12 @@ 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 <data1.h>
-#include <recctrl.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"
 #include <idzebra/api.h>
 #include "zinfo.h"
@@ -183,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 {
@@ -319,7 +312,9 @@ struct rank_control {
     char *name;
     void *(*create)(ZebraHandle zh);
     void (*destroy)(struct zebra_register *reg, void *class_handle);
-    void *(*begin)(struct zebra_register *reg, void *class_handle, RSET rset);
+    void *(*begin)(struct zebra_register *reg, 
+                   void *class_handle, RSET rset, NMEM nmem,
+                   TERMID *terms, int numterms);
     /* ### Could add parameters to begin:
      *	char *index;	// author, title, etc.
      *	int dbsize;	// number of records in database
@@ -327,7 +322,7 @@ struct rank_control {
      */
     void (*end)(struct zebra_register *reg, void *set_handle);
     int (*calc)(void *set_handle, zint sysno);
-    void (*add)(void *set_handle, int seqno, int term_index);
+    void (*add)(void *set_handle, int seqno, TERMID term);
 };
 
 struct term_set_entry {
@@ -367,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,
@@ -380,7 +369,7 @@ void resultSetSort (ZebraHandle zh, NMEM nmem,
 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);
+void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset, NMEM nmem);
 void resultSetInvalidate (ZebraHandle zh);
 
 int zebra_server_lock_init (ZebraService zh);
@@ -409,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);