Work on bug #550: Avoid exit. In particular the mfile/cfile/bfile has

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

diff --git a/index/index.h b/index/index.h
index 3fb6b1d..d323286 100644 (file)
--- a/index/index.h
+++ b/index/index.h
@@ -1,4 +1,4 @@
-/* $Id: index.h,v 1.177 2006-09-21 08:39:14 adam Exp $
+/* $Id: index.h,v 1.181 2006-11-09 14:39:24 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -299,11 +299,11 @@ ZEBRA_RES rpn_search_top(ZebraHandle zh, Z_RPNStructure *zs,
                         int num_bases, char **basenames,
                         RSET *result_set);
 
-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);
+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);
 
 RSET rset_trunc(ZebraHandle zh, ISAM_P *isam_p, int no,
                const char *term, int length_term, const char *flags,
@@ -392,8 +392,8 @@ YAZ_EXPORT void zebra_create_stream_fd(struct ZebraRecStream *stream,
                                        int fd, off_t start_offset);
 void print_rec_keys(ZebraHandle zh, zebra_rec_keys_t reckeys);
 
-ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh, zebra_rec_keys_t reckeys,
-                                 zebra_snippets *snippets);
+ZEBRA_RES zebra_rec_keys_to_snippets(ZebraHandle zh, zebra_rec_keys_t reckeys,
+                                     zebra_snippets *snippets);
 ZEBRA_RES zebra_snippets_hit_vector(ZebraHandle zh, const char *setname,
                                    zint sysno, zebra_snippets *snippets);
 
@@ -410,7 +410,7 @@ int zebra_file_stat (const char *file_name, struct stat *buf,
 
 void zebra_livcode_transform(ZebraHandle zh, Z_RPNQuery *query);
 
-void *iscz1_start ();
+void *iscz1_start (void);
 void iscz1_reset (void *vp);
 void iscz1_stop (void *p);
 void iscz1_decode (void *vp, char **dst, const char **src);
@@ -469,6 +469,7 @@ ZEBRA_RES zapt_term_to_utf8(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
 
 
 #define FIRST_IN_FIELD_STR "\001^"
+#define FIRST_IN_FIELD_CHAR 1
 #define FIRST_IN_FIELD_LEN 2
 
 YAZ_END_CDECL