X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Freclists.c;h=c4dd4e145c5a369ca9fd070fc54405ff2776c2dc;hb=0393c84c2d2383ec40fe6058325b8b0f5334d16b;hp=201dab6d34d11c970462f4960d2d0d025b84eed3;hpb=8ad3c6132625dc893327fb17ab36f353bbd795b4;p=pazpar2-moved-to-github.git

diff --git a/src/reclists.c b/src/reclists.c
index 201dab6..c4dd4e1 100644
--- a/src/reclists.c
+++ b/src/reclists.c
@@ -72,7 +72,7 @@ struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms,
 
         if (!(cpp = strchr(parms, ',')))
             cpp = parms + strlen(parms);
-        strncpy(parm, parms, cpp - parms); 
+        strncpy(parm, parms, cpp - parms);
         parm[cpp-parms] = '\0';
 
         if ((pp = strchr(parm, ':')))
@@ -86,7 +86,7 @@ struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms,
                 yaz_log(YLOG_FATAL, "Bad sortkey modifier: %s", parm);
                 return 0;
             }
-           
+
             if (pp[2])
             {
                 if (pp[2] == 'p')
@@ -101,7 +101,7 @@ struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms,
             if (!strcmp(parm, "relevance"))
             {
                 type = Metadata_sortkey_relevance;
-            } 
+            }
             else if (!strcmp(parm, "position"))
             {
                 type = Metadata_sortkey_position;
@@ -143,7 +143,7 @@ struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms,
 
 static int reclist_cmp(const void *p1, const void *p2)
 {
-    struct reclist_sortparms *sortparms = 
+    struct reclist_sortparms *sortparms =
         (*(struct reclist_bucket **) p1)->sort_parms;
     struct record_cluster *r1 = (*(struct reclist_bucket**) p1)->record;
     struct record_cluster *r2 = (*(struct reclist_bucket**) p2)->record;
@@ -276,7 +276,7 @@ struct reclist *reclist_create(NMEM nmem)
 {
     struct reclist *res = nmem_malloc(nmem, sizeof(struct reclist));
     res->hash_size = 399;
-    res->hashtable 
+    res->hashtable
         = nmem_malloc(nmem, res->hash_size * sizeof(struct reclist_bucket*));
     memset(res->hashtable, 0, res->hash_size * sizeof(struct reclist_bucket*));
     res->nmem = nmem;
@@ -294,7 +294,16 @@ struct reclist *reclist_create(NMEM nmem)
 void reclist_destroy(struct reclist *l)
 {
     if (l)
+    {
+        struct reclist_bucket *rb;
+        
+        for (rb = l->sorted_list; rb; rb = rb->snext)
+        {
+            wrbuf_destroy(rb->record->relevance_explain1);
+            wrbuf_destroy(rb->record->relevance_explain2);
+        }
         yaz_mutex_destroy(&l->mutex);
+    }
 }
 
 int reclist_get_num_records(struct reclist *l)
@@ -306,14 +315,14 @@ int reclist_get_num_records(struct reclist *l)
 
 // Insert a record. Return record cluster (newly formed or pre-existing)
 struct record_cluster *reclist_insert(struct reclist *l,
-                                      struct conf_service *service, 
+                                      struct conf_service *service,
                                       struct record *record,
                                       const char *merge_key, int *total)
 {
     unsigned int bucket;
     struct reclist_bucket **p;
     struct record_cluster *cluster = 0;
-    
+
     assert(service);
     assert(l);
     assert(record);
@@ -335,7 +344,7 @@ struct record_cluster *reclist_insert(struct reclist *l,
             {
                 if (re->client == record->client &&
                     record_compare(record, re, service))
-                { 
+                {
                     yaz_mutex_leave(l->mutex);
                     return 0;
                 }
@@ -352,7 +361,7 @@ struct record_cluster *reclist_insert(struct reclist *l,
             nmem_malloc(l->nmem, sizeof(*new));
 
         cluster = nmem_malloc(l->nmem, sizeof(*cluster));
-        
+
         record->next = 0;
         new->record = cluster;
         new->hnext = 0;
@@ -365,15 +374,17 @@ struct record_cluster *reclist_insert(struct reclist *l,
         cluster->metadata =
             nmem_malloc(l->nmem,
                         sizeof(struct record_metadata*) * service->num_metadata);
-        memset(cluster->metadata, 0, 
+        memset(cluster->metadata, 0,
                sizeof(struct record_metadata*) * service->num_metadata);
-        cluster->sortkeys = 
+        cluster->sortkeys =
             nmem_malloc(l->nmem, sizeof(struct record_metadata*) * service->num_sortkeys);
         memset(cluster->sortkeys, 0,
                sizeof(union data_types*) * service->num_sortkeys);
- 
+
+        cluster->relevance_explain1 = wrbuf_alloc();
+        cluster->relevance_explain2 = wrbuf_alloc();
         /* attach to hash list */
-        *p = new; 
+        *p = new;
 
         /* append to sorted_list */
         *l->last = new;
@@ -387,6 +398,16 @@ struct record_cluster *reclist_insert(struct reclist *l,
     return cluster;
 }
 
+int reclist_sortparms_cmp(struct reclist_sortparms *sort1, struct reclist_sortparms *sort2)
+{
+    int rc;
+    if (sort1 == sort2)
+        return 0;
+    if (sort1 == 0 || sort2 == 0)
+        return 1;
+    rc = strcmp(sort1->name, sort2->name) || sort1->increasing != sort2->increasing || sort1->type != sort2->type;
+    return rc;
+}
 /*
  * Local variables:
  * c-basic-offset: 4