X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fdict.h;h=206cbf16118a39f751c853ac8eb1c8caa3599ff0;hb=c33fef40b235c24caf096fa6f1f94419ff7314c2;hp=df5cc28d74ca229f0c821215fcc483dfebb4bd02;hpb=2f0932393fb205b2e9b941db50cf5aebfba5c385;p=idzebra-moved-to-github.git

diff --git a/include/dict.h b/include/dict.h
index df5cc28..206cbf1 100644
--- a/include/dict.h
+++ b/include/dict.h
@@ -4,7 +4,40 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dict.h,v $
- * Revision 1.3  1994-08-18 12:41:12  adam
+ * 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
+ * First version of dictionary lookup with regular expressions and errors.
+ *
+ * Revision 1.7  1994/09/22  10:44:47  adam
+ * Don't remember what changed!!
+ *
+ * Revision 1.6  1994/09/16  15:39:21  adam
+ * Initial code of lookup - not tested yet.
+ *
+ * Revision 1.5  1994/09/06  13:05:29  adam
+ * Further development of insertion. Some special cases are
+ * not properly handled yet! assert(0) are put here. The
+ * binary search in each page definitely reduce usr CPU.
+ *
+ * Revision 1.4  1994/09/01  17:44:40  adam
+ * Work on insertion in dictionary. Not finished yet.
+ *
+ * Revision 1.3  1994/08/18  12:41:12  adam
  * Some development of dictionary. Not finished at all!
  *
  * Revision 1.2  1994/08/17  13:32:33  adam
@@ -42,42 +75,52 @@ typedef struct Dict_file_struct
 {
     int cache;
     BFile bf;
-
+    
     struct Dict_file_block *all_blocks;
     struct Dict_file_block *free_list;
     struct Dict_file_block **hash_array;
-
+    
     struct Dict_file_block *lru_back, *lru_front;
     int hash_size;
     void *all_data;
-
+    
+    int  block_size;
     int  hits;
     int  misses;
 } *Dict_BFile;
 
 typedef struct Dict_struct {
+    int rw;
     Dict_BFile dbf;
     struct Dict_head head;
-} *Dict;
+}
+*Dict;
 
-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);
-int dict_bf_close (Dict_BFile dbf);
 #define DICT_MAGIC "dict00"
 
-typedef int Dict_info;
+#define DICT_DEFAULT_PAGESIZE "8192"
 
-#define DICT_PAGESIZE 8192
-    
-Dict dict_open (const char *name, int cache, int rw);
-int dict_close (Dict dict);
-int dict_insert (Dict dict, const Dict_char *p, void *userinfo);
-int dict_lookup (Dict dict, Dict_char *p);
-int dict_strcmp (const Dict_char *s1, const Dict_char *s2);
-int dict_strlen (const Dict_char *s);
+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);
+int        dict_bf_close (Dict_BFile dbf);
+     
+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, 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, const char *info));
+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,
+		      int (*f)(Dict_char *name, const char *info, int pos));
 
 #define DICT_EOS        0
 #define DICT_type(x)    0[(Dict_ptr*) x]
@@ -86,6 +129,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)