X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=dict%2Fscan.c;h=a505b116729bcae202029f9a3d344ef3dc0ce9f6;hp=3591a553fd5cf5a4911daf45100a3a695b1d1168;hb=e4c6861efeeea654bfb00c5f0239ee258629d77f;hpb=a030c87bc444608639905eca95e29f84a4f1d991

diff --git a/dict/scan.c b/dict/scan.c
index 3591a55..a505b11 100644
--- a/dict/scan.c
+++ b/dict/scan.c
@@ -1,5 +1,5 @@
 /* This file is part of the Zebra server.
-   Copyright (C) 1994-2011 Index Data
+   Copyright (C) 2004-2013 Index Data
 
    Zebra is free software; you can redistribute it and/or modify it under
    the terms of the GNU General Public License as published by the Free
@@ -18,6 +18,9 @@
 */
 
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ -25,7 +28,7 @@
 
 #include "dict-p.h"
 
-static void scan_direction(Dict dict, Dict_ptr ptr, int pos, Dict_char *str, 
+static void scan_direction(Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
                            int start, int *count, void *client,
                            int (*userfunc)(char *, const char *, int, void *),
                            int dir)
@@ -46,7 +49,7 @@ static void scan_direction(Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
         else
             lo = 0;
     }
-    indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short)); 
+    indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
 
     while (lo <= hi && lo >= 0 && *count > 0)
     {
@@ -96,10 +99,10 @@ static void scan_direction(Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
             }
             if (*count>0 && subptr)
             {
-	        scan_direction(dict, subptr, pos+1, str, -1, count, 
+	        scan_direction(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)); 
+                indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
 	    }
 	    if (*count>0 && dir<0 && info[sizeof(Dict_ptr)+sizeof(Dict_char)])
             {
@@ -118,7 +121,7 @@ static void scan_direction(Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
     }
 }
 
-void dict_scan_r(Dict dict, Dict_ptr ptr, int pos, Dict_char *str, 
+void 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 *))
 {
@@ -149,7 +152,7 @@ void dict_scan_r(Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
                 {
                     if ((*userfunc)((char *) str, info+
                                     (dict_strlen((Dict_char*) info)+1)
-                                    *sizeof(Dict_char), 
+                                    *sizeof(Dict_char),
                                     *after, client))
                     {
                         *after = 0;
@@ -193,13 +196,30 @@ void dict_scan_r(Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
                         }
                     }
                     if (*after && subptr)
-		        scan_direction(dict, subptr, pos+1, str, -1, 
+		        scan_direction(dict, subptr, pos+1, str, -1,
                                        after, client, userfunc, 1);
                 }
-		else if (subptr)
+		else
                 {
-                    dict_scan_r(dict, subptr, pos+1, str, before, after,
-                                client, userfunc);
+                    if (subptr)
+                        dict_scan_r(dict, subptr, pos+1, str, before, after,
+                                    client, userfunc);
+             	    if (info[sizeof(Dict_ptr)+sizeof(Dict_char)])
+                    {
+                        if (*before)
+                        {
+                            str[pos+1] = DICT_EOS;
+                            if ((*userfunc)((char*) str,
+                                            info+sizeof(Dict_ptr)+
+                                            sizeof(Dict_char),
+                                            - *before, client))
+                            {
+                                *before = 0;
+                            }
+                            else
+                                --(*before);
+                        }
+                    }
                 }
                 break;
             }
@@ -215,7 +235,7 @@ void dict_scan_r(Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
         scan_direction(dict, ptr, pos, str, cmp ? mid : mid+1, after,
                        client, userfunc, 1);
     if (*before && mid > 0)
-        scan_direction(dict, ptr, pos, str, mid-1, before, 
+        scan_direction(dict, ptr, pos, str, mid-1, before,
                        client, userfunc, -1);
 }