X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Freclists.c;h=f9785a830b87cebe4021c90c1e8cfb30d861d85a;hb=245fa946733907320f50a88095d71771ce4cda6a;hp=d27b69f05782eaf94a0092feaa5db026e9efadc6;hpb=5cc5bfa026237076ecb44ae016b78069edfcc492;p=pazpar2-moved-to-github.git

diff --git a/src/reclists.c b/src/reclists.c
index d27b69f..f9785a8 100644
--- a/src/reclists.c
+++ b/src/reclists.c
@@ -1,4 +1,4 @@
-/* $Id: reclists.c,v 1.9 2007-04-16 13:22:17 marc Exp $
+/* $Id: reclists.c,v 1.22 2007-08-28 21:11:21 quinn Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -41,6 +41,60 @@ struct reclist_bucket
     struct reclist_bucket *next;
 };
 
+#if 0
+struct reclist_sortparms * 
+reclist_sortparms_insert_field_id(NMEM nmem,
+                         struct reclist_sortparms **sortparms,
+                         int field_id,
+                         enum conf_sortkey_type type,
+                         int increasing)
+{
+    struct reclist_sortparms * tmp_rlsp = 0;
+    // assert(nmem);
+
+    if(!sortparms || field_id < 0)
+        return 0;
+
+    // construct new reclist_sortparms
+    tmp_rlsp  = nmem_malloc(nmem, sizeof(struct reclist_sortparms));
+    tmp_rlsp->offset = field_id;
+    tmp_rlsp->type = type;
+    tmp_rlsp->increasing = increasing;
+
+
+    // insert in *sortparms place, moving *sortparms one down the list
+    tmp_rlsp->next = *sortparms;
+    *sortparms = tmp_rlsp;
+
+    return *sortparms;
+};
+#endif
+
+#if 0
+struct reclist_sortparms * 
+reclist_sortparms_insert(NMEM nmem, 
+                         struct reclist_sortparms **sortparms,
+                         struct conf_service * service,
+                         const char * name,
+                         int increasing)
+{
+    int field_id = 0;
+
+    if (!sortparms || !service || !name)  
+        return 0;
+    
+    field_id = conf_service_sortkey_field_id(service, name);
+
+    if (-1 == field_id)
+        return 0;
+
+    return reclist_sortparms_insert_field_id(nmem, sortparms, field_id,
+                                             service->sortkeys[field_id].type,
+                                             increasing);
+};
+#endif
+
+
 struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms)
 {
     struct reclist_sortparms *res = 0;
@@ -56,7 +110,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;
 
@@ -75,7 +129,6 @@ struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms)
         if (!strcmp(parm, "relevance"))
         {
             type = Metadata_sortkey_relevance;
-            offset = -1;
         }
         else
         {
@@ -115,45 +168,63 @@ 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 = 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)
         {
+            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 : "";
+                s2 = ut2 ? ut2->text : "";
+                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(l->flatlist, l->num_records, sizeof(struct record_cluster*), reclist_cmp);
+    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)
+    if (l && l->pointer < l->num_records)
         return l->flatlist[l->pointer++];
     else
         return 0;
@@ -161,7 +232,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)
@@ -190,7 +262,8 @@ struct reclist *reclist_create(NMEM nmem, int numrecs)
     while (hashsize < numrecs)
         hashsize <<= 1;
     res = nmem_malloc(nmem, sizeof(struct reclist));
-    res->hashtable = nmem_malloc(nmem, hashsize * sizeof(struct reclist_bucket*));
+    res->hashtable 
+        = nmem_malloc(nmem, hashsize * sizeof(struct reclist_bucket*));
     memset(res->hashtable, 0, hashsize * sizeof(struct reclist_bucket*));
     res->hashtable_size = hashsize;
     res->nmem = nmem;
@@ -204,17 +277,23 @@ struct reclist *reclist_create(NMEM nmem, int numrecs)
 }
 
 // Insert a record. Return record cluster (newly formed or pre-existing)
-struct record_cluster *reclist_insert( struct conf_service *service,
-                                       struct reclist *l, 
+struct record_cluster *reclist_insert( struct reclist *l,
+                                       struct conf_service *service, 
                                        struct record  *record,
                                        char *merge_key, int *total)
 {
     unsigned int bucket;
     struct reclist_bucket **p;
     struct record_cluster *cluster = 0;
-    /*struct conf_service *service = global_parameters.server->service;*/
+    
+    assert(service);
+    assert(l);
+    assert(record);
+    assert(merge_key);
+    assert(total);
 
     bucket = hash((unsigned char*) merge_key) & l->hashmask;
+
     for (p = &l->hashtable[bucket]; *p; p = &(*p)->next)
     {
         // We found a matching record. Merge them
@@ -241,13 +320,16 @@ struct record_cluster *reclist_insert( struct conf_service *service,
         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, 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);
+        memset(newc->sortkeys, 0,
+               sizeof(union data_types*) * service->num_sortkeys);
 
         *p = new;
         l->flatlist[l->num_records++] = newc;