X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Freclists.c;h=9b9b258cb38935b6ae733d3cd434325b5966c0e2;hb=babdf4ba693f4a79037d8cf8cecc109e9355ec0d;hp=64fafbb71f34e933e4e6ef879aa8c7a1160964bc;hpb=03931e4f790152dfec6ae6ca615d49e84940b987;p=pazpar2-moved-to-github.git diff --git a/src/reclists.c b/src/reclists.c index 64fafbb..9b9b258 100644 --- a/src/reclists.c +++ b/src/reclists.c @@ -129,43 +129,44 @@ static int reclist_cmp(const void *p1, const void *p2) { union data_types *ut1 = r1->sortkeys[s->offset]; union data_types *ut2 = r2->sortkeys[s->offset]; + const char *s1, *s2; switch (s->type) { - const char *s1, *s2; - - case Metadata_sortkey_relevance: - res = r2->relevance - r1->relevance; - break; - case Metadata_sortkey_string: - 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: - 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; + case Metadata_sortkey_relevance: + res = r2->relevance - r1->relevance; + break; + case Metadata_sortkey_string: + 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: + if (ut1 && ut2) + { + if (s->increasing) + res = ut1->number.min - ut2->number.min; else - res = 0; - break; - default: - yaz_log(YLOG_WARN, "Bad sort type: %d", s->type); + 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_WARN, "Bad sort type: %d", s->type); + res = 0; } } + if (res == 0) + res = strcmp(r1->recid, r2->recid); return res; }