dom: accept type="adelete" (accept bad deletes)

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

diff --git a/index/index.h b/index/index.h
index 8ef0835..2ee8b61 100644 (file)
--- a/index/index.h
+++ b/index/index.h
@@ -1,8 +1,5 @@
-/* $Id: index.h,v 1.213 2007-12-13 11:09:20 adam Exp $
-   Copyright (C) 1995-2007
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 2004-2013 Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -71,7 +68,7 @@ struct dirs_entry {
 };
 
 void getFnameTmp(Res res, char *fname, int no);
-        
+
 struct dirs_info *dirs_open(Dict dict, const char *rep, int rw);
 struct dirs_info *dirs_fopen(Dict dict, const char *path, int rw);
 struct dirs_entry *dirs_read(struct dirs_info *p);
@@ -128,7 +125,7 @@ typedef struct zebra_rank_class {
 
 struct zebra_register {
     char *name;
-    
+
     ISAMS isams;
     ISAMC isamc;
     ISAMB isamb;
@@ -201,7 +198,7 @@ struct zebra_session {
     int partial_result;
 #if HAVE_SYS_TIMES_H
     struct tms tms1;
-    struct tms tms2;    
+    struct tms tms2;
 #endif
     int  shadow_enable;
 
@@ -260,7 +257,7 @@ void zebra_limit_for_rset(struct zebra_limit *zl,
 struct rset_key_control *zebra_key_control_create(ZebraHandle zh);
 
 ZEBRA_RES rpn_search_top(ZebraHandle zh, Z_RPNStructure *zs,
-                        const Odr_oid *attributeSet, 
+                        const Odr_oid *attributeSet, zint hits_limit,
                         NMEM stream, NMEM rset_nmem,
                         Z_SortKeySpecList *sort_sequence,
                         int num_bases, const char **basenames,
@@ -310,12 +307,12 @@ ZEBRA_RES resultSetRank(ZebraHandle zh, ZebraSet zebraSet, RSET rset,
 void resultSetInvalidate(ZebraHandle zh);
 
 int zebra_record_fetch(ZebraHandle zh, const char *setname,
-                       zint sysno, int score, 
+                       zint sysno, int score,
                        ODR stream,
                        const Odr_oid *input_format, Z_RecordComposition *comp,
                        const Odr_oid **output_format, char **rec_bufp,
                        int *rec_lenp, char **basenamep,
-                       char **addinfo);
+                       WRBUF addinfo_w);
 
 void extract_get_fname_tmp(ZebraHandle zh, char *fname, int no);
 
@@ -328,26 +325,14 @@ int zebra_get_rec_snippets(ZebraHandle zh, zint sysno,
 
 void zebra_index_merge(ZebraHandle zh);
 
-ZEBRA_RES zebra_buffer_extract_record(ZebraHandle zh, 
+ZEBRA_RES zebra_buffer_extract_record(ZebraHandle zh,
                                       const char *buf, size_t buf_size,
                                       enum zebra_recctrl_action_t action,
-                                      int test_mode, 
                                       const char *recordType,
                                       zint *sysno,
                                       const char *match_criteria,
                                       const char *fname);
 
-ZEBRA_RES zebra_extract_record_stream(ZebraHandle zh, 
-                                      struct ZebraRecStream *stream,
-                                      enum zebra_recctrl_action_t action,
-                                      int test_mode, 
-                                      const char *recordType,
-                                      zint *sysno,
-                                      const char *match_criteria,
-                                      const char *fname,
-                                      RecType recType,
-                                      void *recTypeClientData,
-                                      int *more);
 
 YAZ_EXPORT void zebra_create_stream_mem(struct ZebraRecStream *stream,
                                         const char *buf, size_t sz);
@@ -363,7 +348,7 @@ ZEBRA_RES zebra_snippets_hit_vector(ZebraHandle zh, const char *setname,
 ZEBRA_RES zebra_extract_explain(void *handle, Record rec, data1_node *n);
 
 ZEBRA_RES zebra_extract_file(ZebraHandle zh, zint *sysno, const char *fname,
-                            int deleteFlag);
+                             enum zebra_recctrl_action_t action);
 
 ZEBRA_RES zebra_begin_read(ZebraHandle zh);
 ZEBRA_RES zebra_end_read(ZebraHandle zh);
@@ -377,7 +362,7 @@ Dict dict_open_res(BFiles bfs, const char *name, int cache, int rw,
 void zebra_setError(ZebraHandle zh, int code, const char *addinfo);
 void zebra_setError_zint(ZebraHandle zh, int code, zint i);
 
-int zebra_term_untrans_iconv(ZebraHandle zh, NMEM stream, 
+int zebra_term_untrans_iconv(ZebraHandle zh, NMEM stream,
                              const char *index_type,
                              char **dst, const char *src);
 
@@ -406,8 +391,8 @@ ZEBRA_RES zebra_sort_get_ord(ZebraHandle zh,
                              int *numerical);
 
 ZEBRA_RES zebra_update_file_match(ZebraHandle zh, const char *path);
-ZEBRA_RES zebra_update_from_path(ZebraHandle zh, const char *path);
-ZEBRA_RES zebra_delete_from_path(ZebraHandle zh, const char *path);
+ZEBRA_RES zebra_update_from_path(ZebraHandle zh, const char *path,
+                                 enum zebra_recctrl_action_t action);
 ZEBRA_RES zebra_remove_file_match(ZebraHandle zh);
 
 struct rpn_char_map_info
@@ -437,7 +422,7 @@ ZEBRA_RES zebra_term_limits_APT(ZebraHandle zh,
                                 const char **term_ref_id_str,
                                 NMEM nmem);
 
-ZEBRA_RES zebra_result_recid_to_sysno(ZebraHandle zh, 
+ZEBRA_RES zebra_result_recid_to_sysno(ZebraHandle zh,
                                       const char *setname,
                                       zint recid,
                                       zint *sysnos, int *no_sysnos);
@@ -449,12 +434,16 @@ RSET zebra_create_rset_isam(ZebraHandle zh,
                             NMEM rset_nmem, struct rset_key_control *kctl,
                             int scope, ISAM_P pos, TERMID termid);
 
+void zebra_it_key_str_dump(ZebraHandle zh, struct it_key *key,
+                           const char *str, size_t slen, NMEM nmem, int level);
+
 YAZ_END_CDECL
 
 #endif
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab