X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dict%2Fscan.c;h=44ff6619f50d765437768877cca9cdbbda2bca93;hb=b31a8654c5b7a597dd4a351f452ac91e5ef60798;hp=ba93ed6628d1685b1959b9388b737470c0ae67d1;hpb=9af45a7f129664e5f802ff1cdfce08fbce8b1adb;p=idzebra-moved-to-github.git

diff --git a/dict/scan.c b/dict/scan.c
index ba93ed6..44ff661 100644
--- a/dict/scan.c
+++ b/dict/scan.c
@@ -4,7 +4,20 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: scan.c,v $
- * Revision 1.4  1995-10-06 13:52:00  adam
+ * Revision 1.8  1996-02-02 13:43:52  adam
+ * The public functions simply use char instead of Dict_char to represent
+ * search strings. Dict_char is used internally only.
+ *
+ * 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
@@ -25,8 +38,8 @@
 #include <dict.h>
 
 int 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 start, int *count, void *client,
+                    int (*userfunc)(char *, const char *, int, void *),
 		    int dir)
 {
     int lo, hi, j;
@@ -54,7 +67,8 @@ int 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;
-            if ((*userfunc)(str, info+(j+1)*sizeof(Dict_char), *count * dir))
+            if ((*userfunc)((char*) str, info+(j+1)*sizeof(Dict_char),
+                            *count * dir, client))
                 return 1;
             --(*count);
         }
@@ -75,14 +89,15 @@ int 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;
-                 if ((*userfunc)(str, info+sizeof(Dict_ptr)+sizeof(Dict_char),
-                                 *count * dir))
+                 if ((*userfunc)((char*) 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;
     }
@@ -90,8 +105,8 @@ int dict_scan_trav (Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
 }
     
 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)(char *, const char *, int, void *))
 {
     int cmp = 0, mid, lo, hi;
     void *p;
@@ -99,6 +114,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));    
@@ -116,9 +133,10 @@ int dict_scan_r (Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
             {
                 if (*after)
                 {
-                    (*userfunc)(str, info+
-                                (dict_strlen(info)+1)*sizeof(Dict_char), 
-                                *after);
+                    (*userfunc)((char *) str, info+
+                                (dict_strlen((Dict_char*) info)+1)
+                                *sizeof(Dict_char), 
+                                *after, client);
                     --(*after);
                 }
                 break;
@@ -145,21 +163,21 @@ int dict_scan_r (Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
                     {
                         if (*after)
                         {
-                            (*userfunc)(str, 
+                            (*userfunc)((char*) str,
                                         info+sizeof(Dict_ptr)+
                                         sizeof(Dict_char),
-                                        *after);
+                                        *after, client);
                             --(*after);
                         }
                     }
                     if (*after && subptr)
 		        if (dict_scan_trav (dict, subptr, pos+1, str, 0, 
-                                            after, userfunc, 1))
+                                            after, client, userfunc, 1))
                             return 1;
                 }
 		else if (subptr)
                     if (dict_scan_r (dict, subptr, pos+1, str, before, after,
-                                     userfunc))
+                                     client, userfunc))
                         return 1;
                 break;
             }
@@ -173,20 +191,21 @@ int dict_scan_r (Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
         ++mid;
     if (*after)
         if (dict_scan_trav (dict, ptr, pos, str, cmp ? mid : mid+1, after,
-                            userfunc, 1))
+                            client, userfunc, 1))
             return 1;
     if (*before && mid > 1)
         if (dict_scan_trav (dict, ptr, pos, str, mid-1, before, 
-                            userfunc, -1))
+                            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))
+int dict_scan (Dict dict, char *str, int *before, int *after, void *client,
+               int (*f)(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, (Dict_char *) str, before, after, client,
+                        f);
 }