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

diff --git a/dict/scan.c b/dict/scan.c
index 44ff661..f66a1c2 100644
--- a/dict/scan.c
+++ b/dict/scan.c
@@ -1,10 +1,28 @@
 /*
- * 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.8  1996-02-02 13:43:52  adam
+ * Revision 1.13  1999-05-15 14:36:37  adam
+ * Updated dictionary. Implemented "compression" of dictionary.
+ *
+ * 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.
  *
@@ -53,7 +71,7 @@ int dict_scan_trav (Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
         lo = hi;
     else
         lo = start;
-    indxp = (short*) ((char*) p+DICT_pagesize(dict)-sizeof(short)); 
+    indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short)); 
 
     while (lo <= hi && lo >= 0 && *count > 0)
     {
@@ -67,9 +85,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)((char*) 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
@@ -96,14 +113,18 @@ int dict_scan_trav (Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
                  --(*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_bsize(p)-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)(char *, const char *, int, void *))
@@ -118,7 +139,7 @@ int dict_scan_r (Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
         return 0;
     mid = lo = 0;
     hi = DICT_nodir(p)-1;
-    indxp = (short*) ((char*) p+DICT_pagesize(dict)-sizeof(short));    
+    indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
     while (lo <= hi)
     {
         mid = (lo+hi)/2;
@@ -176,9 +197,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;
             }
         }
@@ -203,9 +226,16 @@ int dict_scan_r (Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
 int dict_scan (Dict dict, char *str, int *before, int *after, void *client,
                int (*f)(char *name, const char *info, int pos, void *client))
 {
-    if (dict->head.last <= 1)
+    int 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.root)
         return 0;
-    return dict_scan_r (dict, 1, 0, (Dict_char *) str, before, after, client,
-                        f);
+    return dict_scan_r (dict, dict->head.root, 0, (Dict_char *) str,
+			before, after, client, f);
 }
-