X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Freclists.c;fp=src%2Freclists.c;h=e96ee929cfcf687a445095ecfa850bf2eec3acdf;hb=4b259026074c2fb5931eac168a64e8df0be46e30;hp=5afd0572c486ad1dfc27201e256db35524413012;hpb=7f0b4d88eca113e5eb0beac2046180e9ff9d08ea;p=pazpar2-moved-to-github.git diff --git a/src/reclists.c b/src/reclists.c index 5afd057..e96ee92 100644 --- a/src/reclists.c +++ b/src/reclists.c @@ -123,7 +123,11 @@ struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms, { 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++) { @@ -142,6 +146,12 @@ struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms, } 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; @@ -234,6 +244,9 @@ static int reclist_cmp(const void *p1, const void *p2) else res = 0; break; + case Metadata_type_retrieval: + res = r1->retrieval_position - r2->retrieval_position; + break; } if (res && !s->increasing) res *= -1; @@ -441,6 +454,7 @@ static struct record_cluster *new_cluster( 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);