X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fdict.h;h=2dca367a56b9dde8a8cd7f06fc6546c5c8ddb640;hb=e89f9552c15bc7f95c0495457a36ac45914fcb40;hp=6367d94de8603eb913cacbdf7c3329b7a289113e;hpb=eee8870c6ae6e22f98a15e0b47626a8698d0e0da;p=idzebra-moved-to-github.git

diff --git a/include/dict.h b/include/dict.h
index 6367d94..2dca367 100644
--- a/include/dict.h
+++ b/include/dict.h
@@ -1,10 +1,21 @@
 /*
- * Copyright (C) 1994-1996, Index Data I/S 
+ * Copyright (C) 1994-1997, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dict.h,v $
- * Revision 1.23  1996-10-29 13:45:33  adam
+ * Revision 1.26  1997-09-18 08:59:18  adam
+ * Extra generic handle for the character mapping routines.
+ *
+ * Revision 1.25  1997/09/17 12:19:09  adam
+ * Zebra version corresponds to YAZ version 1.4.
+ * Changed Zebra server so that it doesn't depend on global common_resource.
+ *
+ * Revision 1.24  1997/09/05 15:30:00  adam
+ * Changed prototype for chr_map_input - added const.
+ * Added support for C++, headers uses extern "C" for public definitions.
+ *
+ * Revision 1.23  1996/10/29 13:45:33  adam
  * Changed definition of DICT_DEFAULT_PAGESIZE.
  *
  * Revision 1.22  1996/06/04 10:20:10  adam
@@ -89,6 +100,10 @@
 #include <bfile.h>
 #include <log.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef unsigned Dict_ptr;
 typedef unsigned char Dict_char;
 
@@ -128,7 +143,8 @@ typedef struct Dict_file_struct
 typedef struct Dict_struct {
     int rw;
     Dict_BFile dbf;
-    char **(*grep_cmap)(const char **from, int len);
+    const char **(*grep_cmap)(void *vp, const char **from, int len);
+    void *grep_cmap_data;
     struct Dict_head head;
 } *Dict;
 
@@ -140,10 +156,11 @@ int        dict_bf_readp (Dict_BFile bf, int no, void **bufp);
 int        dict_bf_newp (Dict_BFile bf, int no, void **bufp);
 int        dict_bf_touch (Dict_BFile bf, int no);
 void       dict_bf_flush_blocks (Dict_BFile bf, int no_to_flush);
-Dict_BFile dict_bf_open (const char *name, int block_size, int cache, int rw);
+Dict_BFile dict_bf_open (BFiles bfs, const char *name, int block_size,
+			 int cache, int rw);
 int        dict_bf_close (Dict_BFile dbf);
      
-Dict       dict_open (const char *name, int cache, int rw);
+Dict       dict_open (BFiles bfs, const char *name, int cache, int rw);
 int        dict_close (Dict dict);
 int        dict_insert (Dict dict, const char *p, int userlen, void *userinfo);
 int        dict_delete (Dict dict, const char *p);
@@ -161,8 +178,9 @@ int	   dict_scan (Dict dict, char *str,
 		      int (*f)(char *name, const char *info, int pos,
                                void *client));
 
-void       dict_grep_cmap (Dict dict,
-                           char **(*cmap)(const char **from, int len));
+void       dict_grep_cmap (Dict dict, void *vp,
+                           const char **(*cmap)(void *vp,
+						const char **from, int len));
 
 
 #define DICT_EOS        0
@@ -186,6 +204,9 @@ void       dict_grep_cmap (Dict dict,
    dir[0..nodir-1]
    ptr,info,string
  */
+#ifdef __cplusplus
+}
+#endif
 
    
 #endif