X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dict%2Flookgrep.c;h=a3cc6b77b706b7bec54deb06a2ff5f66fbd2d7bf;hb=b7f00ecbe71200814196edcb38c378dcd4acaacc;hp=2a42cb63592bc1233b0f69f5fa221b9e9e447df9;hpb=1dcfe532fcc0447de623e717d70c46ab553329b9;p=idzebra-moved-to-github.git

diff --git a/dict/lookgrep.c b/dict/lookgrep.c
index 2a42cb6..a3cc6b7 100644
--- a/dict/lookgrep.c
+++ b/dict/lookgrep.c
@@ -4,7 +4,26 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: lookgrep.c,v $
- * Revision 1.5  1995-09-14 11:52:59  adam
+ * 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
  * Grep handle function parameter info is const now.
  *
  * Revision 1.4  1995/01/24  16:01:02  adam
@@ -231,9 +250,10 @@ 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,
-                      int (*userfunc)(Dict_char *name, const char *info),
-                      Dict_char *prefix, struct DFA *dfa)
+                      MatchWord *Rj, int pos, void *client,
+                      int (*userfunc)(Dict_char *, const char *, void *),
+                      Dict_char *prefix, struct DFA *dfa,
+                      int *max_pos)
 {
     int lo, hi, d;
     void *p;
@@ -264,10 +284,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));
+                        if ((*userfunc)(prefix, info+(j+1)*sizeof(Dict_char),
+                                        client))
+                            return 1;
                     break;
                 }
                 move (mc, Rj1, Rj0, ch, dfa, Rj_tmp);
@@ -299,6 +323,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])
@@ -312,16 +338,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));
+                            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,
-                                  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));
@@ -333,8 +361,10 @@ static int dict_grep (Dict dict, Dict_ptr ptr, MatchContext *mc,
     return 0;
 }
 
-int dict_lookup_grep (Dict dict, Dict_char *pattern, int range,
-                    int (*userfunc)(Dict_char *name, const char *info))
+int dict_lookup_grep (Dict dict, Dict_char *pattern, int range, void *client,
+                      int *max_pos,
+                      int (*userfunc)(Dict_char *name, const char *info,
+                                      void *client))
 {
     MatchWord *Rj;
     Dict_char prefix[MAX_LENGTH+1];
@@ -343,6 +373,7 @@ int dict_lookup_grep (Dict dict, Dict_char *pattern, int range,
     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)
     {
@@ -371,8 +402,10 @@ int dict_lookup_grep (Dict dict, Dict_char *pattern, int range,
             }
         }
     }
-    i = dict_grep (dict, 1, mc, Rj, 0, userfunc, prefix, dfa);
-
+    *max_pos = 0;
+    i = dict_grep (dict, 1, mc, Rj, 0, client, userfunc, prefix, dfa,
+                   max_pos);
+    logf (LOG_DEBUG, "max_pos = %d", *max_pos);
     dfa_delete (&dfa);
     xfree (Rj);
     rm_MatchContext (&mc);