-/*
- * Copyright (C) 1994-1998, Index Data I/S
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: scan.c,v $
- * Revision 1.11 1998-06-22 11:34:45 adam
- * Changed scan callback function so it doesn't stop further scanning.
- *
- * Revision 1.10 1998/03/06 16:58:04 adam
- * Fixed bug which related to scanning of large indexes.
- *
- * Revision 1.9 1997/10/27 14:33:04 adam
- * Moved towards generic character mapping depending on "structure"
- * field in abstract syntax file. Fixed a few memory leaks. Fixed
- * bug with negative integers when doing searches with relational
- * operators.
- *
- * Revision 1.8 1996/02/02 13:43:52 adam
- * The public functions simply use char instead of Dict_char to represent
- * search strings. Dict_char is used internally only.
- *
- * Revision 1.7 1995/12/11 09:04:50 adam
- * Bug fix: the lookup/scan/lookgrep didn't handle empty dictionary.
- *
- * Revision 1.6 1995/11/20 11:58:04 adam
- * Support for YAZ in standard located directories, such as /usr/local/..
- *
- * Revision 1.5 1995/10/09 16:18:32 adam
- * Function dict_lookup_grep got extra client data parameter.
- *
- * Revision 1.4 1995/10/06 13:52:00 adam
- * Bug fixes. Handler may abort further scanning.
- *
- * Revision 1.3 1995/10/06 11:06:07 adam
- * Bug fixes.
- *
- * Revision 1.2 1995/10/06 10:43:16 adam
- * Minor changes.
- *
- * Revision 1.1 1995/10/06 09:04:18 adam
- * First version of scan.
- *
- */
+/* $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,
dict_bf_readp (dict->dbf, ptr, &p);
hi = DICT_nodir(p)-1;
- if (start == 0 && dir == -1)
- lo = hi;
- else
+ if (start != -1)
lo = start;
- indxp = (short*) ((char*) p+DICT_pagesize(dict)-sizeof(short));
+ else
+ {
+ if (dir == -1)
+ lo = hi;
+ else
+ lo = 0;
+ }
+ indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
while (lo <= hi && lo >= 0 && *count > 0)
{
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, 0, count,
+ 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_pagesize(dict)-sizeof(short));
+ 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;
}
return 0;
mid = lo = 0;
hi = DICT_nodir(p)-1;
- indxp = (short*) ((char*) p+DICT_pagesize(dict)-sizeof(short));
+ indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
while (lo <= hi)
{
mid = (lo+hi)/2;
}
}
if (*after && subptr)
- if (dict_scan_trav (dict, subptr, pos+1, str, 0,
+ if (dict_scan_trav (dict, subptr, pos+1, str, -1,
after, client, userfunc, 1))
return 1;
}
if (dict_scan_trav (dict, ptr, pos, str, cmp ? mid : mid+1, after,
client, userfunc, 1))
return 1;
- if (*before && mid > 1)
+ if (*before && mid > 0)
if (dict_scan_trav (dict, ptr, pos, str, mid-1, before,
client, userfunc, -1))
return 1;
{
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.last <= 1)
+ if (!dict->head.root)
return 0;
- return dict_scan_r (dict, 1, 0, (Dict_char *) str, before, after, client,
- f);
+ return dict_scan_r (dict, dict->head.root, 0, (Dict_char *) str,
+ before, after, client, f);
}
-
projects / idzebra-moved-to-github.git / blobdiff