In zebra_commit_ex handle better the case where bfs cannot be created

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

diff --git a/index/index.h b/index/index.h
index e9c8f50..25fb160 100644 (file)
--- a/index/index.h
+++ b/index/index.h
@@ -1,4 +1,4 @@
-/* $Id: index.h,v 1.149 2005-08-19 11:04:23 adam Exp $
+/* $Id: index.h,v 1.158 2006-04-05 02:11:44 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -27,6 +27,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <stdlib.h>
 #include <idzebra/version.h>
 #include <idzebra/util.h>
+#include <idzebra/flock.h>
 #include <sortidx.h>
 
 #if HAVE_SYS_TIMES_H
@@ -141,25 +142,13 @@ void zebraIndexUnlock (ZebraHandle zh);
 int zebraIndexLock (BFiles bfs, ZebraHandle zh, int commitNow, const char *rval);
 int zebraIndexWait (ZebraHandle zh, int commitPhase);
 
+void zebra_lock_prefix (Res res, char *dst);
+
 #define FNAME_MAIN_LOCK   "zebraidx.LCK"
 #define FNAME_COMMIT_LOCK "zebracmt.LCK"
 #define FNAME_ORG_LOCK    "zebraorg.LCK"
 #define FNAME_TOUCH_TIME  "zebraidx.time"
 
-typedef struct zebra_lock_info *ZebraLockHandle;
-ZebraLockHandle zebra_lock_create(const char *dir,
-                                  const char *file, int excl_flag);
-void zebra_lock_destroy (ZebraLockHandle h);
-int zebra_lock (ZebraLockHandle h);
-int zebra_lock_nb (ZebraLockHandle h);
-int zebra_unlock (ZebraLockHandle h);
-int zebra_lock_fd (ZebraLockHandle h);
-void zebra_lock_prefix (Res res, char *dst);
-char *zebra_mk_fname (const char *dir, const char *name);
-
-int zebra_lock_w (ZebraLockHandle h);
-int zebra_lock_r (ZebraLockHandle h);
-
 void zebra_load_atts (data1_handle dh, Res res);
 
 int key_SU_decode (int *ch, const unsigned char *out);
@@ -175,6 +164,7 @@ struct encode_info {
     int prevcmd;
     int keylen; /* tells if we have an unwritten key in buf, and how long*/
     void *encode_handle;
+    void *decode_handle;
     char buf[ENCODE_BUFLEN];
 };
 
@@ -192,12 +182,7 @@ typedef struct zebra_rank_class {
     struct zebra_rank_class *next;
 } *ZebraRankClass;
 
-struct recKeys {
-    int buf_used;
-    int buf_max;
-    char *buf;
-    void *codec_handle;
-};
+#include "reckeys.h"
 
 #if NATTR
 
@@ -232,11 +217,11 @@ struct zebra_register {
     int seqno;
     int last_val;
     int stop_flag;
-    int active; /* 0=shutdown, 1=enabled and inactive, 2=activated */
 
-    struct recKeys keys;
+    zebra_rec_keys_t keys;
+
 #if NATTR
-    struct recKeys sortKeys;
+    zebra_rec_keys_t sortKeys;
 #else
     struct sortKeys sortKeys;
 #endif
@@ -254,6 +239,7 @@ struct zebra_service {
     struct zebra_register *regs;
     Zebra_mutex_cond session_lock;
     Passwd_db passwd_db;
+    Res dbaccess;
     const char *path_root;
     RecTypeClass record_classes;
     NMEM nmem;
@@ -282,7 +268,9 @@ struct zebra_session {
     int destroyed;
     ZebraSet sets;
     Res res;
+    Res session_res;
     char *user_perm;
+    char *dbaccesslist;
     int errCode;
     zint hits;
     char *errString;
@@ -473,18 +461,19 @@ off_t zebra_record_int_tell (void *fh);
 int zebra_record_int_read (void *fh, char *buf, size_t count);
 void zebra_record_int_end (void *fh, off_t offset);
 
-void print_rec_keys(ZebraHandle zh, struct recKeys *reckeys);
-ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh, struct recKeys *reckeys,
+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_snippets_hit_vector(ZebraHandle zh, const char *setname,
                                    zint sysno, zebra_snippets *snippets);
 
 void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
-                              int cmd, struct recKeys *reckeys,
+                              int cmd, zebra_rec_keys_t reckeys,
                              zint staticrank);
 #if NATTR
 void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
-                            int cmd, struct recKeys *skp);
+                            int cmd, zebra_rec_keys_t skp);
 #else
 void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
                             int cmd, struct sortKeys *skp);
@@ -493,8 +482,8 @@ void extract_schema_add (struct recExtractCtrl *p, Odr_oid *oid);
 void extract_token_add (RecWord *p);
 int explain_extract (void *handle, Record rec, data1_node *n);
 
-int fileExtract (ZebraHandle zh, SYSNO *sysno, const char *fname,
-                int deleteFlag);
+ZEBRA_RES zebra_extract_file(ZebraHandle zh, SYSNO *sysno, const char *fname,
+                            int deleteFlag);
 
 ZEBRA_RES zebra_begin_read (ZebraHandle zh);
 ZEBRA_RES zebra_end_read (ZebraHandle zh);
@@ -521,6 +510,9 @@ void zebra_term_untrans_iconv(ZebraHandle zh, NMEM stream, int reg_type,
 
 ZEBRA_RES zebra_get_hit_vector(ZebraHandle zh, const char *setname, zint sysno);
 
+void zebra_term_untrans(ZebraHandle zh, int reg_type,
+                       char *dst, const char *src);
+
 YAZ_END_CDECL
 
 #endif