X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=dict%2Fscan.c;h=7236cb0e352ff63c17e4def48ac432303640a1d2;hp=d23e451ec0a7d448ebd5c8f220647e472303be0f;hb=5437b50633032595afe6f87dc0f989bc92a5aea8;hpb=3d01abbe1238c82d62e4c01eb7cac760d3d53377 diff --git a/dict/scan.c b/dict/scan.c index d23e451..7236cb0 100644 --- a/dict/scan.c +++ b/dict/scan.c @@ -1,41 +1,26 @@ -/* - * Copyright (C) 1994, Index Data I/S - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: scan.c,v $ - * 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.16 2004-11-19 10:26:55 heikki Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 + 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 #include #include @@ -55,11 +40,16 @@ 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; - 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) { @@ -73,9 +63,8 @@ int dict_scan_trav (Dict dict, Dict_ptr ptr, int pos, Dict_char *str, for (j = 0; info[j] != DICT_EOS; j++) str[pos+j] = info[j]; str[pos+j] = DICT_EOS; - if ((*userfunc)((char*) str, info+(j+1)*sizeof(Dict_char), - *count * dir, client)) - return 1; + (*userfunc)((char*) str, info+(j+1)*sizeof(Dict_char), + *count * dir, client); --(*count); } else @@ -102,14 +91,18 @@ int dict_scan_trav (Dict dict, Dict_ptr ptr, int pos, Dict_char *str, --(*count); } if (*count > 0 && subptr) - dict_scan_trav (dict, subptr, pos+1, str, 0, count, - client, userfunc, dir); + { + 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)); + } } lo += dir; } return 0; } - + int dict_scan_r (Dict dict, Dict_ptr ptr, int pos, Dict_char *str, int *before, int *after, void *client, int (*userfunc)(char *, const char *, int, void *)) @@ -124,7 +117,7 @@ int dict_scan_r (Dict dict, Dict_ptr ptr, int pos, Dict_char *str, 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; @@ -177,14 +170,16 @@ 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; } else if (subptr) + { if (dict_scan_r (dict, subptr, pos+1, str, before, after, client, userfunc)) return 1; + } break; } } @@ -199,7 +194,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; @@ -211,15 +206,14 @@ 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.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); } -