Updated WIN32 code specific sections. Changed header.

[idzebra-moved-to-github.git] / include / dict.h

diff --git a/include/dict.h b/include/dict.h
index 0b94ffd..6e4daf5 100644 (file)
--- a/include/dict.h
+++ b/include/dict.h
@@ -1,10 +1,20 @@
 /*
- * Copyright (C) 1994-1997, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dict.h,v $
- * Revision 1.24  1997-09-05 15:30:00  adam
+ * Revision 1.27  1999-02-02 14:50:32  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * 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.
  *
@@ -136,7 +146,8 @@ typedef struct Dict_file_struct
 typedef struct Dict_struct {
     int rw;
     Dict_BFile dbf;
-    const 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;
 
@@ -148,10 +159,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);
@@ -169,8 +181,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,
-                           const 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