Bump year. Change Aps->ApS

[idzebra-moved-to-github.git] / dict / scan.c

diff --git a/dict/scan.c b/dict/scan.c
index db65ab9..2e300b6 100644 (file)
--- a/dict/scan.c
+++ b/dict/scan.c
@@ -1,16 +1,32 @@
-/*
- * Copyright (C) 1994-2002, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Id: scan.c,v 1.14 2002-01-14 01:52:22 adam Exp $
- */
+/* $Id: scan.c,v 1.19 2005-01-15 19:38:24 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
+
+This file is part of the Zebra server.
+
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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.
+*/
+
+
 #include <stdlib.h>
 #include <string.h>
 #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,
@@ -65,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,
@@ -74,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;
     }
@@ -190,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)