X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dict%2Fscan.c;h=01be13e1af2c6c0ec6fe291182c722ed305a50d2;hb=b3a6eba6b48be6df19bce22dbf2bc0068df9cfe8;hp=3cd77b20d46ab471f6f98711a85b3394e8763758;hpb=f54b1c2e62e6e70b810b35d8a7f2b5c75076808d;p=idzebra-moved-to-github.git

diff --git a/dict/scan.c b/dict/scan.c
index 3cd77b2..01be13e 100644
--- a/dict/scan.c
+++ b/dict/scan.c
@@ -4,7 +4,22 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: scan.c,v $
- * Revision 1.2  1995-10-06 10:43:16  adam
+ * Revision 1.7  1995-12-11 09:04:50  adam
+ * Bug fix: the lookup/scan/lookgrep didn't handle empty dictionary.
+ *
+ * Revision 1.6  1995/11/20  11:58:04  adam
+ * Support for YAZ in standard located directories, such as /usr/local/..
+ *
+ * Revision 1.5  1995/10/09  16:18:32  adam
+ * Function dict_lookup_grep got extra client data parameter.
+ *
+ * Revision 1.4  1995/10/06  13:52:00  adam
+ * Bug fixes. Handler may abort further scanning.
+ *
+ * Revision 1.3  1995/10/06  11:06:07  adam
+ * Bug fixes.
+ *
+ * Revision 1.2  1995/10/06  10:43:16  adam
  * Minor changes.
  *
  * Revision 1.1  1995/10/06  09:04:18  adam
@@ -18,9 +33,9 @@
 
 #include <dict.h>
 
-void dict_scan_trav (Dict dict, Dict_ptr ptr, int pos, Dict_char *str, 
-		    int start, int *count,
-                    int (*userfunc)(Dict_char *, const char *, int pos),
+int dict_scan_trav (Dict dict, Dict_ptr ptr, int pos, Dict_char *str, 
+		    int start, int *count, void *client,
+                    int (*userfunc)(Dict_char *, const char *, int, void *),
 		    int dir)
 {
     int lo, hi, j;
@@ -48,7 +63,9 @@ void dict_scan_trav (Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
             for (j = 0; info[j] != DICT_EOS; j++)
 		str[pos+j] = info[j];
             str[pos+j] = DICT_EOS;
-            (*userfunc)(str, info+j*sizeof(Dict_char), *count * dir);
+            if ((*userfunc)(str, info+(j+1)*sizeof(Dict_char), *count * dir,
+                            client))
+                return 1;
             --(*count);
         }
         else
@@ -68,21 +85,23 @@ void dict_scan_trav (Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
 	    if (info[sizeof(Dict_ptr)+sizeof(Dict_char)])
             {
                  str[pos+1] = DICT_EOS;
-                 (*userfunc)(str, info+sizeof(Dict_ptr)+sizeof(Dict_char),
-			     *count * dir);
+                 if ((*userfunc)(str, info+sizeof(Dict_ptr)+sizeof(Dict_char),
+                                 *count * dir, client))
+                     return 1;
                  --(*count);
             }
             if (*count > 0 && subptr)
 	         dict_scan_trav (dict, subptr, pos+1, str, 0, count, 
-                                 userfunc, dir);
+                                 client, userfunc, dir);
         }
         lo += dir;
     }
+    return 0;
 }
     
 int dict_scan_r (Dict dict, Dict_ptr ptr, int pos, Dict_char *str, 
-		 int *before, int *after,
-                 int (*userfunc)(Dict_char *, const char *, int))
+		 int *before, int *after, void *client,
+                 int (*userfunc)(Dict_char *, const char *, int, void *))
 {
     int cmp = 0, mid, lo, hi;
     void *p;
@@ -90,6 +109,8 @@ int dict_scan_r (Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
     char *info;
 
     dict_bf_readp (dict->dbf, ptr, &p);
+    if (!p)
+        return 0;
     mid = lo = 0;
     hi = DICT_nodir(p)-1;
     indxp = (short*) ((char*) p+DICT_pagesize(dict)-sizeof(short));    
@@ -105,8 +126,13 @@ int dict_scan_r (Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
 	    cmp = dict_strcmp ((Dict_char*) info, str + pos);
 	    if (!cmp)
             {
-                (*userfunc)(str, str, *after);
-                --(*after);
+                if (*after)
+                {
+                    (*userfunc)(str, info+
+                                (dict_strlen(info)+1)*sizeof(Dict_char), 
+                                *after, client);
+                    --(*after);
+                }
                 break;
             }
         }
@@ -129,18 +155,24 @@ int dict_scan_r (Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
                 {
 		    if (info[sizeof(Dict_ptr)+sizeof(Dict_char)])
                     {
-                        (*userfunc)(str, 
-                                    info+sizeof(Dict_ptr)+sizeof(Dict_char),
-				    *after);
-	                --(*after);
+                        if (*after)
+                        {
+                            (*userfunc)(str, 
+                                        info+sizeof(Dict_ptr)+
+                                        sizeof(Dict_char),
+                                        *after, client);
+                            --(*after);
+                        }
                     }
-                    if (*after > 0 && subptr)
-		        dict_scan_trav (dict, subptr, pos+1, str, 0, 
-                                        after, userfunc, 1);
+                    if (*after && subptr)
+		        if (dict_scan_trav (dict, subptr, pos+1, str, 0, 
+                                            after, client, userfunc, 1))
+                            return 1;
                 }
-		else if (*after > 0 && subptr)
-                    dict_scan_r (dict, subptr, pos+1, str, before, after,
-                                 userfunc);
+		else if (subptr)
+                    if (dict_scan_r (dict, subptr, pos+1, str, before, after,
+                                     client, userfunc))
+                        return 1;
                 break;
             }
         }
@@ -152,19 +184,23 @@ int dict_scan_r (Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
     if (lo>hi && cmp < 0)
         ++mid;
     if (*after)
-        dict_scan_trav (dict, ptr, pos, str, cmp ? mid : mid+1, after,
-                        userfunc, 1);
+        if (dict_scan_trav (dict, ptr, pos, str, cmp ? mid : mid+1, after,
+                            client, userfunc, 1))
+            return 1;
     if (*before && mid > 1)
-        dict_scan_trav (dict, ptr, pos, str, mid-1, before, 
-                        userfunc, -1);
+        if (dict_scan_trav (dict, ptr, pos, str, mid-1, before, 
+                            client, userfunc, -1))
+            return 1;
     return 0;
 }
 
 int dict_scan (Dict dict, Dict_char *str, int *before, int *after,
-               int (*f)(Dict_char *name, const char *info, int pos))
+               void *client,
+               int (*f)(Dict_char *name, const char *info, int pos,
+                        void *client))
 {
-    int i;
-    i = dict_scan_r (dict, 1, 0, str, before, after, f);
-    return i;
+    if (dict->head.last <= 1)
+        return 0;
+    return dict_scan_r (dict, 1, 0, str, before, after, client, f);
 }