X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fdict.h;h=4b75eead523dc08a08ee32b935b2692d27d49864;hb=5b4dcfcb99600327a11b58de4fec33003dc4d816;hp=84b6e48686a00ff583572f26dee9b962d7366d85;hpb=3eb26862c3e82f9332c75c9c560f1044f80bc778;p=idzebra-moved-to-github.git

diff --git a/include/dict.h b/include/dict.h
index 84b6e48..4b75eea 100644
--- a/include/dict.h
+++ b/include/dict.h
@@ -1,10 +1,33 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dict.h,v $
- * Revision 1.21  1996-05-24 14:46:07  adam
+ * Revision 1.28  1999-03-09 13:07:06  adam
+ * Work on dict_compact routine.
+ *
+ * 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.
+ *
+ * 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
+ * Added support for character mapping.
+ *
+ * Revision 1.21  1996/05/24  14:46:07  adam
  * Added dict_grep_cmap function to define user-mapping in grep lookups.
  *
  * Revision 1.20  1996/03/20  09:35:23  adam
@@ -81,6 +104,11 @@
 #define DICT_H
 
 #include <bfile.h>
+#include <log.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 typedef unsigned Dict_ptr;
 typedef unsigned char Dict_char;
@@ -121,22 +149,24 @@ typedef struct Dict_file_struct
 typedef struct Dict_struct {
     int rw;
     Dict_BFile dbf;
-    char **(*grep_cmap)(const char **from);
+    const char **(*grep_cmap)(void *vp, const char **from, int len);
+    void *grep_cmap_data;
     struct Dict_head head;
 } *Dict;
 
 #define DICT_MAGIC "dict00"
 
-#define DICT_DEFAULT_PAGESIZE "4096"
+#define DICT_DEFAULT_PAGESIZE 4096
 
 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);
@@ -154,7 +184,10 @@ 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));
+void       dict_grep_cmap (Dict dict, void *vp,
+                           const char **(*cmap)(void *vp,
+						const char **from, int len));
+int        dict_compact (BFiles bfs, const char *from, const char *to);
 
 
 #define DICT_EOS        0
@@ -178,6 +211,9 @@ void       dict_grep_cmap (Dict dict, char **(*cmap)(const char **from));
    dir[0..nodir-1]
    ptr,info,string
  */
+#ifdef __cplusplus
+}
+#endif
 
    
 #endif