X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=7359cfce316334a2656d175b30d3c7bdbeb1c674;hb=230fdc17aa503a23c842cd587f241cfe2fce1c0d;hp=5d9bcfa22cfe2dbe2396e1e086762b72fad29604;hpb=2e4e9c6def27f1e1463dcb6f205fab6a98054f38;p=idzebra-moved-to-github.git

diff --git a/index/index.h b/index/index.h
index 5d9bcfa..7359cfc 100644
--- a/index/index.h
+++ b/index/index.h
@@ -1,4 +1,4 @@
-/* $Id: index.h,v 1.110 2004-08-04 08:35:23 adam Exp $
+/* $Id: index.h,v 1.116 2004-08-31 14:43:41 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -24,7 +24,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #define INDEX_H
 
 #include <time.h>
-#include <zebraver.h>
+#include <idzebra/version.h>
 #include <zebrautl.h>
 #include <zebramap.h>
 #include <sortidx.h>
@@ -36,20 +36,20 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include <dict.h>
 #include <isams.h>
-#include <isam.h>
 #include <isamc.h>
 #include <isamb.h>
-#define ISAM_DEFAULT "c"
 #include <data1.h>
 #include <recctrl.h>
 #include "recindex.h"
-#include "zebraapi.h"
+#include <idzebra/api.h>
 #include "zinfo.h"
 #include <passwddb.h>
 #include <rset.h>
 
 YAZ_BEGIN_CDECL
 
+#define ISAM_DEFAULT "b"
+
 #define SU_SCHEME 1
 
 #define IT_MAX_WORD 256
@@ -73,6 +73,13 @@ struct it_key {
 };
 #endif
 
+struct key_info {
+    int keysize;
+    int (*key_compare) (const void *p1, const void *p2);
+    void (*key_logdump_txt) (int logmask, const void *p, const char *txt);
+    /* FIXME - decode and encode, and lots of other stuff */
+};
+
 enum dirsKind { dirs_dir, dirs_file };
 
 struct dir_entry {
@@ -201,7 +208,7 @@ void encode_key_flush (struct encode_info *i, FILE *outf);
 typedef struct {
     char *term;
     char *db;
-    int sysno;
+    zint sysno;
     int score;
 } *ZebraPosSet;
 
@@ -237,7 +244,6 @@ struct zebra_register {
     char *name;
     
     ISAMS isams;
-    ISAM isam;
     ISAMC isamc;
     ISAMB isamb;
     Dict dict;
@@ -307,7 +313,7 @@ struct zebra_session {
     Res res;
     char *user_perm;
     int errCode;
-    int hits;
+    zint hits;
     char *errString;
 #if HAVE_SYS_TIMES_H
     struct tms tms1;
@@ -315,10 +321,10 @@ struct zebra_session {
 #endif
     int  shadow_enable;
 
-    int records_inserted;
-    int records_updated;
-    int records_deleted;
-    int records_processed;
+    zint records_inserted;
+    zint records_updated;
+    zint records_deleted;
+    zint records_processed;
     char *record_encoding;
 
     yaz_iconv_t iconv_to_utf8;
@@ -360,7 +366,7 @@ struct term_set_list {
     struct term_set_entry *last;
 };
 
-RSET rpn_search (ZebraHandle zh, NMEM mem,
+RSET rpn_search (ZebraHandle zh, NMEM mem, NMEM rset_nmem,
 		 Z_RPNQuery *rpn, int num_bases, char **basenames, 
 		 const char *setname, ZebraSet sset);
 
@@ -373,7 +379,7 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
 
 RSET rset_trunc (ZebraHandle zh, ISAMS_P *isam_p, int no,
 		 const char *term, int length_term, const char *flags,
-                 int preserve_position, int term_type);
+                 int preserve_position, int term_type, NMEM rset_nmem);
 
 void resultSetAddTerm (ZebraHandle zh, ZebraSet s, int reg_type,
 		       const char *db, int set,