X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Freclists.c;h=7d92643d1a6ddd960444dc85dad24ac28ca99977;hb=32946760b9c974f112017d79ab756cf1dd85ca6b;hp=bbf35109fac9714854c87bb937b165208e7e52ba;hpb=c1422565e829e8534267b052ea6c2ba4ce4059ec;p=pazpar2-moved-to-github.git diff --git a/src/reclists.c b/src/reclists.c index bbf3510..7d92643 100644 --- a/src/reclists.c +++ b/src/reclists.c @@ -1,7 +1,5 @@ -/* $Id: reclists.c,v 1.15 2007-04-25 13:09:17 marc Exp $ - Copyright (c) 2006-2007, Index Data. - -This file is part of Pazpar2. +/* This file is part of Pazpar2. + Copyright (C) 2006-2009 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 @@ -14,26 +12,24 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Pazpar2; see the file LICENSE. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. - */ +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ #include #if HAVE_CONFIG_H -#include +#include #endif #include #include "pazpar2.h" #include "reclists.h" +#include "parameters.h" -extern struct parameters global_parameters; - -// Not threadsafe -static struct reclist_sortparms *sortparms = 0; +static struct reclist_sortparms *qsort_sortparms = 0; /* thread pr */ struct reclist_bucket { @@ -41,6 +37,7 @@ struct reclist_bucket struct reclist_bucket *next; }; +#if 0 struct reclist_sortparms * reclist_sortparms_insert_field_id(NMEM nmem, struct reclist_sortparms **sortparms, @@ -67,8 +64,9 @@ reclist_sortparms_insert_field_id(NMEM nmem, return *sortparms; }; +#endif - +#if 0 struct reclist_sortparms * reclist_sortparms_insert(NMEM nmem, struct reclist_sortparms **sortparms, @@ -90,14 +88,14 @@ reclist_sortparms_insert(NMEM nmem, service->sortkeys[field_id].type, increasing); }; +#endif - -struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms) +struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms, + struct conf_service *service) { struct reclist_sortparms *res = 0; struct reclist_sortparms **rp = &res; - struct conf_service *service = config->servers->service; if (strlen(parms) > 256) return 0; @@ -108,7 +106,7 @@ struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms) const char *cpp; int increasing; int i; - int offset; + int offset = 0; enum conf_sortkey_type type; struct reclist_sortparms *new; @@ -127,7 +125,6 @@ struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms) if (!strcmp(parm, "relevance")) { type = Metadata_sortkey_relevance; - offset = -1; } else { @@ -167,39 +164,55 @@ static int reclist_cmp(const void *p1, const void *p2) struct record_cluster *r1 = (*(struct record_cluster**) p1); struct record_cluster *r2 = (*(struct record_cluster**) p2); struct reclist_sortparms *s; + int res = 0; - for (s = sortparms; s; s = s->next) + for (s = qsort_sortparms; s && res == 0; s = s->next) { - int res; + union data_types *ut1 = r1->sortkeys[s->offset]; + union data_types *ut2 = r2->sortkeys[s->offset]; switch (s->type) { + const 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 = ut1 ? ut1->text.sort : ""; + s2 = ut2 ? ut2->text.sort : ""; + res = strcmp(s2, s1); + if (res) + { + if (s->increasing) + res *= -1; + } break; case Metadata_sortkey_numeric: - res = 0; + if (ut1 && ut2) + { + if (s->increasing) + res = ut1->number.min - ut2->number.min; + else + res = ut2->number.max - ut1->number.max; + } + else if (ut1 && !ut2) + res = -1; + else if (!ut1 && ut2) + res = 1; + else + res = 0; break; default: - yaz_log(YLOG_FATAL, "Bad sort type: %d", s->type); - exit(1); - } - if (res) - { - if (s->increasing) - res *= -1; - return res; + yaz_log(YLOG_WARN, "Bad sort type: %d", s->type); + res = 0; } } - return 0; + return res; } void reclist_sort(struct reclist *l, struct reclist_sortparms *parms) { - sortparms = parms; + qsort_sortparms = parms; qsort(l->flatlist, l->num_records, sizeof(struct record_cluster*), reclist_cmp); reclist_rewind(l); @@ -207,7 +220,7 @@ void reclist_sort(struct reclist *l, struct reclist_sortparms *parms) struct record_cluster *reclist_read_record(struct reclist *l) { - if (l->pointer < l->num_records) + if (l && l->pointer < l->num_records) return l->flatlist[l->pointer++]; else return 0; @@ -215,7 +228,8 @@ struct record_cluster *reclist_read_record(struct reclist *l) void reclist_rewind(struct reclist *l) { - l->pointer = 0; + if (l) + l->pointer = 0; } // Jenkins one-at-a-time hash (from wikipedia) @@ -262,7 +276,7 @@ struct reclist *reclist_create(NMEM nmem, int numrecs) struct record_cluster *reclist_insert( struct reclist *l, struct conf_service *service, struct record *record, - const char *merge_key, int *total) + char *merge_key, int *total) { unsigned int bucket; struct reclist_bucket **p; @@ -299,10 +313,11 @@ struct record_cluster *reclist_insert( struct reclist *l, new->record = newc; new->next = 0; newc->records = record; - newc->merge_key = (char *) merge_key; + newc->merge_key = merge_key; newc->relevance = 0; newc->term_frequency_vec = 0; - newc->recid = (*total)++; + newc->recid = merge_key; + (*total)++; newc->metadata = nmem_malloc(l->nmem, sizeof(struct record_metadata*) * service->num_metadata); memset(newc->metadata, 0, @@ -323,7 +338,9 @@ struct record_cluster *reclist_insert( struct reclist *l, /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +