X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dict%2Fscan.c;h=5eaa72705f55cc01942d15df9ea8ba50e415bb78;hb=a4e93d62564084d6d1b6670d4fe75dd70a6ed139;hp=13897dab75313e35eb785ffd67506f313075c717;hpb=29357d2be4bc20d412d38bcb29876daedda28637;p=idzebra-moved-to-github.git

diff --git a/dict/scan.c b/dict/scan.c
index 13897da..5eaa727 100644
--- a/dict/scan.c
+++ b/dict/scan.c
@@ -1,10 +1,35 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: scan.c,v $
- * Revision 1.5  1995-10-09 16:18:32  adam
+ * Revision 1.12  1999-02-02 14:50:28  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.11  1998/06/22 11:34:45  adam
+ * Changed scan callback function so it doesn't stop further scanning.
+ *
+ * Revision 1.10  1998/03/06 16:58:04  adam
+ * Fixed bug which related to scanning of large indexes.
+ *
+ * Revision 1.9  1997/10/27 14:33:04  adam
+ * Moved towards generic character mapping depending on "structure"
+ * field in abstract syntax file. Fixed a few memory leaks. Fixed
+ * bug with negative integers when doing searches with relational
+ * operators.
+ *
+ * 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
@@ -29,7 +54,7 @@
 
 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 (*userfunc)(char *, const char *, int, void *),
 		    int dir)
 {
     int lo, hi, j;
@@ -57,9 +82,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,
-                            client))
-                return 1;
+            (*userfunc)((char*) str, info+(j+1)*sizeof(Dict_char),
+                            *count * dir, client);
             --(*count);
         }
         else
@@ -79,23 +103,28 @@ 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),
+                 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, 
-                                 client, userfunc, dir);
+            {
+	        dict_scan_trav (dict, subptr, pos+1, str, 0, count, 
+                                client, userfunc, dir);
+                dict_bf_readp (dict->dbf, ptr, &p);
+                indxp = (short*) ((char*) p+DICT_pagesize(dict)-sizeof(short)); 
+	    }
         }
         lo += dir;
     }
     return 0;
 }
-    
+
 int dict_scan_r (Dict dict, Dict_ptr ptr, int pos, Dict_char *str, 
 		 int *before, int *after, void *client,
-                 int (*userfunc)(Dict_char *, const char *, int, void *))
+                 int (*userfunc)(char *, const char *, int, void *))
 {
     int cmp = 0, mid, lo, hi;
     void *p;
@@ -103,6 +132,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));    
@@ -120,8 +151,9 @@ 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), 
+                    (*userfunc)((char *) str, info+
+                                (dict_strlen((Dict_char*) info)+1)
+                                *sizeof(Dict_char), 
                                 *after, client);
                     --(*after);
                 }
@@ -149,7 +181,7 @@ 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, client);
@@ -162,9 +194,11 @@ int dict_scan_r (Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
                             return 1;
                 }
 		else if (subptr)
+                {
                     if (dict_scan_r (dict, subptr, pos+1, str, before, after,
                                      client, userfunc))
                         return 1;
+                }
                 break;
             }
         }
@@ -186,13 +220,20 @@ int dict_scan_r (Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
     return 0;
 }
 
-int dict_scan (Dict dict, Dict_char *str, int *before, int *after,
-               void *client,
-               int (*f)(Dict_char *name, const char *info, int pos,
-                        void *client))
+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, client, f);
-    return i;
+
+    logf (LOG_DEBUG, "dict_scan");
+    for (i = 0; str[i]; i++)
+    {
+	logf (LOG_DEBUG, " %3d  %c", str[i],
+	      (str[i] > ' ' && str[i] < 127) ? str[i] : '?');
+    }
+    if (dict->head.last <= 1)
+        return 0;
+    return dict_scan_r (dict, 1, 0, (Dict_char *) str, before, after, client,
+                        f);
 }