-/* $Id: rset.c,v 1.51 2005-06-09 10:39:53 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
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 <config.h>
+#endif
#include <stdio.h>
#include <string.h>
#include <idzebra/util.h>
static int log_level = 0;
static int log_level_initialized = 0;
+
/**
\brief Common constuctor for RFDs
\param rs Result set handle.
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))
;
rs->hits_count = rfd->counted_items;
+ yaz_log(log_level, "rset_close rset=%p hits_count=" ZINT_FORMAT
+ " 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;
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);
}
/**
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",
+ (term && term->ref_id ? term->ref_id : "null"));
rset->nmem = nmem;
rset->control = sel;
rset->refcount = 1;
rset->hits_limit = 0;
rset->hits_round = 1000;
rset->keycontrol = kcontrol;
+
(*kcontrol->inc)(kcontrol);
rset->scope = scope;
rset->term = term;
if (term)
+ {
term->rset = rset;
-
+ rset->hits_limit = term->hits_limit;
+ }
rset->no_children = no_children;
rset->children = 0;
if (no_children)
(rs->refcount)++;
yaz_log(log_level, "rs_dup(%s), rs=%p, refcount=%d",
rs->control->desc, rs, rs->refcount);
- (*rs->keycontrol->inc)(rs->keycontrol);
return 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;
}
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
\param nmem memory for term.
\param ol ord list
\param reg_type register type
+ \param hits_limit limit before counting stops and gets approximate
+ \param ref_id supplied ID for term that can be used to identify this
*/
TERMID rset_term_create(const char *name, int length, const char *flags,
int type, NMEM nmem, struct ord_list *ol,
- int reg_type)
+ int reg_type,
+ zint hits_limit, const char *ref_id)
{
TERMID t;
else if (length == -1)
t->name = nmem_strdup(nmem, name);
else
- {
- t->name = (char*) nmem_malloc(nmem, length+1);
- memcpy (t->name, name, length);
- t->name[length] = '\0';
- }
+ t->name = nmem_strdupn(nmem, name, length);
+ if (!ref_id)
+ t->ref_id = 0;
+ else
+ t->ref_id = nmem_strdup(nmem, ref_id);
if (!flags)
t->flags = NULL;
else
t->flags = nmem_strdup(nmem, flags);
+ t->hits_limit = hits_limit;
t->type = type;
t->reg_type = reg_type;
t->rankpriv = 0;
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++;
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;
}
rset_visit(rset->children[i], level+1);
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+
projects / idzebra-moved-to-github.git / blobdiff