-/* $Id: scan.c,v 1.15 2002-08-02 19:26:55 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $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.
#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,
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,
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;
}
{
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)