X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dict%2Flookgrep.c;h=23369702f7a18c7cb1ddbe0a7ba13025a6a57463;hb=d07818ca27f4e0efc9683148cb5d9891d34b9495;hp=f3a55047885472b3a1ead0c30b6040c20a7a5e2b;hpb=29357d2be4bc20d412d38bcb29876daedda28637;p=idzebra-moved-to-github.git

diff --git a/dict/lookgrep.c b/dict/lookgrep.c
index f3a5504..2336970 100644
--- a/dict/lookgrep.c
+++ b/dict/lookgrep.c
@@ -4,7 +4,29 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: lookgrep.c,v $
- * Revision 1.6  1995-10-09 16:18:32  adam
+ * Revision 1.13  1996-01-08 09:09:30  adam
+ * Function dfa_parse got 'const' string argument.
+ *
+ * Revision 1.12  1995/12/11  09:04:48  adam
+ * Bug fix: the lookup/scan/lookgrep didn't handle empty dictionary.
+ *
+ * Revision 1.11  1995/12/06  14:43:02  adam
+ * New function: dict_delete.
+ *
+ * Revision 1.10  1995/11/16  17:00:44  adam
+ * Changed stupid log.
+ *
+ * Revision 1.9  1995/10/27  13:58:09  adam
+ * Makes 'Database unavailable' diagnostic.
+ *
+ * Revision 1.8  1995/10/19  14:57:21  adam
+ * New feature: grep lookup saves length of longest prefix match.
+ *
+ * Revision 1.7  1995/10/17  18:01:22  adam
+ * Userfunc may return non-zero in which case the the grepping stops
+ * immediately.
+ *
+ * Revision 1.6  1995/10/09  16:18:32  adam
  * Function dict_lookup_grep got extra client data parameter.
  *
  * Revision 1.5  1995/09/14  11:52:59  adam
@@ -236,7 +258,8 @@ static INLINE int move (MatchContext *mc, MatchWord *Rj1, MatchWord *Rj,
 static int dict_grep (Dict dict, Dict_ptr ptr, MatchContext *mc,
                       MatchWord *Rj, int pos, void *client,
                       int (*userfunc)(Dict_char *, const char *, void *),
-                      Dict_char *prefix, struct DFA *dfa)
+                      Dict_char *prefix, struct DFA *dfa,
+                      int *max_pos)
 {
     int lo, hi, d;
     void *p;
@@ -267,11 +290,14 @@ static int dict_grep (Dict dict, Dict_ptr ptr, MatchContext *mc,
 
                 memcpy (&ch, info+j*sizeof(Dict_char), sizeof(Dict_char));
                 prefix[pos+j] = ch;
+                if (pos+j > *max_pos)
+                    *max_pos = pos+j;
                 if (ch == DICT_EOS)
                 {
                     if (was_match)
-                        (*userfunc)(prefix, info+(j+1)*sizeof(Dict_char),
-                                    client);
+                        if ((*userfunc)(prefix, info+(j+1)*sizeof(Dict_char),
+                                        client))
+                            return 1;
                     break;
                 }
                 move (mc, Rj1, Rj0, ch, dfa, Rj_tmp);
@@ -303,6 +329,8 @@ static int dict_grep (Dict dict, Dict_ptr ptr, MatchContext *mc,
             memcpy (&ch, info+sizeof(Dict_ptr), sizeof(Dict_char));
             prefix[pos] = ch;
             
+            if (pos > *max_pos)
+                *max_pos = pos;
             move (mc, Rj1, Rj, ch, dfa, Rj_tmp);
             for (d = mc->n; --d >= 0; )
                 if (Rj1[mc->range*mc->n + d])
@@ -316,16 +344,18 @@ static int dict_grep (Dict dict, Dict_ptr ptr, MatchContext *mc,
                         if (Rj1[mc->range*mc->n + d] & mc->match_mask[d])
                         {
                             prefix[pos+1] = DICT_EOS;
-                            (*userfunc)(prefix, info+sizeof(Dict_ptr)+
-                                        sizeof(Dict_char), client);
+                            if ((*userfunc)(prefix, info+sizeof(Dict_ptr)+
+                                            sizeof(Dict_char), client))
+                                return 1;
                             break;
                         }
                 }
                 memcpy (&subptr, info, sizeof(Dict_ptr));
                 if (subptr)
                 {
-                    dict_grep (dict, subptr, mc, Rj1, pos+1,
-                                  client, userfunc, prefix, dfa);
+                    if (dict_grep (dict, subptr, mc, Rj1, pos+1,
+                                   client, userfunc, prefix, dfa, max_pos))
+                        return 1;
                     dict_bf_readp (dict->dbf, ptr, &p);
                     indxp = (short*) ((char*) p+DICT_pagesize(dict)
                                       -sizeof(short));
@@ -338,16 +368,18 @@ static int dict_grep (Dict dict, Dict_ptr ptr, MatchContext *mc,
 }
 
 int dict_lookup_grep (Dict dict, Dict_char *pattern, int range, void *client,
-                    int (*userfunc)(Dict_char *name, const char *info,
-                                    void *client))
+                      int *max_pos,
+                      int (*userfunc)(Dict_char *name, const char *info,
+                                      void *client))
 {
     MatchWord *Rj;
     Dict_char prefix[MAX_LENGTH+1];
-    char *this_pattern = pattern;
+    const char *this_pattern = pattern;
     MatchContext *mc;
     struct DFA *dfa = dfa_init();
     int i, d;
 
+    logf (LOG_DEBUG, "dict_lookup_grep '%s' range=%d", pattern, range);
     i = dfa_parse (dfa, &this_pattern);
     if (i || *this_pattern)
     {
@@ -376,8 +408,13 @@ int dict_lookup_grep (Dict dict, Dict_char *pattern, int range, void *client,
             }
         }
     }
-    i = dict_grep (dict, 1, mc, Rj, 0, client, userfunc, prefix, dfa);
-
+    *max_pos = 0;
+    if (dict->head.last > 1)
+        i = dict_grep (dict, 1, mc, Rj, 0, client, userfunc, prefix,
+                       dfa, max_pos);
+    else
+        i = 0;
+    logf (LOG_DEBUG, "max_pos = %d", *max_pos);
     dfa_delete (&dfa);
     xfree (Rj);
     rm_MatchContext (&mc);