More XPATH work; common sequence numbers for extract keys

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

diff --git a/index/index.h b/index/index.h
index 7e72df1..c70f783 100644 (file)
--- a/index/index.h
+++ b/index/index.h
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2002, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss, Heikki Levanto
- * $Id: index.h,v 1.76 2002-04-04 20:50:37 adam Exp $
+ * $Id: index.h,v 1.79 2002-04-12 14:55:22 adam Exp $
  */
 
 #ifndef INDEX_H
@@ -20,14 +20,10 @@
 
 #include <dict.h>
 #include <isams.h>
-#if ZMBOL
 #include <isam.h>
 #include <isamc.h>
 #include <isamd.h>
 #define ISAM_DEFAULT "c"
-#else
-#define ISAM_DEFAULT "s"
-#endif
 #include <yaz/data1.h>
 #include <recctrl.h>
 #include "recindex.h"
@@ -90,6 +86,7 @@ void repositoryShow (ZebraHandle zh);
 int key_open (ZebraHandle zh, int mem);
 int key_close (ZebraHandle zh);
 int key_compare (const void *p1, const void *p2);
+char *key_print_it (const void *p, char *buf);
 int key_get_pos (const void *p);
 int key_compare_it (const void *p1, const void *p2);
 int key_qsort_compare (const void *p1, const void *p2);
@@ -98,10 +95,8 @@ void inv_prstat (ZebraHandle zh);
 void inv_compact (BFiles bfs);
 void key_input (ZebraHandle zh, int nkeys, int cache, Res res);
 ISAMS_M key_isams_m (Res res, ISAMS_M me);
-#if ZMBOL
 ISAMC_M key_isamc_m (Res res, ISAMC_M me);
 ISAMD_M key_isamd_m (Res res, ISAMD_M me);
-#endif
 int merge_sort (char **buf, int from, int to);
 int key_SU_code (int ch, char *out);
 
@@ -205,11 +200,9 @@ struct zebra_register {
     char *name;
     
     ISAMS isams;
-#if ZMBOL
     ISAM isam;
     ISAMC isamc;
     ISAMD isamd;
-#endif
     Dict dict;
     Dict matchDict;
     SortIdx sortIdx;
@@ -314,7 +307,8 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
               int *is_partial);
 
 RSET rset_trunc (ZebraHandle zh, ISAMS_P *isam_p, int no,
-                const char *term, int length_term, const char *flags);
+                const char *term, int length_term, const char *flags,
+                 int preserve_position);
 
 void resultSetAddTerm (ZebraHandle zh, ZebraSet s, int reg_type,
                       const char *db, int set,