/* This file is part of Pazpar2.
- Copyright (C) 2006-2013 Index Data
+ Copyright (C) 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
unsigned hash_size;
int num_records;
- struct reclist_bucket *sorted_list;
- struct reclist_bucket *sorted_ptr;
+ struct record_cluster *sorted_list;
+ struct record_cluster *sorted_ptr;
NMEM nmem;
YAZ_MUTEX mutex;
};
{
struct record_cluster *record;
struct reclist_bucket *hash_next;
- struct reclist_bucket *sorted_next;
- struct reclist_sortparms *sort_parms;
};
static void append_merge_keys(struct record_metadata_attr **p,
const struct record_metadata_attr *a,
NMEM nmem)
{
-#if 1
for (; a; a = a->next)
{
struct record_metadata_attr **pi = p;
(*pi)->next = 0;
}
}
-#else
- while (*p)
- p = &(*p)->next;
- for (; a; a = a->next)
- {
- *p = (struct record_metadata_attr *) nmem_malloc(nmem, sizeof(**p));
- (*p)->name = nmem_strdup_null(nmem, a->name);
- (*p)->value = nmem_strdup_null(nmem, a->value);
- p = &(*p)->next;
- }
- *p = 0;
-#endif
}
struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms,
int increasing = 0;
int i;
int offset = 0;
- enum conf_sortkey_type type = Metadata_sortkey_string;
+ enum conf_metadata_type type = Metadata_type_generic;
struct reclist_sortparms *new;
if (!(cpp = strchr(parms, ',')))
if (pp[2])
{
if (pp[2] == 'p')
- type = Metadata_sortkey_position;
+ type = Metadata_type_position;
else
yaz_log(YLOG_FATAL, "Bad sortkey modifier: %s", parm);
}
*pp = '\0';
}
- if (type != Metadata_sortkey_position)
+ if (type != Metadata_type_position)
{
if (!strcmp(parm, "relevance"))
{
- type = Metadata_sortkey_relevance;
+ type = Metadata_type_relevance;
}
else if (!strcmp(parm, "position"))
{
- type = Metadata_sortkey_position;
+ type = Metadata_type_position;
}
- else
+ else if (!strcmp(parm, "retrieval"))
+ {
+ type = Metadata_type_retrieval;
+ }
+ else if (service)
{
for (i = 0; i < service->num_sortkeys; i++)
{
if (!strcmp(sk->name, parm))
{
type = sk->type;
- if (type == Metadata_sortkey_skiparticle)
- type = Metadata_sortkey_string;
break;
}
}
}
offset = i;
}
+ else
+ {
+ yaz_log(YLOG_FATAL, "Sortkey not defined in service: %s",
+ parm);
+ return 0;
+ }
}
new = *rp = nmem_malloc(nmem, sizeof(struct reclist_sortparms));
new->next = 0;
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 record_cluster *r1 = (*(struct record_cluster**) p1);
+ struct record_cluster *r2 = (*(struct record_cluster**) p2);
+ struct reclist_sortparms *sortparms = r1->sort_parms;
struct reclist_sortparms *s;
int res = 0;
const char *s1, *s2;
switch (s->type)
{
- case Metadata_sortkey_relevance:
- res = r2->relevance_score - r1->relevance_score;
+ case Metadata_type_relevance:
+ res = r1->relevance_score - r2->relevance_score;
break;
- case Metadata_sortkey_string:
+ case Metadata_type_generic:
+ case Metadata_type_skiparticle:
s1 = ut1 ? ut1->text.sort : "";
s2 = ut2 ? ut2->text.sort : "";
- res = strcmp(s2, s1);
- if (res)
- {
- if (s->increasing)
- res *= -1;
- }
+ res = strcmp(s1, s2);
break;
- case Metadata_sortkey_numeric:
+ case Metadata_type_year:
+ case Metadata_type_date:
if (ut1 && ut2)
{
if (s->increasing)
res = ut1->number.min - ut2->number.min;
else
- res = ut2->number.max - ut1->number.max;
+ res = ut1->number.max - ut2->number.max;
}
else if (ut1 && !ut2)
- res = -1;
+ {
+ res = -1; /* without date/year: last! */
+ continue;
+ }
else if (!ut1 && ut2)
- res = 1;
+ {
+ res = 1; /* without date/year: last! */
+ continue;
+ }
else
res = 0;
break;
- case Metadata_sortkey_position:
+ case Metadata_type_position:
if (r1->records && r2->records)
{
int pos1 = 0, pos2 = 0;
if (pos2 == 0 || rec->position < pos2)
pos2 = rec->position;
res = pos1 - pos2;
+ continue;
}
break;
- default:
- yaz_log(YLOG_WARN, "Bad sort type: %d", s->type);
- res = 0;
+ case Metadata_type_float:
+ if (ut1 && ut2)
+ {
+ if (ut1->fnumber == ut2->fnumber)
+ res = 0;
+ else if (ut1->fnumber > ut2->fnumber)
+ res = 1;
+ else
+ res = -1;
+ }
+ else if (ut1)
+ res = 1;
+ else if (ut2)
+ res = -1;
+ else
+ res = 0;
+ break;
+ case Metadata_type_retrieval:
+ res = r1->retrieval_position - r2->retrieval_position;
break;
}
+ if (res && !s->increasing)
+ res *= -1;
}
if (res == 0)
res = strcmp(r1->recid, r2->recid);
{
unsigned i;
int num = 0;
- struct reclist_bucket **pp = &l->sorted_list;
+ struct record_cluster **pp = &l->sorted_list;
reclist_enter(l);
{
struct reclist_bucket *p;
for (p = l->hashtable[i]; p; p = p->hash_next)
+ p->record->sorted_next = 0;
+ }
+ for (i = 0; i < l->hash_size; i++)
+ {
+ struct reclist_bucket *p;
+ for (p = l->hashtable[i]; p; p = p->hash_next)
{
if (session_check_cluster_limit(se, p->record))
{
- *pp = p;
- pp = &p->sorted_next;
- num++;
+ if (!p->record->sorted_next)
+ {
+ *pp = p->record;
+ pp = &p->record->sorted_next;
+ *pp = p->record; /* signal already in use */
+ num++;
+ }
}
}
}
void reclist_sort(struct reclist *l, struct reclist_sortparms *parms)
{
- struct reclist_bucket **flatlist = xmalloc(sizeof(*flatlist) * l->num_records);
- struct reclist_bucket *ptr;
- struct reclist_bucket **prev;
+ struct record_cluster **flatlist = xmalloc(sizeof(*flatlist) * l->num_records);
+ struct record_cluster *ptr;
+ struct record_cluster **prev;
int i = 0;
reclist_enter(l);
{
if (l && l->sorted_ptr)
{
- struct record_cluster *t = l->sorted_ptr->record;
+ struct record_cluster *t = l->sorted_ptr;
l->sorted_ptr = l->sorted_ptr->sorted_next;
return t;
}
void reclist_enter(struct reclist *l)
{
yaz_mutex_enter(l->mutex);
- if (l)
- l->sorted_ptr = l->sorted_list;
+ 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;
+ l->sorted_ptr = l->sorted_list;
+}
+
+void reclist_rewind(struct reclist *l)
+{
+ l->sorted_ptr = l->sorted_list;
}
struct record_cluster *dst,
struct record_cluster *src)
{
+ struct record_metadata_attr *mkl;
struct record **rp = &dst->records;
for (; *rp; rp = &(*rp)->next)
;
*rp = src->records;
+ for (mkl = src->merge_keys; mkl; mkl = mkl->next)
+ {
+ const char *merge_key = mkl->value;
+ unsigned int bucket =
+ jenkins_hash((unsigned char*) merge_key) % l->hash_size;
+ struct reclist_bucket *p;
+
+ for (p = l->hashtable[bucket]; p; p = p->hash_next)
+ if (p->record == src)
+ p->record = dst;
+ }
+
/* not merging metadata and sortkeys yet */
relevance_mergerec(r, dst, src);
cluster = nmem_malloc(l->nmem, sizeof(*cluster));
record->next = 0;
+ cluster->retrieval_position = l->num_records;
cluster->records = record;
cluster->merge_keys = 0;
append_merge_keys(&cluster->merge_keys, merge_keys, l->nmem);
// We found a matching record. Merge them
if (!strcmp(merge_key, mkr->value))
{
- struct record **re;
-
rb = *p;
- for (re = &rb->record->records; *re; re = &(*re)->next)
+ if (!cluster)
{
- if ((*re)->client == record->client &&
- record_compare(record, *re, service))
+ struct record **re;
+ for (re = &rb->record->records; *re; re = &(*re)->next)
{
- yaz_mutex_leave(l->mutex);
- return 0;
+ if ((*re)->client == record->client &&
+ record_compare(record, *re, service))
+ {
+ yaz_mutex_leave(l->mutex);
+ return 0;
+ }
}
- }
-
- if (!cluster)
- {
cluster = rb->record;
*re = record;
record->next = 0;
{
if (cluster != rb->record)
{
- if (!rb->record->records)
- {
- ; /* already merged */
- }
- else
- {
- merge_cluster(l, r, cluster, rb->record);
-
- rb->record->records = 0; /* signal merged */
- }
- /* update the hash table */
- rb->record = cluster;
+ assert(rb->record->relevance_explain1);
+ merge_cluster(l, r, cluster, rb->record);
+ (*total)--;
}
}
}
projects / pazpar2-moved-to-github.git / blobdiff