X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dict%2Fscan.c;h=7a05b2282212b4536916c2f531871c2f51fbf344;hb=eb6f5a00932fd50cb95aca3c1dd5039116254f4b;hp=ce56e64e9c8775be51ec1ec326c03672e51b7171;hpb=896c0427df9d8eff5de6a1735dcd992e067df844;p=idzebra-moved-to-github.git

diff --git a/dict/scan.c b/dict/scan.c
index ce56e64..7a05b22 100644
--- a/dict/scan.c
+++ b/dict/scan.c
@@ -1,4 +1,4 @@
-/* $Id: scan.c,v 1.15 2002-08-02 19:26:55 adam Exp $
+/* $Id: scan.c,v 1.18 2004-12-08 12:23:08 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -26,7 +26,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <stdio.h>
 #include <assert.h>
 
-#include <dict.h>
+#include "dict-p.h"
 
 int dict_scan_trav (Dict dict, Dict_ptr ptr, int pos, Dict_char *str, 
 		    int start, int *count, void *client,
@@ -81,7 +81,7 @@ int dict_scan_trav (Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
             memcpy (&dc, info+sizeof(Dict_ptr), sizeof(Dict_char));
             str[pos] = dc;
 	    memcpy (&subptr, info, sizeof(Dict_ptr));
-	    if (info[sizeof(Dict_ptr)+sizeof(Dict_char)])
+	    if (dir>0 && info[sizeof(Dict_ptr)+sizeof(Dict_char)])
             {
                  str[pos+1] = DICT_EOS;
                  if ((*userfunc)((char*) str,
@@ -90,13 +90,22 @@ int dict_scan_trav (Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
                      return 1;
                  --(*count);
             }
-            if (*count > 0 && subptr)
+            if (*count>0 && subptr)
             {
 	        dict_scan_trav (dict, subptr, pos+1, str, -1, count, 
                                 client, userfunc, dir);
                 dict_bf_readp (dict->dbf, ptr, &p);
                 indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short)); 
 	    }
+	    if (*count>0 && dir<0 && info[sizeof(Dict_ptr)+sizeof(Dict_char)])
+            {
+                 str[pos+1] = DICT_EOS;
+                 if ((*userfunc)((char*) str,
+                                 info+sizeof(Dict_ptr)+sizeof(Dict_char),
+                                 *count * dir, client))
+                     return 1;
+                 --(*count);
+            }
         }
         lo += dir;
     }
@@ -206,10 +215,10 @@ int dict_scan (Dict dict, char *str, int *before, int *after, void *client,
 {
     int i;
 
-    logf (LOG_DEBUG, "dict_scan");
+    yaz_log (YLOG_DEBUG, "dict_scan");
     for (i = 0; str[i]; i++)
     {
-	logf (LOG_DEBUG, " %3d  %c", str[i],
+	yaz_log (YLOG_DEBUG, " %3d  %c", str[i],
 	      (str[i] > ' ' && str[i] < 127) ? str[i] : '?');
     }
     if (!dict->head.root)