Changes.

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

diff --git a/index/index.h b/index/index.h
index 2e60e90..2b5e1de 100644 (file)
--- a/index/index.h
+++ b/index/index.h
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: index.h,v $
- * Revision 1.50  1997-09-17 12:19:13  adam
+ * Revision 1.54  1997-09-29 09:08:36  adam
+ * Revised locking system to be thread safe for the server.
+ *
+ * Revision 1.53  1997/09/25 14:54:43  adam
+ * WIN32 files lock support.
+ *
+ * Revision 1.52  1997/09/22 12:39:06  adam
+ * Added get_pos method for the ranked result sets.
+ *
+ * Revision 1.51  1997/09/18 08:59:19  adam
+ * Extra generic handle for the character mapping routines.
+ *
+ * Revision 1.50  1997/09/17 12:19:13  adam
  * Zebra version corresponds to YAZ version 1.4.
  * Changed Zebra server so that it doesn't depend on global common_resource.
  *
@@ -253,6 +265,7 @@ void repositoryShow (struct recordGroup *rGroup);
 void key_open (BFiles bfs, int mem);
 int key_close (void);
 int key_compare (const void *p1, const void *p2);
+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);
 void key_logdump (int mask, const void *p);
@@ -283,8 +296,6 @@ int fileExtract (SYSNO *sysno, const char *fname,
 
 void rec_prstat (void);
 
-void zebraLockPrefix (Res res, char *pathPrefix);
-
 void zebraIndexLockMsg (const char *str);
 void zebraIndexUnlock (void);
 void zebraIndexLock (BFiles bfs, int commitNow, const char *rval);
@@ -295,12 +306,17 @@ int zebraIndexWait (int commitPhase);
 #define FNAME_ORG_LOCK    "zebraorg.LCK"
 #define FNAME_TOUCH_TIME  "zebraidx.time"
 
-int zebraLock (int fd, int wr);
-int zebraLockNB (int fd, int wr);
-int zebraUnlock (int fd);
+typedef struct zebra_lock_info *ZebraLockHandle;
+ZebraLockHandle zebra_lock_create(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);
 
 void init_charmap(Res res);
-const char **map_chrs_input(const char **from, int len);
+const char **map_chrs_input(void *vp, const char **from, int len);
 const char *map_chrs_output(const char **from);
 
 extern Res common_resource;