X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzsets.c;h=1109f81de3acd252454c242734df63c3c3152860;hp=1d24d9b8e932afc69e75ca78f464446d021c77e9;hb=6c9fcd3b5d3108702fa1ffc92dab4ab6060f9a19;hpb=2b99f08490d3bd763bb086693044a6db10c0bcf9 diff --git a/index/zsets.c b/index/zsets.c index 1d24d9b..1109f81 100644 --- a/index/zsets.c +++ b/index/zsets.c @@ -1,6 +1,6 @@ -/* $Id: zsets.c,v 1.54 2004-08-06 13:36:23 adam Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 - Index Data Aps +/* $Id: zsets.c,v 1.77 2005-01-15 19:38:30 adam Exp $ + Copyright (C) 1995-2005 + Index Data ApS This file is part of the Zebra server. @@ -30,7 +30,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #endif #include "index.h" -#include +#include #define SORT_IDX_ENTRYSIZE 64 #define ZSET_SORT_MAX_LEVEL 3 @@ -46,7 +46,8 @@ struct zebra_set { char *name; RSET rset; NMEM nmem; - int hits; + NMEM rset_nmem; /* for creating the rsets in */ + zint hits; int num_bases; char **basenames; Z_RPNQuery *rpn; @@ -55,6 +56,10 @@ struct zebra_set { int term_entries_max; struct zebra_set *next; int locked; + + zint cache_position; /* last position */ + RSFD cache_rfd; /* rfd (NULL if not existing) */ + zint cache_psysno; /* sysno for last position */ }; struct zset_sort_entry { @@ -70,10 +75,27 @@ struct zset_sort_info { struct zset_sort_entry **entries; }; +static int log_level_set=0; +static int log_level_sorting=0; +static int log_level_searchhits=0; +static int log_level_searchterms=0; +static int log_level_resultsets=0; + +static void loglevels() +{ + if (log_level_set) + return; + log_level_sorting = yaz_log_module_level("sorting"); + log_level_searchhits = yaz_log_module_level("searchhits"); + log_level_searchterms = yaz_log_module_level("searchterms"); + log_level_resultsets = yaz_log_module_level("resultsets"); + log_level_set=1; +} + ZebraSet resultSetAddRPN (ZebraHandle zh, NMEM m, - Z_RPNQuery *rpn, int num_bases, + Z_RPNQuery *rpn, int num_bases, char **basenames, - const char *setname) + const char *setname) { ZebraSet zebraSet; int i; @@ -84,10 +106,11 @@ ZebraSet resultSetAddRPN (ZebraHandle zh, NMEM m, zebraSet = resultSetAdd (zh, setname, 1); if (!zebraSet) - return 0; + return 0; zebraSet->locked = 1; zebraSet->rpn = 0; zebraSet->nmem = m; + zebraSet->rset_nmem=nmem_create(); zebraSet->num_bases = num_bases; zebraSet->basenames = @@ -96,10 +119,10 @@ ZebraSet resultSetAddRPN (ZebraHandle zh, NMEM m, zebraSet->basenames[i] = nmem_strdup (zebraSet->nmem, basenames[i]); - zebraSet->rset = rpn_search (zh, zebraSet->nmem, rpn, - zebraSet->num_bases, - zebraSet->basenames, zebraSet->name, - zebraSet); + zebraSet->rset = rpn_search (zh, zebraSet->nmem, zebraSet->rset_nmem, + rpn, zebraSet->num_bases, + zebraSet->basenames, zebraSet->name, + zebraSet); zh->hits = zebraSet->hits; if (zebraSet->rset) zebraSet->rpn = rpn; @@ -108,85 +131,33 @@ ZebraSet resultSetAddRPN (ZebraHandle zh, NMEM m, } void resultSetAddTerm (ZebraHandle zh, ZebraSet s, int reg_type, - const char *db, int set, - int use, const char *term) + const char *db, int set, + int use, const char *term) { + assert(zh); /* compiler shut up */ if (!s->nmem) - s->nmem = nmem_create (); + s->nmem = nmem_create (); if (!s->term_entries) { - int i; - s->term_entries_max = 1000; - s->term_entries = - nmem_malloc (s->nmem, s->term_entries_max * - sizeof(*s->term_entries)); - for (i = 0; i < s->term_entries_max; i++) - s->term_entries[i].term = 0; + int i; + s->term_entries_max = 1000; + s->term_entries = + nmem_malloc (s->nmem, s->term_entries_max * + sizeof(*s->term_entries)); + for (i = 0; i < s->term_entries_max; i++) + s->term_entries[i].term = 0; } if (s->hits < s->term_entries_max) { - s->term_entries[s->hits].reg_type = reg_type; - s->term_entries[s->hits].db = nmem_strdup (s->nmem, db); - s->term_entries[s->hits].set = set; - s->term_entries[s->hits].use = use; - s->term_entries[s->hits].term = nmem_strdup (s->nmem, term); + s->term_entries[s->hits].reg_type = reg_type; + s->term_entries[s->hits].db = nmem_strdup (s->nmem, db); + s->term_entries[s->hits].set = set; + s->term_entries[s->hits].use = use; + s->term_entries[s->hits].term = nmem_strdup (s->nmem, term); } (s->hits)++; } - -int zebra_resultSetTerms (ZebraHandle zh, const char *setname, - int no, zint *count, - int *type, char *out, size_t *len) -{ - ZebraSet s = resultSetGet (zh, setname); - int no_max = 0; - - if (count) - *count = 0; - if (!s || !s->rset) - return 0; - no_max = s->rset->no_rset_terms; - if (no < 0 || no >= no_max) - return 0; - if (count) - *count = s->rset->rset_terms[no]->count; - if (type) - *type = s->rset->rset_terms[no]->type; - - if (out) - { - char *inbuf = s->rset->rset_terms[no]->name; - size_t inleft = strlen(inbuf); - size_t outleft = *len - 1; - int converted = 0; - - if (zh->iconv_from_utf8 != 0) - { - char *outbuf = out; - size_t ret; - - ret = yaz_iconv(zh->iconv_from_utf8, &inbuf, &inleft, - &outbuf, &outleft); - if (ret == (size_t)(-1)) - *len = 0; - else - *len = outbuf - out; - converted = 1; - } - if (!converted) - { - if (inleft > outleft) - inleft = outleft; - *len = inleft; - memcpy (out, inbuf, *len); - } - out[*len] = 0; - } - return no_max; -} - - ZebraSet resultSetAdd (ZebraHandle zh, const char *name, int ov) { ZebraSet s; @@ -194,49 +165,61 @@ ZebraSet resultSetAdd (ZebraHandle zh, const char *name, int ov) for (s = zh->sets; s; s = s->next) if (!strcmp (s->name, name)) - break; + break; + + if (!log_level_set) + loglevels(); if (s) { - yaz_log (LOG_DEBUG, "updating result set %s", name); - if (!ov || s->locked) - return NULL; - if (s->rset) - rset_delete (s->rset); - if (s->nmem) - nmem_destroy (s->nmem); + yaz_log(log_level_resultsets, "updating result set %s", name); + if (!ov || s->locked) + return NULL; + if (s->rset) + { + if (s->cache_rfd) + rset_close(s->cache_rfd); + rset_delete (s->rset); + } + if (s->rset_nmem) + nmem_destroy (s->rset_nmem); + if (s->nmem) + nmem_destroy (s->nmem); } else { - const char *sort_max_str = zebra_get_resource(zh, "sortmax", "1000"); - - yaz_log (LOG_DEBUG, "adding result set %s", name); - s = (ZebraSet) xmalloc (sizeof(*s)); - s->next = zh->sets; - zh->sets = s; - s->name = (char *) xmalloc (strlen(name)+1); - strcpy (s->name, name); - - s->sort_info = (struct zset_sort_info *) - xmalloc (sizeof(*s->sort_info)); - s->sort_info->max_entries = atoi(sort_max_str); - if (s->sort_info->max_entries < 2) - s->sort_info->max_entries = 2; - - s->sort_info->entries = (struct zset_sort_entry **) - xmalloc (sizeof(*s->sort_info->entries) * - s->sort_info->max_entries); - s->sort_info->all_entries = (struct zset_sort_entry *) - xmalloc (sizeof(*s->sort_info->all_entries) * - s->sort_info->max_entries); - for (i = 0; i < s->sort_info->max_entries; i++) - s->sort_info->entries[i] = s->sort_info->all_entries + i; + const char *sort_max_str = zebra_get_resource(zh, "sortmax", "1000"); + + yaz_log(log_level_resultsets, "adding result set %s", name); + s = (ZebraSet) xmalloc (sizeof(*s)); + s->next = zh->sets; + zh->sets = s; + s->name = (char *) xmalloc (strlen(name)+1); + strcpy (s->name, name); + + s->sort_info = (struct zset_sort_info *) + xmalloc (sizeof(*s->sort_info)); + s->sort_info->max_entries = atoi(sort_max_str); + if (s->sort_info->max_entries < 2) + s->sort_info->max_entries = 2; + + s->sort_info->entries = (struct zset_sort_entry **) + xmalloc (sizeof(*s->sort_info->entries) * + s->sort_info->max_entries); + s->sort_info->all_entries = (struct zset_sort_entry *) + xmalloc (sizeof(*s->sort_info->all_entries) * + s->sort_info->max_entries); + for (i = 0; i < s->sort_info->max_entries; i++) + s->sort_info->entries[i] = s->sort_info->all_entries + i; } s->locked = 0; s->term_entries = 0; s->hits = 0; s->rset = 0; + s->rset_nmem=0; s->nmem = 0; s->rpn = 0; + s->cache_position = 0; + s->cache_rfd = 0; return s; } @@ -250,10 +233,12 @@ ZebraSet resultSetGet (ZebraHandle zh, const char *name) if (!s->term_entries && !s->rset && s->rpn) { NMEM nmem = nmem_create (); - yaz_log (LOG_LOG, "research %s", name); + yaz_log(log_level_resultsets, "research %s", name); + if (!s->rset_nmem) + s->rset_nmem=nmem_create(); s->rset = - rpn_search (zh, nmem, s->rpn, s->num_bases, - s->basenames, s->name, s); + rpn_search (zh, nmem, s->rset_nmem, s->rpn, s->num_bases, + s->basenames, s->name, s); nmem_destroy (nmem); } return s; @@ -265,11 +250,21 @@ void resultSetInvalidate (ZebraHandle zh) { ZebraSet s = zh->sets; + yaz_log(log_level_resultsets, "invalidating result sets"); for (; s; s = s->next) { if (s->rset) + { + if (s->cache_rfd) + rset_close(s->cache_rfd); rset_delete (s->rset); + } s->rset = 0; + s->cache_rfd = 0; + s->cache_position = 0; + if (s->rset_nmem) + nmem_destroy(s->rset_nmem); + s->rset_nmem=0; } } @@ -279,159 +274,205 @@ void resultSetDestroy (ZebraHandle zh, int num, char **names,int *statuses) int i; if (statuses) - for (i = 0; ierrCode = 0; zh->errString = NULL; while (*ss) { - int i = -1; - ZebraSet s = *ss; - if (num >= 0) - { - for (i = 0; iname, names[i])) - { - if (statuses) - statuses[i] = Z_DeleteStatus_success; - i = -1; - break; - } - } - if (i < 0) - { - *ss = s->next; - - xfree (s->sort_info->all_entries); - xfree (s->sort_info->entries); - xfree (s->sort_info); - - if (s->nmem) - nmem_destroy (s->nmem); - if (s->rset) - rset_delete (s->rset); - xfree (s->name); - xfree (s); - } - else - ss = &s->next; + int i = -1; + ZebraSet s = *ss; + if (num >= 0) + { + for (i = 0; iname, names[i])) + { + if (statuses) + statuses[i] = Z_DeleteStatus_success; + i = -1; + break; + } + } + if (i < 0) + { + *ss = s->next; + + xfree (s->sort_info->all_entries); + xfree (s->sort_info->entries); + xfree (s->sort_info); + + if (s->nmem) + nmem_destroy (s->nmem); + if (s->rset) + { + if (s->cache_rfd) + rset_close(s->cache_rfd); + rset_delete (s->rset); + } + if (s->rset_nmem) + nmem_destroy(s->rset_nmem); + xfree (s->name); + xfree (s); + } + else + ss = &s->next; } } -ZebraPosSet zebraPosSetCreate (ZebraHandle zh, const char *name, - int num, int *positions) +ZebraMetaRecord *zebra_meta_records_create_range (ZebraHandle zh, + const char *name, + zint start, int num) +{ + zint pos_small[10]; + zint *pos = pos_small; + ZebraMetaRecord *mr; + int i; + + if (num > 10000 || num <= 0) + return 0; + + if (num > 10) + pos = xmalloc(sizeof(*pos) * num); + + for (i = 0; i 10) + xfree(pos); + return mr; +} + +ZebraMetaRecord *zebra_meta_records_create (ZebraHandle zh, const char *name, + int num, zint *positions) { ZebraSet sset; - ZebraPosSet sr = 0; + ZebraMetaRecord *sr = 0; RSET rset; int i; struct zset_sort_info *sort_info; + if (!log_level_set) + loglevels(); if (!(sset = resultSetGet (zh, name))) return NULL; if (!(rset = sset->rset)) { - if (!sset->term_entries) - return 0; - sr = (ZebraPosSet) xmalloc (sizeof(*sr) * num); - for (i = 0; iterm_entries) + return 0; + sr = (ZebraMetaRecord *) xmalloc (sizeof(*sr) * num); + for (i = 0; iterm_entries_max) - { - sr[i].term = sset->term_entries[positions[i]-1].term; - sr[i].db = sset->term_entries[positions[i]-1].db; - } - } + if (positions[i] <= sset->term_entries_max) + { + sr[i].term = sset->term_entries[positions[i]-1].term; + sr[i].db = sset->term_entries[positions[i]-1].db; + } + } } else { - sr = (ZebraPosSet) xmalloc (sizeof(*sr) * num); - for (i = 0; isort_info; - if (sort_info) - { - int position; + sr = (ZebraMetaRecord *) xmalloc (sizeof(*sr) * num); + for (i = 0; isort_info; + if (sort_info) + { + zint position; + + for (i = 0; i 0 && position <= sort_info->num_entries) + { + yaz_log(log_level_sorting, "got pos=" ZINT_FORMAT + " (sorted)", position); + sr[i].sysno = sort_info->entries[position-1]->sysno; + sr[i].score = sort_info->entries[position-1]->score; + } + } + } + /* did we really get all entries using sort ? */ + for (i = 0; inum_entries; + while (num_i < num && positions[num_i] < position) + num_i++; - for (i = 0; icache_rfd && + num_i < num && positions[num_i] > sset->cache_position) { - position = positions[i]; - if (position > 0 && position <= sort_info->num_entries) - { - 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; - } + position = sset->cache_position; + rfd = sset->cache_rfd; + psysno = sset->cache_psysno; } - } - /* did we really get all entries using sort ? */ - for (i = 0; inum_entries; - while (num_i < num && positions[num_i] < position) - num_i++; - rfd = rset_open (rset, RSETF_READ); - while (num_i < num && rset_read (rset, rfd, &key, &term_index)) + else { -#if IT_KEY_NEW - zint this_sys = key.mem[0]; -#else - zint this_sys = key.sysno; -#endif - if (this_sys != psysno) - { - psysno = this_sys; - if (sort_info) - { - /* determine we alreay have this in our set */ - for (i = sort_info->num_entries; --i >= 0; ) - if (psysno == sort_info->entries[i]->sysno) - break; - if (i >= 0) - continue; - } - position++; - assert (num_i < num); - if (position == positions[num_i]) - { - sr[num_i].sysno = psysno; - yaz_log (LOG_DEBUG, "got pos=%d (unsorted)", position); - sr[num_i].score = -1; - num_i++; - } - } + if (sset->cache_rfd) + rset_close(sset->cache_rfd); + rfd = rset_open (rset, RSETF_READ); } - rset_close (rset, rfd); - } + while (num_i < num && rset_read (rfd, &key, 0)) + { + zint this_sys = key.mem[0]; + if (this_sys != psysno) + { + psysno = this_sys; + if (sort_info) + { + /* determine we alreay have this in our set */ + for (i = sort_info->num_entries; --i >= 0; ) + if (psysno == sort_info->entries[i]->sysno) + break; + if (i >= 0) + continue; + } + position++; + assert (num_i < num); + if (position == positions[num_i]) + { + sr[num_i].sysno = psysno; + yaz_log(log_level_sorting, "got pos=" ZINT_FORMAT " (unsorted)", position); + sr[num_i].score = -1; + num_i++; + } + } + } + sset->cache_position = position; + sset->cache_psysno = psysno; + sset->cache_rfd = rfd; + } } return sr; } -void zebraPosSetDestroy (ZebraHandle zh, ZebraPosSet records, int num) +void zebra_meta_records_destroy (ZebraHandle zh, ZebraMetaRecord *records, + int num) { + assert(zh); /* compiler shut up about unused arg */ xfree (records); } @@ -442,8 +483,8 @@ struct sortKeyInfo { }; void resultSetInsertSort (ZebraHandle zh, ZebraSet sset, - struct sortKeyInfo *criteria, int num_criteria, - zint sysno) + struct sortKeyInfo *criteria, int num_criteria, + zint sysno) { struct zset_sort_entry this_entry; struct zset_sort_entry *new_entry = NULL; @@ -453,15 +494,15 @@ void resultSetInsertSort (ZebraHandle zh, ZebraSet sset, sortIdx_sysno (zh->reg->sortIdx, sysno); for (i = 0; ireg->sortIdx, criteria[i].attrUse); - sortIdx_read (zh->reg->sortIdx, this_entry.buf[i]); + sortIdx_type (zh->reg->sortIdx, criteria[i].attrUse); + sortIdx_read (zh->reg->sortIdx, this_entry.buf[i]); } i = sort_info->num_entries; while (--i >= 0) { - int rel = 0; - for (j = 0; jentries[i]->buf[j], - SORT_IDX_ENTRYSIZE); + rel = memcmp (this_entry.buf[j], sort_info->entries[i]->buf[j], + SORT_IDX_ENTRYSIZE); } - if (rel) - break; - } - if (!rel) - break; - if (criteria[j].relation == 'A') + if (rel) + break; + } + if (!rel) + break; + if (criteria[j].relation == 'A') { - if (rel > 0) - break; - } + if (rel > 0) + break; + } else if (criteria[j].relation == 'D') - { - if (rel < 0) - break; - } + { + if (rel < 0) + break; + } } ++i; j = sort_info->max_entries; if (i == j) - return; + return; if (sort_info->num_entries == j) - --j; + --j; else - j = (sort_info->num_entries)++; + j = (sort_info->num_entries)++; new_entry = sort_info->entries[j]; while (j != i) { - sort_info->entries[j] = sort_info->entries[j-1]; - --j; + sort_info->entries[j] = sort_info->entries[j-1]; + --j; } sort_info->entries[i] = new_entry; assert (new_entry); for (i = 0; ibuf[i], this_entry.buf[i], SORT_IDX_ENTRYSIZE); + memcpy (new_entry->buf[i], this_entry.buf[i], SORT_IDX_ENTRYSIZE); new_entry->sysno = sysno; new_entry->score = -1; } void resultSetInsertRank (ZebraHandle zh, struct zset_sort_info *sort_info, - zint sysno, int score, int relation) + zint sysno, int score, int relation) { struct zset_sort_entry *new_entry = NULL; int i, j; + assert(zh); /* compiler shut up about unused arg */ i = sort_info->num_entries; while (--i >= 0) { - int rel = 0; + int rel = 0; - rel = score - sort_info->entries[i]->score; + rel = score - sort_info->entries[i]->score; - if (relation == 'D') - { - if (rel >= 0) - break; - } - else if (relation == 'A') - { - if (rel <= 0) - break; - } + if (relation == 'D') + { + if (rel >= 0) + break; + } + else if (relation == 'A') + { + if (rel <= 0) + break; + } } ++i; j = sort_info->max_entries; if (i == j) - return; + return; if (sort_info->num_entries == j) - --j; + --j; else - j = (sort_info->num_entries)++; + j = (sort_info->num_entries)++; new_entry = sort_info->entries[j]; while (j != i) { - sort_info->entries[j] = sort_info->entries[j-1]; - --j; + sort_info->entries[j] = sort_info->entries[j-1]; + --j; } sort_info->entries[i] = new_entry; assert (new_entry); @@ -563,148 +605,152 @@ void resultSetInsertRank (ZebraHandle zh, struct zset_sort_info *sort_info, } void resultSetSort (ZebraHandle zh, NMEM nmem, - int num_input_setnames, const char **input_setnames, - const char *output_setname, - Z_SortKeySpecList *sort_sequence, int *sort_status) + int num_input_setnames, const char **input_setnames, + const char *output_setname, + Z_SortKeySpecList *sort_sequence, int *sort_status) { ZebraSet sset; RSET rset; if (num_input_setnames == 0) { - zh->errCode = 208; - return ; + zh->errCode = 208; + return ; } if (num_input_setnames > 1) { - zh->errCode = 230; - return; + zh->errCode = 230; + return; } - yaz_log (LOG_DEBUG, "result set sort input=%s output=%s", - *input_setnames, output_setname); + if (!log_level_set) + loglevels(); + yaz_log(log_level_sorting, "result set sort input=%s output=%s", + *input_setnames, output_setname); sset = resultSetGet (zh, input_setnames[0]); if (!sset) { - zh->errCode = 30; - zh->errString = nmem_strdup (nmem, input_setnames[0]); - return; + zh->errCode = 30; + zh->errString = nmem_strdup (nmem, input_setnames[0]); + return; } if (!(rset = sset->rset)) { - zh->errCode = 30; - zh->errString = nmem_strdup (nmem, input_setnames[0]); + zh->errCode = 30; + zh->errString = nmem_strdup (nmem, input_setnames[0]); return; } if (strcmp (output_setname, input_setnames[0])) { - rset = rset_dup (rset); - sset = resultSetAdd (zh, output_setname, 1); + rset = rset_dup (rset); + sset = resultSetAdd (zh, output_setname, 1); sset->rset = rset; } resultSetSortSingle (zh, nmem, sset, rset, sort_sequence, sort_status); } void resultSetSortSingle (ZebraHandle zh, NMEM nmem, - ZebraSet sset, RSET rset, - Z_SortKeySpecList *sort_sequence, int *sort_status) + ZebraSet sset, RSET rset, + Z_SortKeySpecList *sort_sequence, int *sort_status) { int i; + int n = 0; + zint kno = 0; zint psysno = 0; struct it_key key; struct sortKeyInfo sort_criteria[3]; int num_criteria; - int term_index; RSFD rfd; + TERMID termid; + TERMID *terms; + int numTerms = 0; - yaz_log (LOG_LOG, "resultSetSortSingle start"); + assert(nmem); /* compiler shut up about unused param */ sset->sort_info->num_entries = 0; + rset_getterms(rset, 0, 0, &n); + terms = (TERMID *) nmem_malloc(nmem, sizeof(*terms)*n); + rset_getterms(rset, terms, n, &numTerms); + sset->hits = 0; num_criteria = sort_sequence->num_specs; if (num_criteria > 3) - num_criteria = 3; + num_criteria = 3; for (i = 0; i < num_criteria; i++) { - Z_SortKeySpec *sks = sort_sequence->specs[i]; - Z_SortKey *sk; - - if (*sks->sortRelation == Z_SortKeySpec_ascending) - sort_criteria[i].relation = 'A'; - else if (*sks->sortRelation == Z_SortKeySpec_descending) - sort_criteria[i].relation = 'D'; - else - { - zh->errCode = 214; - return; - } - if (sks->sortElement->which == Z_SortElement_databaseSpecific) - { - zh->errCode = 210; - return; - } - else if (sks->sortElement->which != Z_SortElement_generic) - { - zh->errCode = 237; - return; - } - sk = sks->sortElement->u.generic; - switch (sk->which) - { - case Z_SortKey_sortField: - yaz_log (LOG_DEBUG, "Sort: key %d is of type sortField", i+1); - zh->errCode = 207; - return; - case Z_SortKey_elementSpec: - yaz_log (LOG_DEBUG, "Sort: key %d is of type elementSpec", i+1); - zh->errCode = 207; - return; - case Z_SortKey_sortAttributes: - 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, + Z_SortKeySpec *sks = sort_sequence->specs[i]; + Z_SortKey *sk; + + if (*sks->sortRelation == Z_SortKeySpec_ascending) + sort_criteria[i].relation = 'A'; + else if (*sks->sortRelation == Z_SortKeySpec_descending) + sort_criteria[i].relation = 'D'; + else + { + zh->errCode = 214; + return; + } + if (sks->sortElement->which == Z_SortElement_databaseSpecific) + { + zh->errCode = 210; + return; + } + else if (sks->sortElement->which != Z_SortElement_generic) + { + zh->errCode = 237; + return; + } + sk = sks->sortElement->u.generic; + switch (sk->which) + { + case Z_SortKey_sortField: + yaz_log(log_level_sorting, "Sort: key %d is of type sortField", i+1); + zh->errCode = 207; + return; + case Z_SortKey_elementSpec: + yaz_log(log_level_sorting, "Sort: key %d is of type elementSpec", i+1); + zh->errCode = 207; + return; + case Z_SortKey_sortAttributes: + yaz_log(log_level_sorting, "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); - yaz_log (LOG_DEBUG, "use value = %d", sort_criteria[i].attrUse); - if (sort_criteria[i].attrUse == -1) - { - zh->errCode = 116; - return; - } - if (sortIdx_type (zh->reg->sortIdx, sort_criteria[i].attrUse)) - { - zh->errCode = 207; - return; - } - break; - } + yaz_log(log_level_sorting, "use value = %d", sort_criteria[i].attrUse); + if (sort_criteria[i].attrUse == -1) + { + zh->errCode = 116; + return; + } + if (sortIdx_type (zh->reg->sortIdx, sort_criteria[i].attrUse)) + { + zh->errCode = 207; + return; + } + break; + } } rfd = rset_open (rset, RSETF_READ); - while (rset_read (rset, rfd, &key, &term_index)) + while (rset_read (rfd, &key, &termid)) + /* FIXME - pass a TERMID *, and use it for something below !! */ { -#if IT_KEY_NEW - zint this_sys = key.mem[0]; -#else - zint this_sys = key.sysno; -#endif + zint this_sys = key.mem[0]; + kno++; if (this_sys != psysno) { - (sset->hits)++; + (sset->hits)++; psysno = this_sys; - resultSetInsertSort (zh, sset, - sort_criteria, num_criteria, psysno); + resultSetInsertSort (zh, sset, + sort_criteria, num_criteria, psysno); } } - rset_close (rset, rfd); - - for (i = 0; i < rset->no_rset_terms; i++) - yaz_log (LOG_LOG, "term=\"%s\" nn=" ZINT_FORMAT " type=%s count=" ZINT_FORMAT, - rset->rset_terms[i]->name, - rset->rset_terms[i]->nn, - rset->rset_terms[i]->flags, - rset->rset_terms[i]->count); - + rset_close (rfd); + yaz_log(log_level_sorting, ZINT_FORMAT " keys, " ZINT_FORMAT " sysnos, sort", + kno, sset->hits); + for (i = 0; i < numTerms; i++) + yaz_log(log_level_sorting, "term=\"%s\" type=%s count=" ZINT_FORMAT, + terms[i]->name, terms[i]->flags, rset_count(terms[i]->rset)); *sort_status = Z_SortResponse_success; - yaz_log (LOG_LOG, "resultSetSortSingle end"); } RSET resultSetRef (ZebraHandle zh, const char *resultSetId) @@ -712,16 +758,20 @@ RSET resultSetRef (ZebraHandle zh, const char *resultSetId) ZebraSet s; if ((s = resultSetGet (zh, resultSetId))) - return s->rset; + return s->rset; return NULL; } -void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset) +void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset, NMEM nmem) { zint kno = 0; struct it_key key; RSFD rfd; - int term_index, i; + TERMID termid; + TERMID *terms; + int numTerms = 0; + int n = 0; + int i; ZebraRankClass rank_class; struct rank_control *rc; struct zset_sort_info *sort_info; @@ -729,99 +779,103 @@ void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset) double cur,tot; zint est=-2; /* -2 not done, -1 can't do, >0 actual estimate*/ zint esthits; + double ratio; + if (!log_level_set) + loglevels(); sort_info = zebraSet->sort_info; sort_info->num_entries = 0; zebraSet->hits = 0; - rfd = rset_open (rset, RSETF_READ); + rset_getterms(rset, 0, 0, &n); + terms = (TERMID *) nmem_malloc(nmem, sizeof(*terms)*n); + rset_getterms(rset, terms, n, &numTerms); - yaz_log (LOG_LOG, "resultSetRank"); + rfd = rset_open (rset, RSETF_READ); rank_class = zebraRankLookup (zh, rank_handler_name); if (!rank_class) { - yaz_log (LOG_WARN, "No such rank handler: %s", rank_handler_name); + yaz_log(YLOG_WARN, "No such rank handler: %s", rank_handler_name); return; } rc = rank_class->control; - if (rset_read (rset, rfd, &key, &term_index)) + if (rset_read (rfd, &key, &termid)) { -#if IT_KEY_NEW - zint psysno = key.mem[0]; -#else - zint psysno = key.sysno; -#endif - int score; - void *handle = - (*rc->begin) (zh->reg, rank_class->class_handle, rset); - (zebraSet->hits)++; - esthits=atoi(res_get_def(zh->res,"estimatehits","0")); - if (!esthits) est=-1; /* can not do */ - do - { -#if IT_KEY_NEW - zint this_sys = key.mem[0]; -#else - zint this_sys = key.sysno; -#endif - kno++; - if (this_sys != psysno) - { - score = (*rc->calc) (handle, psysno); + zint psysno = key.mem[0]; + int score; + void *handle = + (*rc->begin) (zh->reg, rank_class->class_handle, rset, nmem, + terms, numTerms); + (zebraSet->hits)++; + esthits = atoi(res_get_def(zh->res, "estimatehits","0")); + if (!esthits) + est = -1; /* can not do */ + do + { + zint this_sys = key.mem[0]; /* FIXME - assumes scope==2 */ + zint seqno = key.mem[key.len-1]; /* FIXME - assumes scope==2 */ + kno++; + key_logdump_txt(log_level_searchhits,&key," Got hit"); + if (this_sys != psysno) + { + score = (*rc->calc) (handle, psysno); - resultSetInsertRank (zh, sort_info, psysno, score, 'A'); - (zebraSet->hits)++; - psysno = this_sys; - } - (*rc->add) (handle, this_sys, term_index); - if ( (est==-2) && (zebraSet->hits==esthits)) - { /* time to estimate the hits */ - float f; - rset_pos(rset,rfd,&cur,&tot); - if (tot>0) { - f=1.0*cur/tot; - est=(zint)(0.5+zebraSet->hits/f); - /* FIXME - round the guess to 3 digits */ - logf(LOG_LOG, "Estimating hits (%s) " - "%0.1f->%d" - "; %0.1f->"ZINT_FORMAT, - rset->control->desc, - cur, zebraSet->hits, - tot,est); - zebraSet->hits=est; + resultSetInsertRank (zh, sort_info, psysno, score, 'A'); + (zebraSet->hits)++; + psysno = this_sys; + } + (*rc->add) (handle, seqno, termid); + + if ((est==-2) && (zebraSet->hits==esthits)) + { /* time to estimate the hits */ + rset_pos(rfd,&cur,&tot); + if (tot>0) { + ratio = cur/tot; + est = (zint)(0.5+zebraSet->hits/ratio); + yaz_log(log_level_searchhits, "Estimating hits (%s) " + "%0.1f->" ZINT_FORMAT + "; %0.1f->" ZINT_FORMAT, + rset->control->desc, + cur, zebraSet->hits, + tot, est); + i = 0; /* round to 3 significant digits */ + while (est>1000) { + est /= 10; + i++; + } + while (i--) + est *= 10; + zebraSet->hits = est; + } } } - } - while (rset_read (rset, rfd, &key, &term_index) && (est<0) ); - - score = (*rc->calc) (handle, psysno); - resultSetInsertRank (zh, sort_info, psysno, score, 'A'); - (*rc->end) (zh->reg, handle); + while (rset_read (rfd, &key,&termid) && (est<0) ); + score = (*rc->calc)(handle, psysno); + resultSetInsertRank(zh, sort_info, psysno, score, 'A'); + (*rc->end) (zh->reg, handle); + } + rset_close (rfd); + + yaz_log(log_level_searchterms, ZINT_FORMAT " keys, " ZINT_FORMAT " sysnos, rank", + kno, zebraSet->hits); + for (i = 0; i < numTerms; i++) + { + yaz_log(log_level_searchterms, "term=\"%s\" type=%s count=" ZINT_FORMAT, + terms[i]->name, terms[i]->flags, rset_count(terms[i]->rset)); } - rset_close (rset, rfd); - - for (i = 0; i < rset->no_rset_terms; i++) - yaz_log (LOG_LOG, "term=\"%s\" nn=" ZINT_FORMAT " type=%s count=" ZINT_FORMAT, - rset->rset_terms[i]->name, - rset->rset_terms[i]->nn, - rset->rset_terms[i]->flags, - rset->rset_terms[i]->count); - - yaz_log (LOG_LOG, ZINT_FORMAT " keys, %d distinct sysnos", - kno, zebraSet->hits); } ZebraRankClass zebraRankLookup (ZebraHandle zh, const char *name) { ZebraRankClass p = zh->reg->rank_classes; while (p && strcmp (p->control->name, name)) - p = p->next; + p = p->next; if (p && !p->init_flag) { - if (p->control->create) - p->class_handle = (*p->control->create)(zh); - p->init_flag = 1; + if (p->control->create) + p->class_handle = (*p->control->create)(zh); + p->init_flag = 1; } return p; } @@ -842,13 +896,13 @@ void zebraRankDestroy (struct zebra_register *reg) ZebraRankClass p = reg->rank_classes; while (p) { - ZebraRankClass p_next = p->next; - if (p->init_flag && p->control->destroy) - (*p->control->destroy)(reg, p->class_handle); - xfree (p->control->name); - xfree (p->control); - xfree (p); - p = p_next; + ZebraRankClass p_next = p->next; + if (p->init_flag && p->control->destroy) + (*p->control->destroy)(reg, p->class_handle); + xfree(p->control->name); + xfree(p->control); + xfree(p); + p = p_next; } reg->rank_classes = NULL; }