Improved installation. Updated for inclusion of YAZ header files.

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

diff --git a/include/dict.h b/include/dict.h
index 6367d94..ca82337 100644 (file)
--- a/include/dict.h
+++ b/include/dict.h
@@ -1,10 +1,33 @@
 /*
- * Copyright (C) 1994-1996, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dict.h,v $
- * Revision 1.23  1996-10-29 13:45:33  adam
+ * Revision 1.30  1999-11-30 13:48:03  adam
+ * Improved installation. Updated for inclusion of YAZ header files.
+ *
+ * Revision 1.29  1999/05/15 14:36:37  adam
+ * Updated dictionary. Implemented "compression" of dictionary.
+ *
+ * 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
@@ -87,7 +110,11 @@
 #define DICT_H
 
 #include <bfile.h>
-#include <log.h>
+#include <yaz/log.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 typedef unsigned Dict_ptr;
 typedef unsigned char Dict_char;
@@ -95,7 +122,8 @@ typedef unsigned char Dict_char;
 struct Dict_head {
     char magic_str[8];
     int page_size;
-    Dict_ptr free_list, last;
+    int compact_flag;
+    Dict_ptr root, last, freelist;
 };
 
 struct Dict_file_block
@@ -105,6 +133,7 @@ struct Dict_file_block
     void *data;
     int dirty;
     int no;
+    int nbytes;
 };
 
 typedef struct Dict_file_struct
@@ -123,27 +152,32 @@ typedef struct Dict_file_struct
     int  block_size;
     int  hits;
     int  misses;
+    int  compact_flag;
 } *Dict_BFile;
 
 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;
 
-#define DICT_MAGIC "dict00"
+#define DICT_MAGIC "dict01"
 
 #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_newp (Dict_BFile bf, int no, void **bufp, int nbytes);
 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);
+void       dict_bf_compact (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 compact_flag);
 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,18 +195,20 @@ 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));
+int        dict_copy_compact (BFiles bfs, const char *from, const char *to);
 
 
 #define DICT_EOS        0
 #define DICT_type(x)    0[(Dict_ptr*) x]
 #define DICT_backptr(x) 1[(Dict_ptr*) x]
-#define DICT_nextptr(x) 2[(Dict_ptr*) x]
-#define DICT_nodir(x)   0[(short*)((char*)(x)+3*sizeof(Dict_ptr))]
-#define DICT_size(x)    1[(short*)((char*)(x)+3*sizeof(Dict_ptr))]
-#define DICT_infoffset  (3*sizeof(Dict_ptr)+2*sizeof(short))
-#define DICT_pagesize(x) ((x)->head.page_size)
+#define DICT_bsize(x)   2[(short*)((char*)(x)+2*sizeof(Dict_ptr))]
+#define DICT_nodir(x)   0[(short*)((char*)(x)+2*sizeof(Dict_ptr))]
+#define DICT_size(x)    1[(short*)((char*)(x)+2*sizeof(Dict_ptr))]
+#define DICT_infoffset  (2*sizeof(Dict_ptr)+3*sizeof(short))
+#define DICT_xxxxpagesize(x) ((x)->head.page_size)
 
 #define DICT_to_str(x)  sizeof(Dict_info)+sizeof(Dict_ptr)
 
@@ -186,6 +222,9 @@ void       dict_grep_cmap (Dict dict,
    dir[0..nodir-1]
    ptr,info,string
  */
+#ifdef __cplusplus
+}
+#endif
 
    
 #endif