/* This file is part of Pazpar2.
- Copyright (C) 2006-2009 Index Data
+ Copyright (C) 2006-2012 Index Data
Pazpar2 is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
#include <yaz/yaz-util.h>
-#include "pazpar2.h"
+#include "ppmutex.h"
+#include "session.h"
#include "reclists.h"
#include "jenkins_hash.h"
struct reclist_bucket *sorted_ptr;
struct reclist_bucket **last;
NMEM nmem;
+ YAZ_MUTEX mutex;
};
-static struct reclist_sortparms *qsort_sortparms = 0; /* thread pr */
-
struct reclist_bucket
{
struct record_cluster *record;
struct reclist_bucket *hnext;
struct reclist_bucket *snext;
+ struct reclist_sortparms *sort_parms;
};
struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms,
char parm[256];
char *pp;
const char *cpp;
- int increasing;
+ int increasing = 0;
int i;
int offset = 0;
- enum conf_sortkey_type type;
+ enum conf_sortkey_type type = Metadata_sortkey_string;
struct reclist_sortparms *new;
if (!(cpp = strchr(parms, ',')))
cpp = parms + strlen(parms);
- strncpy(parm, parms, cpp - parms);
+ strncpy(parm, parms, cpp - parms);
parm[cpp-parms] = '\0';
if ((pp = strchr(parm, ':')))
{
- increasing = pp[1] == '1' ? 1 : 0;
+ if (pp[1] == '1')
+ increasing = 1;
+ else if (pp[1] == '0')
+ increasing = 0;
+ else
+ {
+ yaz_log(YLOG_FATAL, "Bad sortkey modifier: %s", parm);
+ return 0;
+ }
+
+ if (pp[2])
+ {
+ if (pp[2] == 'p')
+ type = Metadata_sortkey_position;
+ else
+ yaz_log(YLOG_FATAL, "Bad sortkey modifier: %s", parm);
+ }
*pp = '\0';
}
- else
- increasing = 0;
- if (!strcmp(parm, "relevance"))
- {
- type = Metadata_sortkey_relevance;
- }
- else
+ if (type != Metadata_sortkey_position)
{
- for (i = 0; i < service->num_sortkeys; i++)
+ if (!strcmp(parm, "relevance"))
{
- struct conf_sortkey *sk = &service->sortkeys[i];
- if (!strcmp(sk->name, parm))
- {
- type = sk->type;
- if (type == Metadata_sortkey_skiparticle)
- type = Metadata_sortkey_string;
- break;
- }
+ type = Metadata_sortkey_relevance;
}
- if (i >= service->num_sortkeys)
+ else if (!strcmp(parm, "position"))
{
- yaz_log(YLOG_FATAL, "Bad sortkey: %s", parm);
- return 0;
+ type = Metadata_sortkey_position;
}
else
+ {
+ for (i = 0; i < service->num_sortkeys; i++)
+ {
+ struct conf_sortkey *sk = &service->sortkeys[i];
+ if (!strcmp(sk->name, parm))
+ {
+ type = sk->type;
+ if (type == Metadata_sortkey_skiparticle)
+ type = Metadata_sortkey_string;
+ break;
+ }
+ }
+ if (i >= service->num_sortkeys)
+ {
+ yaz_log(YLOG_FATAL, "Sortkey not defined in service: %s",
+ parm);
+ return 0;
+ }
offset = i;
+ }
}
new = *rp = nmem_malloc(nmem, sizeof(struct reclist_sortparms));
new->next = 0;
new->offset = offset;
new->type = type;
new->increasing = increasing;
+ new->name = nmem_strdup(nmem, parm);
rp = &new->next;
if (*(parms = cpp))
parms++;
static int reclist_cmp(const void *p1, const void *p2)
{
+ struct reclist_sortparms *sortparms =
+ (*(struct reclist_bucket **) p1)->sort_parms;
struct record_cluster *r1 = (*(struct reclist_bucket**) p1)->record;
struct record_cluster *r2 = (*(struct reclist_bucket**) p2)->record;
struct reclist_sortparms *s;
int res = 0;
- for (s = qsort_sortparms; s && res == 0; s = s->next)
+ for (s = sortparms; s && res == 0; s = s->next)
{
union data_types *ut1 = r1->sortkeys[s->offset];
union data_types *ut2 = r2->sortkeys[s->offset];
switch (s->type)
{
case Metadata_sortkey_relevance:
- res = r2->relevance - r1->relevance;
+ res = r2->relevance_score - r1->relevance_score;
break;
case Metadata_sortkey_string:
s1 = ut1 ? ut1->text.sort : "";
else
res = 0;
break;
+ case Metadata_sortkey_position:
+ if (r1->records && r2->records)
+ {
+ int pos1 = 0, pos2 = 0;
+ struct record *rec;
+ for (rec = r1->records; rec; rec = rec->next)
+ if (pos1 == 0 || rec->position < pos1)
+ pos1 = rec->position;
+ for (rec = r2->records; rec; rec = rec->next)
+ if (pos2 == 0 || rec->position < pos2)
+ pos2 = rec->position;
+ res = pos1 - pos2;
+ }
+ break;
default:
yaz_log(YLOG_WARN, "Bad sort type: %d", s->type);
res = 0;
+ break;
}
}
+ if (res == 0)
+ res = strcmp(r1->recid, r2->recid);
return res;
}
void reclist_sort(struct reclist *l, struct reclist_sortparms *parms)
{
struct reclist_bucket **flatlist = xmalloc(sizeof(*flatlist) * l->num_records);
- struct reclist_bucket *ptr = l->sorted_list;
- struct reclist_bucket **prev = &l->sorted_list;
+ struct reclist_bucket *ptr;
+ struct reclist_bucket **prev;
int i = 0;
+
+ reclist_enter(l);
+
+ ptr = l->sorted_list;
+ prev = &l->sorted_list;
while (ptr)
{
+ ptr->sort_parms = parms;
flatlist[i] = ptr;
ptr = ptr->snext;
i++;
}
assert(i == l->num_records);
- qsort_sortparms = parms;
qsort(flatlist, l->num_records, sizeof(*flatlist), reclist_cmp);
for (i = 0; i < l->num_records; i++)
{
xfree(flatlist);
- reclist_rewind(l);
+ reclist_leave(l);
}
struct record_cluster *reclist_read_record(struct reclist *l)
return 0;
}
-void reclist_rewind(struct reclist *l)
+void reclist_enter(struct reclist *l)
{
+ yaz_mutex_enter(l->mutex);
if (l)
l->sorted_ptr = l->sorted_list;
}
+
+void reclist_leave(struct reclist *l)
+{
+ yaz_mutex_leave(l->mutex);
+ if (l)
+ l->sorted_ptr = l->sorted_list;
+}
+
+
struct reclist *reclist_create(NMEM nmem)
{
struct reclist *res = nmem_malloc(nmem, sizeof(struct reclist));
res->hash_size = 399;
- res->hashtable
+ res->hashtable
= nmem_malloc(nmem, res->hash_size * sizeof(struct reclist_bucket*));
memset(res->hashtable, 0, res->hash_size * sizeof(struct reclist_bucket*));
res->nmem = nmem;
res->last = &res->sorted_list;
res->num_records = 0;
+ res->mutex = 0;
+ pazpar2_mutex_create(&res->mutex, "reclist");
return res;
}
+void reclist_destroy(struct reclist *l)
+{
+ if (l)
+ {
+ struct reclist_bucket *rb;
+
+ for (rb = l->sorted_list; rb; rb = rb->snext)
+ {
+ wrbuf_destroy(rb->record->relevance_explain1);
+ wrbuf_destroy(rb->record->relevance_explain2);
+ }
+ yaz_mutex_destroy(&l->mutex);
+ }
+}
+
int reclist_get_num_records(struct reclist *l)
{
if (l)
}
// Insert a record. Return record cluster (newly formed or pre-existing)
-struct record_cluster *reclist_insert( struct reclist *l,
- struct conf_service *service,
- struct record *record,
- char *merge_key, int *total)
+struct record_cluster *reclist_insert(struct reclist *l,
+ struct conf_service *service,
+ struct record *record,
+ const char *merge_key, int *total)
{
unsigned int bucket;
struct reclist_bucket **p;
struct record_cluster *cluster = 0;
-
+
assert(service);
assert(l);
assert(record);
bucket = jenkins_hash((unsigned char*) merge_key) % l->hash_size;
+ yaz_mutex_enter(l->mutex);
for (p = &l->hashtable[bucket]; *p; p = &(*p)->hnext)
{
// We found a matching record. Merge them
if (!strcmp(merge_key, (*p)->record->merge_key))
{
struct record_cluster *existing = (*p)->record;
+ struct record *re = existing->records;
+
+ for (; re; re = re->next)
+ {
+ if (re->client == record->client &&
+ record_compare(record, re, service))
+ {
+ yaz_mutex_leave(l->mutex);
+ return 0;
+ }
+ }
record->next = existing->records;
existing->records = record;
cluster = existing;
nmem_malloc(l->nmem, sizeof(*new));
cluster = nmem_malloc(l->nmem, sizeof(*cluster));
-
+
record->next = 0;
new->record = cluster;
new->hnext = 0;
cluster->records = record;
- cluster->merge_key = merge_key;
- cluster->relevance = 0;
+ cluster->merge_key = nmem_strdup(l->nmem, merge_key);
+ cluster->relevance_score = 0;
cluster->term_frequency_vec = 0;
- cluster->recid = merge_key;
+ cluster->recid = nmem_strdup(l->nmem, merge_key);
(*total)++;
cluster->metadata =
nmem_malloc(l->nmem,
sizeof(struct record_metadata*) * service->num_metadata);
- memset(cluster->metadata, 0,
+ memset(cluster->metadata, 0,
sizeof(struct record_metadata*) * service->num_metadata);
- cluster->sortkeys =
+ cluster->sortkeys =
nmem_malloc(l->nmem, sizeof(struct record_metadata*) * service->num_sortkeys);
memset(cluster->sortkeys, 0,
sizeof(union data_types*) * service->num_sortkeys);
-
+
+ cluster->relevance_explain1 = wrbuf_alloc();
+ cluster->relevance_explain2 = wrbuf_alloc();
/* attach to hash list */
- *p = new;
+ *p = new;
/* append to sorted_list */
*l->last = new;
l->num_records++;
}
+ yaz_mutex_leave(l->mutex);
return cluster;
}
-
+int reclist_sortparms_cmp(struct reclist_sortparms *sort1, struct reclist_sortparms *sort2)
+{
+ int rc;
+ if (sort1 == sort2)
+ return 0;
+ if (sort1 == 0 || sort2 == 0)
+ return 1;
+ rc = strcmp(sort1->name, sort2->name) || sort1->increasing != sort2->increasing || sort1->type != sort2->type;
+ return rc;
+}
/*
* Local variables:
* c-basic-offset: 4
projects / pazpar2-moved-to-github.git / blobdiff