/*
- * $Id: reclists.c,v 1.2 2007-01-05 20:33:05 adam Exp $
+ * $Id: reclists.c,v 1.6 2007-01-10 10:04:23 adam Exp $
*/
#include <assert.h>
+#if HAVE_CONFIG_H
+#include <cconfig.h>
+#endif
+
#include <yaz/yaz-util.h>
#include "pazpar2.h"
#include "reclists.h"
+extern struct parameters global_parameters;
+
struct reclist_bucket
{
- struct record *record;
+ struct record_cluster *record;
struct reclist_bucket *next;
};
-struct record *reclist_read_record(struct reclist *l)
+struct record_cluster *reclist_read_record(struct reclist *l)
{
if (l->pointer < l->num_records)
return l->flatlist[l->pointer++];
hashsize <<= 1;
res = nmem_malloc(nmem, sizeof(struct reclist));
res->hashtable = nmem_malloc(nmem, hashsize * sizeof(struct reclist_bucket*));
- bzero(res->hashtable, hashsize * sizeof(struct reclist_bucket*));
+ memset(res->hashtable, 0, hashsize * sizeof(struct reclist_bucket*));
res->hashtable_size = hashsize;
res->nmem = nmem;
res->hashmask = hashsize - 1; // Creates a bitmask
res->num_records = 0;
- res->flatlist = nmem_malloc(nmem, numrecs * sizeof(struct record*));
+ res->flatlist = nmem_malloc(nmem, numrecs * sizeof(struct record_cluster*));
res->flatlist_size = numrecs;
return res;
}
-struct record *reclist_insert(struct reclist *l, struct record *record)
+// Insert a record. Return record cluster (newly formed or pre-existing)
+struct record_cluster *reclist_insert(struct reclist *l, struct record *record,
+ char *merge_key, int *total)
{
unsigned int bucket;
struct reclist_bucket **p;
- struct record *head = 0;
+ struct record_cluster *cluster = 0;
+ struct conf_service *service = global_parameters.server->service;
- bucket = hash((unsigned char*) record->merge_key) & l->hashmask;
+ bucket = hash((unsigned char*) merge_key) & l->hashmask;
for (p = &l->hashtable[bucket]; *p; p = &(*p)->next)
{
// We found a matching record. Merge them
- if (!strcmp(record->merge_key, (*p)->record->merge_key))
+ if (!strcmp(merge_key, (*p)->record->merge_key))
{
- struct record *existing = (*p)->record;
- record->next_cluster = existing->next_cluster;
- existing->next_cluster = record;
- head = existing;
+ struct record_cluster *existing = (*p)->record;
+ record->next = existing->records;
+ existing->records = record;
+ cluster = existing;
break;
}
}
- if (!head && l->num_records < l->flatlist_size)
+ if (!cluster && l->num_records < l->flatlist_size)
{
struct reclist_bucket *new =
nmem_malloc(l->nmem, sizeof(struct reclist_bucket));
+ struct record_cluster *newc =
+ nmem_malloc(l->nmem, sizeof(struct record_cluster));
- assert(!*p);
-
- new->record = record;
- record->next_cluster = 0;
+ record->next = 0;
+ new->record = newc;
new->next = 0;
+ newc->records = record;
+ newc->merge_key = merge_key;
+ newc->relevance = 0;
+ newc->term_frequency_vec = 0;
+ newc->recid = (*total)++;
+ newc->metadata = 0;
+ newc->metadata = nmem_malloc(l->nmem,
+ sizeof(struct record_metadata*) * service->num_metadata);
+ memset(newc->metadata, 0, sizeof(struct record_metadata*) * service->num_metadata);
+
*p = new;
- assert(l->num_records < l->flatlist_size);
- l->flatlist[l->num_records++] = record;
- head = record;
+ l->flatlist[l->num_records++] = newc;
+ cluster = newc;
}
- return head;
+ return cluster;
}