X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=dict%2Flookgrep.c;h=bde37714457bb4346517134ce43492c00a81a2c1;hb=ef696645cc3b7e0f4027008d1dc589c0f0f90c1f;hp=39d2b3f4dcfe0e28a28fd43a4be71dd51955bc3d;hpb=55a5cde7eb23fb9aa5a8386d34bb1b6e131c19d8;p=idzebra-moved-to-github.git

diff --git a/dict/lookgrep.c b/dict/lookgrep.c
index 39d2b3f..bde3771 100644
--- a/dict/lookgrep.c
+++ b/dict/lookgrep.c
@@ -1,10 +1,19 @@
 /*
- * Copyright (C) 1994-1998, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: lookgrep.c,v $
- * Revision 1.21  1998-06-24 12:16:12  adam
+ * Revision 1.24  1999-05-26 07:49:12  adam
+ * C++ compilation.
+ *
+ * Revision 1.23  1999/05/15 14:36:37  adam
+ * Updated dictionary. Implemented "compression" of dictionary.
+ *
+ * Revision 1.22  1999/02/02 14:50:23  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.21  1998/06/24 12:16:12  adam
  * Support for relations on text operands. Open range support in
  * DFA module (i.e. [-j], [g-]).
  *
@@ -118,13 +127,13 @@ static INLINE MatchWord get_bit (MatchContext *mc, MatchWord *m, int ch,
 
 static MatchContext *mk_MatchContext (struct DFA *dfa, int range)
 {
-    MatchContext *mc = xmalloc (sizeof(*mc));
+    MatchContext *mc = (MatchContext *) xmalloc (sizeof(*mc));
     int s;
 
     mc->n = (dfa->no_states+WORD_BITS) / WORD_BITS;
     mc->range = range;
     mc->fact = (range+1)*mc->n;
-    mc->match_mask = xcalloc (mc->n, sizeof(*mc->match_mask));
+    mc->match_mask = (MatchWord *) xcalloc (mc->n, sizeof(*mc->match_mask));
 
     for (s = 0; s<dfa->no_states; s++)
         if (dfa->states[s]->rule_no)
@@ -301,7 +310,7 @@ static int dict_grep (Dict dict, Dict_ptr ptr, MatchContext *mc,
     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)
     {
@@ -401,8 +410,7 @@ static int dict_grep (Dict dict, Dict_ptr ptr, MatchContext *mc,
                                    init_pos))
                         return 1;
                     dict_bf_readp (dict->dbf, ptr, &p);
-                    indxp = (short*) ((char*) p+DICT_pagesize(dict)
-                                      -sizeof(short));
+                    indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
                 }
             }
         }
@@ -449,7 +457,7 @@ int dict_lookup_grep (Dict dict, const char *pattern, int range, void *client,
 
     mc = mk_MatchContext (dfa, range);
 
-    Rj = xcalloc ((MAX_LENGTH+1) * mc->n, sizeof(*Rj));
+    Rj = (MatchWord *) xcalloc ((MAX_LENGTH+1) * mc->n, sizeof(*Rj));
 
     set_bit (mc, Rj, 0, 0);
     for (d = 1; d<=mc->range; d++)
@@ -468,8 +476,9 @@ int dict_lookup_grep (Dict dict, const char *pattern, int range, void *client,
         }
     }
     *max_pos = 0;
-    if (dict->head.last > 1)
-        i = dict_grep (dict, 1, mc, Rj, 0, client, userfunc, prefix,
+    if (dict->head.root)
+        i = dict_grep (dict, dict->head.root, mc, Rj, 0, client,
+		       userfunc, prefix,
                        dfa, max_pos, init_pos);
     else
         i = 0;