X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=dict%2Fscan.c;h=6c8704f7c8f913fbe89e92bbcb3accc080510dd6;hp=7236cb0e352ff63c17e4def48ac432303640a1d2;hb=a4b519d430b264b1fa1153041ee4d6e61ee3248a;hpb=5437b50633032595afe6f87dc0f989bc92a5aea8

diff --git a/dict/scan.c b/dict/scan.c
index 7236cb0..6c8704f 100644
--- a/dict/scan.c
+++ b/dict/scan.c
@@ -1,6 +1,6 @@
-/* $Id: scan.c,v 1.16 2004-11-19 10:26:55 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
+/* $Id: scan.c,v 1.22 2006-08-29 12:31:12 adam Exp $
+   Copyright (C) 1995-2006
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 
@@ -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;
     }
@@ -209,7 +218,7 @@ int dict_scan (Dict dict, char *str, int *before, int *after, void *client,
     yaz_log (YLOG_DEBUG, "dict_scan");
     for (i = 0; str[i]; i++)
     {
-	yaz_log (YLOG_DEBUG, " %3d  %c", str[i],
+	yaz_log (YLOG_DEBUG, "start_term pos %d %3d  %c", i, str[i],
 	      (str[i] > ' ' && str[i] < 127) ? str[i] : '?');
     }
     if (!dict->head.root)
@@ -217,3 +226,11 @@ int dict_scan (Dict dict, char *str, int *before, int *after, void *client,
     return dict_scan_r (dict, dict->head.root, 0, (Dict_char *) str,
 			before, after, client, f);
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+