X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dict%2Fscan.c;h=6c8704f7c8f913fbe89e92bbcb3accc080510dd6;hb=861a4414a4a0d1d1076f97fe8105b0a3a3ab4a31;hp=f66a1c29b43eef39bf6de87eacd12448dbb51bc9;hpb=4ed5fbcd29d2a98b048d1d94510b262d352b4f7c;p=idzebra-moved-to-github.git diff --git a/dict/scan.c b/dict/scan.c index f66a1c2..6c8704f 100644 --- a/dict/scan.c +++ b/dict/scan.c @@ -1,59 +1,32 @@ -/* - * Copyright (C) 1994-1999, Index Data - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: scan.c,v $ - * Revision 1.13 1999-05-15 14:36:37 adam - * Updated dictionary. Implemented "compression" of dictionary. - * - * Revision 1.12 1999/02/02 14:50:28 adam - * Updated WIN32 code specific sections. Changed header. - * - * 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.22 2006-08-29 12:31:12 adam Exp $ + Copyright (C) 1995-2006 + 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 this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + + #include #include #include #include -#include +#include "dict-p.h" int dict_scan_trav (Dict dict, Dict_ptr ptr, int pos, Dict_char *str, int start, int *count, void *client, @@ -67,10 +40,15 @@ int dict_scan_trav (Dict dict, Dict_ptr ptr, int pos, Dict_char *str, 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; + 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) @@ -103,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, @@ -112,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, 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_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; } @@ -192,7 +179,7 @@ int dict_scan_r (Dict dict, Dict_ptr ptr, int pos, Dict_char *str, } } 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; } @@ -216,7 +203,7 @@ int dict_scan_r (Dict dict, Dict_ptr ptr, int pos, Dict_char *str, 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; @@ -228,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, "start_term pos %d %3d %c", i, str[i], (str[i] > ' ' && str[i] < 127) ? str[i] : '?'); } if (!dict->head.root) @@ -239,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 + */ +