X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Freclists.c;h=a1e104c46ff84cde344c9ae575ee46f2f92025f4;hb=4b0c3f7b760ec6aaa688c09791b07cfa53d9ec47;hp=27a48f447e66d26ca5cbabf8d1e7e52c5351fdd3;hpb=7c0b91839755ff1090d9ae90f846de9c66f04f6a;p=pazpar2-moved-to-github.git

diff --git a/src/reclists.c b/src/reclists.c
index 27a48f4..a1e104c 100644
--- a/src/reclists.c
+++ b/src/reclists.c
@@ -1,5 +1,5 @@
 /*
- * $Id: reclists.c,v 1.5 2007-01-09 22:06:49 quinn Exp $
+ * $Id: reclists.c,v 1.7 2007-01-15 04:34:28 quinn Exp $
  */
 
 #include <assert.h>
@@ -15,12 +15,125 @@
 
 extern struct parameters global_parameters;
 
+// Not threadsafe
+static struct reclist_sortparms *sortparms = 0;
+
 struct reclist_bucket
 {
     struct record_cluster *record;
     struct reclist_bucket *next;
 };
 
+struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms)
+{
+    struct reclist_sortparms *res = 0;
+    struct reclist_sortparms **rp = &res;
+    struct conf_service *service = config->servers->service;
+
+    if (strlen(parms) > 256)
+        return 0;
+    while (*parms)
+    {
+        char parm[256];
+        char *pp;
+        const char *cpp;
+        int increasing;
+        int i;
+        int offset;
+        enum conf_sortkey_type type;
+        struct reclist_sortparms *new;
+
+        if (!(cpp = strchr(parms, ',')))
+            cpp = parms + strlen(parms);
+        strncpy(parm, parms, cpp - parms); 
+        parm[cpp-parms] = '\0';
+
+        if ((pp = strchr(parm, ':')))
+        {
+            increasing = pp[1] == '1' ? 1 : 0;
+            *pp = '\0';
+        }
+        else
+            increasing = 0;
+        if (!strcmp(parm, "relevance"))
+        {
+            type = Metadata_sortkey_relevance;
+            offset = -1;
+        }
+        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, "Bad sortkey: %s", parm);
+                return 0;
+            }
+            else
+                offset = i;
+        }
+        new = *rp = nmem_malloc(nmem, sizeof(struct reclist_sortparms));
+        new->next = 0;
+        new->offset = offset;
+        new->type = type;
+        new->increasing = increasing;
+        rp = &new->next;
+        if (*(parms = cpp))
+            parms++;
+    }
+    return res;
+}
+
+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;
+
+    for (s = sortparms; s; s = s->next)
+    {
+        int res;
+        switch (s->type)
+        {
+            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);
+                break;
+            case Metadata_sortkey_numeric:
+                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;
+        }
+    }
+    return 0;
+}
+
+void reclist_sort(struct reclist *l, struct reclist_sortparms *parms)
+{
+    sortparms = parms;
+    qsort(l->flatlist, l->num_records, sizeof(struct record_cluster*), reclist_cmp);
+    reclist_rewind(l);
+}
+
 struct record_cluster *reclist_read_record(struct reclist *l)
 {
     if (l->pointer < l->num_records)
@@ -61,7 +174,7 @@ struct reclist *reclist_create(NMEM nmem, int numrecs)
         hashsize <<= 1;
     res = nmem_malloc(nmem, sizeof(struct reclist));
     res->hashtable = nmem_malloc(nmem, hashsize * sizeof(struct reclist_bucket*));
-    bzero(res->hashtable, hashsize * sizeof(struct reclist_bucket*));
+    memset(res->hashtable, 0, hashsize * sizeof(struct reclist_bucket*));
     res->hashtable_size = hashsize;
     res->nmem = nmem;
     res->hashmask = hashsize - 1; // Creates a bitmask
@@ -110,10 +223,12 @@ struct record_cluster *reclist_insert(struct reclist *l, struct record  *record,
         newc->relevance = 0;
         newc->term_frequency_vec = 0;
         newc->recid = (*total)++;
-        newc->metadata = 0;
         newc->metadata = nmem_malloc(l->nmem,
                 sizeof(struct record_metadata*) * service->num_metadata);
-        bzero(newc->metadata, sizeof(struct record_metadata*) * service->num_metadata);
+        memset(newc->metadata, 0, sizeof(struct record_metadata*) * service->num_metadata);
+        newc->sortkeys = nmem_malloc(l->nmem,
+                sizeof(struct record_metadata*) * service->num_sortkeys);
+        memset(newc->sortkeys, 0, sizeof(union data_types*) * service->num_sortkeys);
 
         *p = new;
         l->flatlist[l->num_records++] = newc;