X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Freclists.c;h=60df9218549d23b99be897e5fa01cd14e386bf52;hb=8961ed761e348e972f00d015284ce75c16b1648c;hp=b4e2a6dc2ee77510e588008c219547b9c15b628d;hpb=22ae3398d1153b29cdba238f1a5f21e7b3cf35e3;p=pazpar2-moved-to-github.git diff --git a/src/reclists.c b/src/reclists.c index b4e2a6d..60df921 100644 --- a/src/reclists.c +++ b/src/reclists.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2011 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 @@ -64,58 +64,76 @@ 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")) + if (type != Metadata_sortkey_position) { - type = Metadata_sortkey_relevance; - } - else if (!strcmp(parm, "position")) - { - type = Metadata_sortkey_position; - } - else - { - 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++; @@ -125,7 +143,7 @@ struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms, static int reclist_cmp(const void *p1, const void *p2) { - struct reclist_sortparms *sortparms = + 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; @@ -178,15 +196,13 @@ static int reclist_cmp(const void *p1, const void *p2) for (rec = r2->records; rec; rec = rec->next) if (pos2 == 0 || rec->position < pos2) pos2 = rec->position; - if (s->increasing) - res = pos1 - pos2; - else - res = pos2 - pos1; + res = pos1 - pos2; } break; default: yaz_log(YLOG_WARN, "Bad sort type: %d", s->type); res = 0; + break; } } if (res == 0) @@ -260,7 +276,7 @@ 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; @@ -290,14 +306,14 @@ int reclist_get_num_records(struct reclist *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 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); @@ -313,6 +329,17 @@ struct record_cluster *reclist_insert(struct reclist *l, 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; @@ -325,7 +352,7 @@ struct record_cluster *reclist_insert(struct reclist *l, nmem_malloc(l->nmem, sizeof(*new)); cluster = nmem_malloc(l->nmem, sizeof(*cluster)); - + record->next = 0; new->record = cluster; new->hnext = 0; @@ -338,15 +365,15 @@ struct record_cluster *reclist_insert(struct reclist *l, 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); - + /* attach to hash list */ - *p = new; + *p = new; /* append to sorted_list */ *l->last = new;