X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=index%2Findex.h;h=2ae3ab23c28500348680c5c61f440d8261c20eb3;hb=fd12cf9b8e16c109f3c0f7aedb0e0efd65209e16;hp=a82f719389a2cc44ddcb30b0360192f1e46da101;hpb=9167923869bcb07faf7e357c883f070be098c66e;p=idzebra-moved-to-github.git

diff --git a/index/index.h b/index/index.h
index a82f719..2ae3ab2 100644
--- a/index/index.h
+++ b/index/index.h
@@ -1,10 +1,21 @@
 /*
- * Copyright (C) 1995-1996, Index Data I/S 
+ * Copyright (C) 1995-1997, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: index.h,v $
- * Revision 1.48  1997-02-12 20:39:45  adam
+ * 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.
+ *
+ * Revision 1.49  1997/09/05 15:30:08  adam
+ * Changed prototype for chr_map_input - added const.
+ * Added support for C++, headers uses extern "C" for public definitions.
+ *
+ * Revision 1.48  1997/02/12 20:39:45  adam
  * Implemented options -f <n> that limits the log to the first <n>
  * records.
  * Changed some log messages also.
@@ -179,6 +190,7 @@
 #include <dict.h>
 #include <isam.h>
 #include <isamc.h>
+#include <data1.h>
 
 #define IT_MAX_WORD 256
 #define IT_KEY_HAVE_SEQNO 1
@@ -207,15 +219,17 @@ struct dirs_entry {
 };
 
 struct recordGroup {
-    char *groupName;
-    char *databaseName;
-    char *path;
-    char *recordId;
-    char *recordType;
-    int  flagStoreData;
-    int  flagStoreKeys;
-    int  flagShowRecords;
-    int  fileVerboseLimit;
+    char         *groupName;
+    char         *databaseName;
+    char         *path;
+    char         *recordId;
+    char         *recordType;
+    int          flagStoreData;
+    int          flagStoreKeys;
+    int          flagShowRecords;
+    int          fileVerboseLimit;
+    data1_handle dh;
+    BFiles       bfs;
 };
 
 void getFnameTmp (char *fname, int no);
@@ -239,15 +253,15 @@ void repositoryAdd (struct recordGroup *rGroup);
 void repositoryDelete (struct recordGroup *rGroup);
 void repositoryShow (struct recordGroup *rGroup);
 
-void key_open (int mem);
+void key_open (BFiles bfs, int mem);
 int key_close (void);
 int key_compare (const void *p1, const void *p2);
 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);
-void inv_prstat (void);
-void key_input (int nkeys, int cache);
-ISAMC_M key_isamc_m (void);
+void inv_prstat (BFiles bfs);
+void key_input (BFiles bfs, int nkeys, int cache);
+ISAMC_M key_isamc_m (Res res);
 int merge_sort (char **buf, int from, int to);
 
 #define FNAME_DICT "dict"
@@ -272,11 +286,11 @@ int fileExtract (SYSNO *sysno, const char *fname,
 
 void rec_prstat (void);
 
-void zebraLockPrefix (char *pathPrefix);
+void zebraLockPrefix (Res res, char *pathPrefix);
 
 void zebraIndexLockMsg (const char *str);
 void zebraIndexUnlock (void);
-void zebraIndexLock (int commitNow);
+void zebraIndexLock (BFiles bfs, int commitNow, const char *rval);
 int zebraIndexWait (int commitPhase);
 
 #define FNAME_MAIN_LOCK   "zebraidx.LCK"
@@ -288,6 +302,8 @@ int zebraLock (int fd, int wr);
 int zebraLockNB (int fd, int wr);
 int zebraUnlock (int fd);
 
-void init_charmap(void);
-char **map_chrs_input(char **from, int len);
+void init_charmap(Res res);
+const char **map_chrs_input(void *vp, const char **from, int len);
 const char *map_chrs_output(const char **from);
+
+extern Res common_resource;