X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Frelevance.c;h=c7c3f126ff89a963c478fb26b33c3f436f9d5a22;hb=77b4d51d81340f3374ae8a97aea0177a0fbcd336;hp=75800a2fa40d98f00dce2bfa2dd55b5f348fe08d;hpb=b1d1bd7c6dbf7af16d5047d91b39827d9a8c4252;p=pazpar2-moved-to-github.git diff --git a/src/relevance.c b/src/relevance.c index 75800a2..c7c3f12 100644 --- a/src/relevance.c +++ b/src/relevance.c @@ -1,5 +1,5 @@ /* - * $Id: relevance.c,v 1.4 2007-01-08 12:43:41 adam Exp $ + * $Id: relevance.c,v 1.5 2007-01-08 18:32:35 quinn Exp $ */ #include @@ -127,7 +127,7 @@ struct relevance *relevance_create(NMEM nmem, const char **terms, int numrecs) return res; } -void relevance_newrec(struct relevance *r, struct record *rec) +void relevance_newrec(struct relevance *r, struct record_cluster *rec) { if (!rec->term_frequency_vec) { @@ -139,7 +139,7 @@ void relevance_newrec(struct relevance *r, struct record *rec) // FIXME. The definition of a word is crude here.. should support // some form of localization mechanism? -void relevance_countwords(struct relevance *r, struct record *head, +void relevance_countwords(struct relevance *r, struct record_cluster *cluster, const char *words, int multiplier) { while (*words) @@ -155,23 +155,23 @@ void relevance_countwords(struct relevance *r, struct record *head, if ((res = word_trie_match(r->wt, words, &skipped))) { words += skipped; - head->term_frequency_vec[res] += multiplier; + cluster->term_frequency_vec[res] += multiplier; } else { while (*words && (c = raw_char(tolower(*words))) >= 0) words++; } - head->term_frequency_vec[0]++; + cluster->term_frequency_vec[0]++; } } -void relevance_donerecord(struct relevance *r, struct record *head) +void relevance_donerecord(struct relevance *r, struct record_cluster *cluster) { int i; for (i = 1; i < r->vec_len; i++) - if (head->term_frequency_vec[i] > 0) + if (cluster->term_frequency_vec[i] > 0) r->doc_frequency_vec[i]++; r->doc_frequency_vec[0]++; @@ -218,7 +218,7 @@ void relevance_prepare_read(struct relevance *rel, struct reclist *reclist) for (i = 0; i < reclist->num_records; i++) { int t; - struct record *rec = reclist->flatlist[i]; + struct record_cluster *rec = reclist->flatlist[i]; float relevance; relevance = 0; for (t = 1; t < rel->vec_len; t++)