X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Franksimilarity.c;h=68ee9f8c8e0dd06a05bdf18081253654b16e1d4b;hp=c45007863b6d188b2e641a6709aa443b56dc3f0c;hb=131e8143a9b8da294d582f0793833679101a2672;hpb=b51ecd6583f18202c633b256a861d94bd485ec2e diff --git a/index/ranksimilarity.c b/index/ranksimilarity.c index c450078..68ee9f8 100644 --- a/index/ranksimilarity.c +++ b/index/ranksimilarity.c @@ -1,5 +1,5 @@ -/* $Id: ranksimilarity.c,v 1.5 2006-05-08 14:03:16 marc Exp $ - Copyright (C) 1995-2005 +/* $Id: ranksimilarity.c,v 1.13 2007-10-29 16:57:52 adam Exp $ + Copyright (C) 1995-2007 Index Data ApS This file is part of the Zebra server. @@ -15,9 +15,9 @@ 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 + */ #include @@ -52,20 +52,17 @@ struct ranksimilarity_term_info { /** number of docs within result set */ zint no_docs_resset; - /** number of terms in this field */ - zint no_terms_field; - - /** number of docs with this field in database */ - zint no_docs_field; + /** number of docs with this fieldindex in database */ + zint no_docs_fieldindex; - /** size of all docs with this field in database (in bytes ir terms ??) */ - zint size_docs_field; + /** number of terms in this fieldindex */ + zint no_terms_fieldindex; /** rank flag is one if term is to be included in ranking */ int rank_flag; - /** relative ranking weight of term field */ - int field_weight; + /** relative ranking weight of term fieldindex */ + int fieldindex_weight; /** term id used to access term name and other info */ TERMID term; @@ -83,11 +80,11 @@ struct ranksimilarity_set_info { /** number of terms in query which are included in ranking */ int no_ranked_terms_query; - /** number of documents in entire collection */ + /** number of documents in entire database */ zint no_docs_database; - /** size of all documents in entire collection (in bytes or terms ??)*/ - zint size_docs_database; + /** number of terms in entire database */ + zint no_terms_database; /** array of size no_terms_query with statistics gathered per term */ struct ranksimilarity_term_info *entries; @@ -157,7 +154,7 @@ static void *begin (struct zebra_register *reg, /* setting database global statistics */ si->no_docs_database = -1; /* TODO */ - si->size_docs_database = -1; /* TODO */ + si->no_terms_database = -1; /* TODO */ /* setting query statistics */ si->no_terms_query = numterms; @@ -172,7 +169,7 @@ static void *begin (struct zebra_register *reg, ranksimilar_rec_reset(si); - /* looping all terms in a specific field of query */ + /* looping all terms in a specific fieldindex of query */ for (i = 0; i < numterms; i++) { struct ord_list *ol = NULL; @@ -189,6 +186,9 @@ static void *begin (struct zebra_register *reg, { const char *cp = strstr(terms[i]->flags+4, ",w="); + zint no_docs_fieldindex = 0; + zint no_terms_fieldindex = 0; + yaz_log(log_level, "begin() terms[%d]: '%s' flags=%s", i, terms[i]->name, terms[i]->flags); @@ -200,14 +200,12 @@ static void *begin (struct zebra_register *reg, of setting rset->hits_limit = rset_count(rset) ??? */ si->entries[i].freq_term_resset = rset_count(terms[i]->rset); si->entries[i].no_docs_resset = terms[i]->rset->hits_count; - si->entries[i].no_docs_field = -1; /*TODO*/ - si->entries[i].size_docs_field = -1; /*TODO*/ - si->entries[i].no_terms_field = -1; /*TODO*/ + if (cp) - si->entries[i].field_weight = atoi (cp+3); + si->entries[i].fieldindex_weight = atoi (cp+3); else - si->entries[i].field_weight = 34; /* sqrroot of 1000 */ + si->entries[i].fieldindex_weight = 34; /* sqrroot of 1000 */ /* @@ -224,28 +222,34 @@ static void *begin (struct zebra_register *reg, */ /* looping indexes where term terms[i] is found */ - for (; ol; ol = ol->next) + + for (; ol; ol = ol->next) { - int index_type = 0; + const char *index_type = 0; const char *db = 0; const char *string_index = 0; - int set = -1; - int use = -1; - + zebraExplain_lookup_ord(reg->zei, - ol->ord, &index_type, &db, &set, &use, + ol->ord, &index_type, &db, &string_index); + no_docs_fieldindex + += zebraExplain_ord_get_doc_occurrences(reg->zei, ol->ord); + no_terms_fieldindex + += zebraExplain_ord_get_term_occurrences(reg->zei, ol->ord); + if (string_index) - yaz_log(log_level, - "begin() index: ord=%d type=%c db=%s str-index=%s", - ol->ord, index_type, db, string_index); + yaz_log(log_level, + "begin() index: ord=%d type=%s db=%s str-index=%s", + ol->ord, index_type, db, string_index); else - yaz_log(log_level, - "begin() index: ord=%d type=%c db=%s set=%d use=%d", - ol->ord, index_type, db, set, use); + yaz_log(log_level, + "begin() index: ord=%d type=%s db=%s", + ol->ord, index_type, db); } + si->entries[i].no_docs_fieldindex = no_docs_fieldindex; + si->entries[i].no_terms_fieldindex = no_terms_fieldindex; } si->entries[i].term = terms[i]; @@ -290,8 +294,8 @@ static void add (void *set_handle, int seqno, TERMID term) assert(ti); si->last_pos = seqno; ti->freq_term_docfield++; - /* yaz_log(log_level, "add() seqno=%d term=%s freq_term_docfield=%d", - seqno, term->name, ti->freq_term_docfield); */ + /*yaz_log(log_level, "add() seqno=%d term=%s freq_term_docfield=%d", + seqno, term->name, ti->freq_term_docfield); */ } /* @@ -317,8 +321,8 @@ static int calc (void *set_handle, zint sysno, zint staticrank, si->no_ranked_terms_query); yaz_log(log_level, "calc() si->no_docs_database = " ZINT_FORMAT, si->no_docs_database); - yaz_log(log_level, "calc() si->size_docs_database = " ZINT_FORMAT, - si->size_docs_database); + yaz_log(log_level, "calc() si->no_terms_database = " ZINT_FORMAT, + si->no_terms_database); if (!si->no_ranked_terms_query) @@ -339,20 +343,20 @@ static int calc (void *set_handle, zint sysno, zint staticrank, i, si->entries[i].term->name, si->entries[i].term->flags); yaz_log(log_level, "calc() entries[%d] rank_flag %d", i, si->entries[i].rank_flag ); - yaz_log(log_level, "calc() entries[%d] field_weight %d", - i, si->entries[i].field_weight ); + yaz_log(log_level, "calc() entries[%d] fieldindex_weight %d", + i, si->entries[i].fieldindex_weight ); yaz_log(log_level, "calc() entries[%d] freq_term_docfield %d", i, si->entries[i].freq_term_docfield ); yaz_log(log_level, "calc() entries[%d] freq_term_resset " ZINT_FORMAT, i, si->entries[i].freq_term_resset ); yaz_log(log_level, "calc() entries[%d] no_docs_resset " ZINT_FORMAT, i, si->entries[i].no_docs_resset ); - yaz_log(log_level, "calc() entries[%d] no_docs_field " ZINT_FORMAT, - i, si->entries[i].no_docs_field ); - yaz_log(log_level, "calc() entries[%d] size_docs_field " ZINT_FORMAT, - i, si->entries[i].size_docs_field ); - yaz_log(log_level, "calc() entries[%d] no_terms_field " ZINT_FORMAT, - i, si->entries[i].no_terms_field ); + yaz_log(log_level, "calc() entries[%d] no_docs_fieldindex " + ZINT_FORMAT, + i, si->entries[i].no_docs_fieldindex ); + yaz_log(log_level, "calc() entries[%d] no_terms_fieldindex " + ZINT_FORMAT, + i, si->entries[i].no_terms_fieldindex ); } } @@ -362,7 +366,12 @@ static int calc (void *set_handle, zint sysno, zint staticrank, /* staticrank = 0 is highest, MAXINT lowest */ - score = INT_MAX - staticrank; /* but score is reverse (logical) */ + if (staticrank >= INT_MAX) + score = 0; + else + { /* but score is reverse (logical) */ + score = INT_MAX - CAST_ZINT_TO_INT(staticrank); + } /* debugging statistics output */ @@ -400,3 +409,11 @@ static struct rank_control rank_control = { }; struct rank_control *rank_similarity_class = &rank_control; +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +