X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fdict.h;h=1b86e1f3e0767b551bee7c0e2a5de2895a9ab7e6;hb=85df66537199c30a492ad54be4fbe25fa77e18c8;hp=a276e3c8a91d0fcac9a2ba06348ed3967ce93a1f;hpb=35c328bab4365f6404108702ffcbdb23fe5d910e;p=idzebra-moved-to-github.git

diff --git a/include/dict.h b/include/dict.h
index a276e3c..1b86e1f 100644
--- a/include/dict.h
+++ b/include/dict.h
@@ -4,7 +4,33 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dict.h,v $
- * Revision 1.9  1994-10-04 12:08:19  adam
+ * Revision 1.17  1995-12-07 11:47:04  adam
+ * Default pagesize is 4k instead of 8k.
+ *
+ * Revision 1.16  1995/12/06  14:41:13  adam
+ * New function: dict_delete.
+ *
+ * Revision 1.15  1995/10/27  13:59:17  adam
+ * Function dict_look_grep got extra parameter max_pos that upon return
+ * hold length of longest prefix that matches pattern.
+ *
+ * Revision 1.14  1995/10/09  16:18:35  adam
+ * Function dict_lookup_grep got extra client data parameter.
+ *
+ * Revision 1.13  1995/10/06  09:03:51  adam
+ * First version of scan.
+ *
+ * Revision 1.12  1995/09/14  11:53:02  adam
+ * Grep handle function parameter info is const now.
+ *
+ * Revision 1.11  1995/09/04  09:09:51  adam
+ * String arg in dict lookup is const.
+ * Minor changes.
+ *
+ * Revision 1.10  1994/10/05  12:16:58  adam
+ * Pagesize is a resource now.
+ *
+ * Revision 1.9  1994/10/04  12:08:19  adam
  * Minor changes.
  *
  * Revision 1.8  1994/10/03  17:23:11  adam
@@ -23,7 +49,6 @@
  *
  * Revision 1.4  1994/09/01  17:44:40  adam
  * Work on insertion in dictionary. Not finished yet.
- * CVS ----------------------------------------------------------------------
  *
  * Revision 1.3  1994/08/18  12:41:12  adam
  * Some development of dictionary. Not finished at all!
@@ -86,7 +111,7 @@ typedef struct Dict_struct {
 
 #define DICT_MAGIC "dict00"
 
-#define DICT_PAGESIZE 8192
+#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);
@@ -99,13 +124,20 @@ Dict       dict_open (const char *name, int cache, int rw);
 int        dict_close (Dict dict);
 int        dict_insert (Dict dict, const Dict_char *p, int userlen,
                         void *userinfo);
-char      *dict_lookup (Dict dict, Dict_char *p);
+int        dict_delete (Dict dict, const Dict_char *p);
+char      *dict_lookup (Dict dict, const Dict_char *p);
 int        dict_lookup_ec (Dict dict, Dict_char *p, int range,
                            int (*f)(Dict_char *name));
-int        dict_lookup_grep (Dict dict, Dict_char *p, int range, 
-                             int (*f)(Dict_char *name, char *info));       
+int        dict_lookup_grep (Dict dict, Dict_char *p, int range, void *client,
+                             int *max_pos,
+                             int (*f)(Dict_char *name, const char *info,
+                                      void *client));
 int        dict_strcmp (const Dict_char *s1, const Dict_char *s2);
 int        dict_strlen (const Dict_char *s);
+int	   dict_scan (Dict dict, Dict_char *str, 
+		      int *before, int *after, void *client,
+		      int (*f)(Dict_char *name, const char *info, int pos,
+                               void *client));
 
 #define DICT_EOS        0
 #define DICT_type(x)    0[(Dict_ptr*) x]
@@ -114,6 +146,7 @@ int        dict_strlen (const Dict_char *s);
 #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_to_str(x)  sizeof(Dict_info)+sizeof(Dict_ptr)