-/* $Id: zsets.c,v 1.40 2003-01-13 22:37:12 adam Exp $
+/* $Id: zsets.c,v 1.46 2003-06-18 11:46:34 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
struct zset_sort_entry **entries;
};
-ZebraSet resultSetAddRPN (ZebraHandle zh, ODR input, ODR output,
+ZebraSet resultSetAddRPN (ZebraHandle zh, NMEM m,
Z_RPNQuery *rpn, int num_bases,
char **basenames,
const char *setname)
return 0;
zebraSet->locked = 1;
zebraSet->rpn = 0;
- zebraSet->nmem = nmem_create ();
+ zebraSet->nmem = m;
zebraSet->num_bases = num_bases;
zebraSet->basenames =
zebraSet->basenames[i] = nmem_strdup (zebraSet->nmem, basenames[i]);
- zebraSet->rset = rpn_search (zh, output->mem, rpn,
+ zebraSet->rset = rpn_search (zh, zebraSet->nmem, rpn,
zebraSet->num_bases,
zebraSet->basenames, zebraSet->name,
zebraSet);
break;
if (s)
{
- logf (LOG_DEBUG, "updating result set %s", name);
+ yaz_log (LOG_DEBUG, "updating result set %s", name);
if (!ov || s->locked)
return NULL;
if (s->rset)
}
else
{
- logf (LOG_DEBUG, "adding result set %s", name);
+ yaz_log (LOG_DEBUG, "adding result set %s", name);
s = (ZebraSet) xmalloc (sizeof(*s));
s->next = zh->sets;
zh->sets = s;
position = positions[i];
if (position > 0 && position <= sort_info->num_entries)
{
- logf (LOG_DEBUG, "got pos=%d (sorted)", position);
+ yaz_log (LOG_DEBUG, "got pos=%d (sorted)", position);
sr[i].sysno = sort_info->entries[position-1]->sysno;
sr[i].score = sort_info->entries[position-1]->score;
}
if (position == positions[num_i])
{
sr[num_i].sysno = psysno;
- logf (LOG_DEBUG, "got pos=%d (unsorted)", position);
+ yaz_log (LOG_DEBUG, "got pos=%d (unsorted)", position);
sr[num_i].score = -1;
num_i++;
}
zh->errCode = 230;
return;
}
- logf (LOG_DEBUG, "result set sort input=%s output=%s",
+ yaz_log (LOG_DEBUG, "result set sort input=%s output=%s",
*input_setnames, output_setname);
sset = resultSetGet (zh, input_setnames[0]);
if (!sset)
int term_index;
RSFD rfd;
- logf (LOG_LOG, "resultSetSortSingle start");
+ yaz_log (LOG_LOG, "resultSetSortSingle start");
sset->sort_info->num_entries = 0;
sset->hits = 0;
switch (sk->which)
{
case Z_SortKey_sortField:
- logf (LOG_DEBUG, "Sort: key %d is of type sortField", i+1);
+ yaz_log (LOG_DEBUG, "Sort: key %d is of type sortField", i+1);
zh->errCode = 207;
return;
case Z_SortKey_elementSpec:
- logf (LOG_DEBUG, "Sort: key %d is of type elementSpec", i+1);
+ yaz_log (LOG_DEBUG, "Sort: key %d is of type elementSpec", i+1);
zh->errCode = 207;
return;
case Z_SortKey_sortAttributes:
- logf (LOG_DEBUG, "Sort: key %d is of type sortAttributes", i+1);
+ yaz_log (LOG_DEBUG, "Sort: key %d is of type sortAttributes", i+1);
sort_criteria[i].attrUse =
zebra_maps_sort (zh->reg->zebra_maps,
sk->u.sortAttributes,
&sort_criteria[i].numerical);
- logf (LOG_DEBUG, "use value = %d", sort_criteria[i].attrUse);
+ yaz_log (LOG_DEBUG, "use value = %d", sort_criteria[i].attrUse);
if (sort_criteria[i].attrUse == -1)
{
zh->errCode = 116;
rset->rset_terms[i]->count);
*sort_status = Z_SortStatus_success;
- logf (LOG_LOG, "resultSetSortSingle end");
+ yaz_log (LOG_LOG, "resultSetSortSingle end");
}
-RSET resultSetRef (ZebraHandle zh, Z_ResultSetId *resultSetId)
+RSET resultSetRef (ZebraHandle zh, const char *resultSetId)
{
ZebraSet s;
yaz_log (LOG_LOG, "resultSetRank");
- rank_class = zebraRankLookup (zh, "rank-1");
+ rank_class = zebraRankLookup (zh, res_get_def(zh->res, "rank", "rank-1"));
rc = rank_class->control;
if (rset_read (rset, rfd, &key, &term_index))
do
{
kno++;
- yaz_log(LOG_LOG, "sysno=%d seqno=%d idx=%d", key.sysno, key.seqno,
- term_index);
if (key.sysno != psysno)
{
score = (*rc->calc) (handle, psysno);
if (p && !p->init_flag)
{
if (p->control->create)
- p->class_handle = (*p->control->create)(zh->reg);
+ p->class_handle = (*p->control->create)(zh);
p->init_flag = 1;
}
return p;