X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Freclists.c;h=738fdc481621d340533d4abc3949ec8d394840aa;hb=b4e80d145253134b44614896ba7f0b1975d22afa;hp=048914d2362f30ab9b91d4979b00298881859f42;hpb=ce9af28e0299ae0ee246fa6d003ba29d374397df;p=pazpar2-moved-to-github.git diff --git a/src/reclists.c b/src/reclists.c index 048914d..738fdc4 100644 --- a/src/reclists.c +++ b/src/reclists.c @@ -1,4 +1,4 @@ -/* $Id: reclists.c,v 1.21 2007-08-13 12:42:45 adam Exp $ +/* $Id: reclists.c,v 1.23 2007-09-10 16:25:50 adam Exp $ Copyright (c) 2006-2007, Index Data. This file is part of Pazpar2. @@ -176,14 +176,14 @@ static int reclist_cmp(const void *p1, const void *p2) union data_types *ut2 = r2->sortkeys[s->offset]; switch (s->type) { - char *s1, *s2; + const char *s1, *s2; case Metadata_sortkey_relevance: res = r2->relevance - r1->relevance; break; case Metadata_sortkey_string: - s1 = ut1 ? ut1->text : ""; - s2 = ut2 ? ut2->text : ""; + s1 = ut1 ? ut1->text.sort : ""; + s2 = ut2 ? ut2->text.sort : ""; res = strcmp(s2, s1); if (res) { @@ -207,8 +207,8 @@ static int reclist_cmp(const void *p1, const void *p2) res = 0; break; default: - yaz_log(YLOG_FATAL, "Bad sort type: %d", s->type); - exit(1); + yaz_log(YLOG_WARN, "Bad sort type: %d", s->type); + res = 0; } } return res;