X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dict%2Flookupec.c;h=975e8347ebf771b856875764e09dc300815233db;hb=954447ef6b2f5a0a4852b58f00074236f774f9fe;hp=95ead8128f0dbf2912e1fc6dd32ddff11ee5942d;hpb=d8a3c1b4e3c628b65d6812348003c55d20056871;p=idzebra-moved-to-github.git

diff --git a/dict/lookupec.c b/dict/lookupec.c
index 95ead81..975e834 100644
--- a/dict/lookupec.c
+++ b/dict/lookupec.c
@@ -1,10 +1,23 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: lookupec.c,v $
- * Revision 1.5  1995-01-24 16:01:03  adam
+ * Revision 1.9  1999-05-26 07:49:13  adam
+ * C++ compilation.
+ *
+ * Revision 1.8  1999/05/15 14:36:37  adam
+ * Updated dictionary. Implemented "compression" of dictionary.
+ *
+ * Revision 1.7  1999/02/02 14:50:26  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.6  1996/02/02 13:43:51  adam
+ * The public functions simply use char instead of Dict_char to represent
+ * search strings. Dict_char is used internally only.
+ *
+ * Revision 1.5  1995/01/24  16:01:03  adam
  * Added -ansi to CFLAGS.
  * Use new API of dfa module.
  *
@@ -41,8 +54,8 @@ typedef struct {
 #define SH(x) (((x)<<1)+1)
 
 int dict_look_ec (Dict dict, Dict_ptr ptr, MatchInfo *mi, MatchWord *ri_base,
-                  int pos, int (*userfunc)(Dict_char *),
-                  int range, Dict_char *prefix)
+                  int pos, int (*userfunc)(char *), int range,
+                  Dict_char *prefix)
 {
     int lo, hi;
     void *p;
@@ -53,7 +66,7 @@ int dict_look_ec (Dict dict, Dict_ptr ptr, MatchInfo *mi, MatchWord *ri_base,
     dict_bf_readp (dict->dbf, ptr, &p);
     lo = 0;
     hi = DICT_nodir(p)-1;
-    indxp = (short*) ((char*) p+DICT_pagesize(dict)-sizeof(short));    
+    indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));    
     while (lo <= hi)
     {
         if (indxp[-lo] > 0)
@@ -73,7 +86,7 @@ int dict_look_ec (Dict dict, Dict_ptr ptr, MatchInfo *mi, MatchWord *ri_base,
                 if (ch == DICT_EOS)
                 {
                     if (ri[range] & match_mask)
-                        (*userfunc)(prefix);
+                        (*userfunc)((char*) prefix);
                     break;
                 }
                 if (j+pos >= mi->m+range)
@@ -115,7 +128,7 @@ int dict_look_ec (Dict dict, Dict_ptr ptr, MatchInfo *mi, MatchWord *ri_base,
                     (ri[range] & match_mask))
                 {
                     prefix[pos+1] = DICT_EOS;
-                    (*userfunc)(prefix);
+                    (*userfunc)((char*) prefix);
                 }
                 memcpy (&subptr, info, sizeof(Dict_ptr));
                 if (subptr)
@@ -124,7 +137,7 @@ int dict_look_ec (Dict dict, Dict_ptr ptr, MatchInfo *mi, MatchWord *ri_base,
                                   userfunc, range, prefix);
                     dict_bf_readp (dict->dbf, ptr, &p);
                     indxp = (short*) ((char*) p + 
-                                      DICT_pagesize(dict)-sizeof(short));
+                                      DICT_bsize(p)-sizeof(short));
                 }
             }
         }
@@ -139,9 +152,9 @@ static MatchInfo *prepare_match (Dict_char *pattern)
     MatchWord *s;
     MatchInfo *mi;
 
-    mi = xmalloc (sizeof(*mi));
+    mi = (MatchInfo *) xmalloc (sizeof(*mi));
     mi->m = dict_strlen (pattern);
-    mi->s = s = xmalloc (sizeof(*s)*256);  /* 256 !!! */
+    mi->s = s = (MatchWord *) xmalloc (sizeof(*s)*256);  /* 256 !!! */
     for (i=0; i<256; i++)
         s[i] = 0;
     for (i=0; pattern[i]; i++)
@@ -149,24 +162,26 @@ static MatchInfo *prepare_match (Dict_char *pattern)
     return mi;
 }
 
-int dict_lookup_ec (Dict dict, Dict_char *pattern, int range,
-                    int (*userfunc)(Dict_char *name))
+int dict_lookup_ec (Dict dict, char *pattern, int range,
+                    int (*userfunc)(char *name))
 {
     MatchInfo *mi;
     MatchWord *ri;
     int i;
     Dict_char prefix[2048];
 
-    if (dict->head.last == 1)
+    if (!dict->head.root)
         return 0;
     
-    mi = prepare_match (pattern);
+    mi = prepare_match ((Dict_char*) pattern);
 
-    ri = xmalloc ((dict_strlen(pattern)+range+2)*(range+1)*sizeof(*ri));
+    ri = (MatchWord *) xmalloc ((dict_strlen((Dict_char*) pattern)+range+2)
+				* (range+1)*sizeof(*ri));
     for (i=0; i<=range; i++)
         ri[i] = (2<<i)-1;
     
-    i = dict_look_ec (dict, 1, mi, ri, 0, userfunc, range, prefix);
+    i = dict_look_ec (dict, dict->head.root, mi, ri, 0, userfunc,
+		      range, prefix);
     xfree (ri);
     return i;
 }