-/* $Id: reclists.c,v 1.11 2007-04-17 07:52:03 marc Exp $
+/* $Id: reclists.c,v 1.17 2007-05-11 06:48:32 adam Exp $
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
struct reclist_bucket *next;
};
+#if 0
+struct reclist_sortparms *
+reclist_sortparms_insert_field_id(NMEM nmem,
+ struct reclist_sortparms **sortparms,
+ int field_id,
+ enum conf_sortkey_type type,
+ int increasing)
+{
+ struct reclist_sortparms * tmp_rlsp = 0;
+ // assert(nmem);
+
+ if(!sortparms || field_id < 0)
+ return 0;
+
+ // construct new reclist_sortparms
+ tmp_rlsp = nmem_malloc(nmem, sizeof(struct reclist_sortparms));
+ tmp_rlsp->offset = field_id;
+ tmp_rlsp->type = type;
+ tmp_rlsp->increasing = increasing;
+
+
+ // insert in *sortparms place, moving *sortparms one down the list
+ tmp_rlsp->next = *sortparms;
+ *sortparms = tmp_rlsp;
+
+ return *sortparms;
+};
+#endif
+
+#if 0
+struct reclist_sortparms *
+reclist_sortparms_insert(NMEM nmem,
+ struct reclist_sortparms **sortparms,
+ struct conf_service * service,
+ const char * name,
+ int increasing)
+{
+ int field_id = 0;
+
+ if (!sortparms || !service || !name)
+ return 0;
+
+ field_id = conf_service_sortkey_field_id(service, name);
+
+ if (-1 == field_id)
+ return 0;
+
+ return reclist_sortparms_insert_field_id(nmem, sortparms, field_id,
+ service->sortkeys[field_id].type,
+ increasing);
+};
+#endif
+
+
struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms)
{
struct reclist_sortparms *res = 0;
int res;
switch (s->type)
{
+ char *s1, *s2;
+
case Metadata_sortkey_relevance:
res = r2->relevance - r1->relevance;
break;
case Metadata_sortkey_string:
- res = strcmp(r2->sortkeys[s->offset]->text, r1->sortkeys[s->offset]->text);
+ s1 = r1->sortkeys[s->offset] ? r1->sortkeys[s->offset]->text : "";
+ s2 = r2->sortkeys[s->offset] ? r2->sortkeys[s->offset]->text : "";
+ res = strcmp(s2, s1);
break;
case Metadata_sortkey_numeric:
res = 0;
void reclist_sort(struct reclist *l, struct reclist_sortparms *parms)
{
sortparms = parms;
- qsort(l->flatlist, l->num_records, sizeof(struct record_cluster*), reclist_cmp);
+ qsort(l->flatlist, l->num_records,
+ sizeof(struct record_cluster*), reclist_cmp);
reclist_rewind(l);
}
while (hashsize < numrecs)
hashsize <<= 1;
res = nmem_malloc(nmem, sizeof(struct reclist));
- res->hashtable = nmem_malloc(nmem, hashsize * sizeof(struct reclist_bucket*));
+ res->hashtable
+ = nmem_malloc(nmem, hashsize * sizeof(struct reclist_bucket*));
memset(res->hashtable, 0, hashsize * sizeof(struct reclist_bucket*));
res->hashtable_size = hashsize;
res->nmem = nmem;
struct record_cluster *reclist_insert( struct reclist *l,
struct conf_service *service,
struct record *record,
- char *merge_key, int *total)
+ const char *merge_key, int *total)
{
unsigned int bucket;
struct reclist_bucket **p;
struct record_cluster *cluster = 0;
assert(service);
- assert(service->num_metadata);
- assert(service->num_sortkeys);
+ assert(l);
+ assert(record);
assert(merge_key);
-
+ assert(total);
bucket = hash((unsigned char*) merge_key) & l->hashmask;
+
for (p = &l->hashtable[bucket]; *p; p = &(*p)->next)
{
// We found a matching record. Merge them
new->record = newc;
new->next = 0;
newc->records = record;
- newc->merge_key = merge_key;
+ newc->merge_key = (char *) merge_key;
newc->relevance = 0;
newc->term_frequency_vec = 0;
newc->recid = (*total)++;
newc->metadata = nmem_malloc(l->nmem,
sizeof(struct record_metadata*) * service->num_metadata);
- memset(newc->metadata, 0, sizeof(struct record_metadata*) * service->num_metadata);
+ memset(newc->metadata, 0,
+ sizeof(struct record_metadata*) * service->num_metadata);
newc->sortkeys = nmem_malloc(l->nmem,
sizeof(struct record_metadata*) * service->num_sortkeys);
- memset(newc->sortkeys, 0, sizeof(union data_types*) * service->num_sortkeys);
+ memset(newc->sortkeys, 0,
+ sizeof(union data_types*) * service->num_sortkeys);
*p = new;
l->flatlist[l->num_records++] = newc;