X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frset.c;h=3da4bd6220f55f037e06aac3bd556cd26fb7b504;hp=780727a12fb0286768d4b8825908299e93a9e257;hb=732870c555c7d32c5d2b6a4914c6fa7232eb26b2;hpb=9d5bfe73fd06d99c306f91860a322aece5b6f4fc diff --git a/rset/rset.c b/rset/rset.c index 780727a..3da4bd6 100644 --- a/rset/rset.c +++ b/rset/rset.c @@ -1,8 +1,5 @@ -/* $Id: rset.c,v 1.54 2006-06-22 22:58:59 adam Exp $ - Copyright (C) 1995-2005 - Index Data ApS - -This file is part of the Zebra server. +/* This file is part of the Zebra server. + Copyright (C) 1994-2011 Index Data 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 @@ -15,11 +12,14 @@ 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. +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include @@ -30,6 +30,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA static int log_level = 0; static int log_level_initialized = 0; + /** \brief Common constuctor for RFDs \param rs Result set handle. @@ -65,20 +66,45 @@ RSFD rfd_create_base(RSET rs) return rnew; } +static void rset_close_int(RSET rs, RSFD rfd) +{ + RSFD *pfd; + (*rs->control->f_close)(rfd); + + yaz_log(log_level, "rfd_delete_base: rfd=%p rs=%p priv=%p fl=%p", + rfd, rs, rfd->priv, rs->free_list); + for (pfd = &rs->use_list; *pfd; pfd = &(*pfd)->next) + if (*pfd == rfd) + { + *pfd = (*pfd)->next; + rfd->next = rs->free_list; + rs->free_list = rfd; + return; + } + yaz_log(YLOG_WARN, "rset_close handle not found. type=%s", + rs->control->desc); +} + +void rset_set_hits_limit(RSET rs, zint l) +{ + yaz_log(log_level, "rset_set_hits_limit %p l=" ZINT_FORMAT, rs, l); + rs->hits_limit = l; +} + /** \brief Closes a result set RFD handle \param rfd the RFD handle. */ void rset_close(RSFD rfd) { - RSFD *pfd; RSET rs = rfd->rset; if (rs->hits_count == 0) { TERMID termid; char buf[100]; - while(rfd->counted_items <= rs->hits_limit + + while (rfd->counted_items <= rs->hits_limit && rset_default_read(rfd, buf, &termid)) ; @@ -87,7 +113,7 @@ void rset_close(RSFD rfd) " hits_limit=" ZINT_FORMAT, rs, rs->hits_count, rs->hits_limit); rs->hits_approx = 0; - if (rs->hits_count > rs->hits_limit) + if (rs->hits_count > rs->hits_limit && rs->hits_limit > 0) { double cur, tot; zint est; @@ -113,23 +139,11 @@ void rset_close(RSFD rfd) rs->hits_approx = 1; } } - yaz_log(log_level, "rset_close p=%p count=" ZINT_FORMAT, rs, + yaz_log(log_level, "rset_close(%s) p=%p count=" ZINT_FORMAT, + rs->control->desc, rs, rs->hits_count); } - (*rs->control->f_close)(rfd); - - yaz_log(log_level, "rfd_delete_base: rfd=%p rs=%p priv=%p fl=%p", - rfd, rs, rfd->priv, rs->free_list); - for (pfd = &rs->use_list; *pfd; pfd = &(*pfd)->next) - if (*pfd == rfd) - { - *pfd = (*pfd)->next; - rfd->next = rs->free_list; - rs->free_list = rfd; - return; - } - yaz_log(YLOG_WARN, "rset_close handle not found. type=%s", - rs->control->desc); + rset_close_int(rs, rfd); } /** @@ -162,9 +176,8 @@ RSET rset_create_base(const struct rset_control *sel, rset = (RSET) nmem_malloc(nmem, sizeof(*rset)); yaz_log(log_level, "rs_create(%s) rs=%p (nm=%p)", sel->desc, rset, nmem); - yaz_log(log_level, " ref_id=%s limit=" ZINT_FORMAT, - (term && term->ref_id ? term->ref_id : "null"), - rset->hits_limit); + yaz_log(log_level, " ref_id=%s", + (term && term->ref_id ? term->ref_id : "null")); rset->nmem = nmem; rset->control = sel; rset->refcount = 1; @@ -261,7 +274,7 @@ zint rset_count(RSET rs) double cur, tot; RSFD rfd = rset_open(rs, 0); rset_pos(rfd, &cur, &tot); - rset_close(rfd); + rset_close_int(rs, rfd); return (zint) tot; } @@ -307,6 +320,11 @@ struct ord_list *ord_list_dup(NMEM nmem, struct ord_list *list) return n; } +void ord_list_print(struct ord_list *list) +{ + for (; list; list = list->next) + yaz_log(YLOG_LOG, "ord_list %d", list->ord); +} /** \brief Creates a TERMID entry. \param name Term/Name buffer with given length @@ -358,8 +376,17 @@ int rset_default_read(RSFD rfd, void *buf, TERMID *term) int rc = (*rset->control->f_read)(rfd, buf, term); if (rc > 0) { - if (rfd->counted_items == 0 || - (rset->keycontrol->cmp)(buf, rfd->counted_buf) > rset->scope) + int got_scope; + if (rfd->counted_items == 0) + got_scope = rset->scope+1; + else + got_scope = rset->keycontrol->cmp(buf, rfd->counted_buf); + +#if 0 + key_logdump_txt(YLOG_LOG, buf, "rset_default_read"); + yaz_log(YLOG_LOG, "rset_scope=%d got_scope=%d", rset->scope, got_scope); +#endif + if (got_scope > rset->scope) { memcpy(rfd->counted_buf, buf, rset->keycontrol->key_size); rfd->counted_items++; @@ -383,12 +410,12 @@ int rset_default_forward(RSFD rfd, void *buf, TERMID *term, while ((more = rset_read(rfd, buf, term)) > 0) { - if ((rfd->rset->keycontrol->cmp)(untilbuf, buf) <= 1) + if ((rfd->rset->keycontrol->cmp)(untilbuf, buf) < rset->scope) break; } if (log_level) - yaz_log (log_level, "rset_default_forward exiting m=%d c=%d", - more, rset->scope); + yaz_log(log_level, "rset_default_forward exiting rfd=%p scope=%d m=%d c=%d", + rfd, rset->scope, more, rset->scope); return more; } @@ -406,6 +433,7 @@ void rset_visit(RSET rset, int level) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab