X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Freclists.c;h=7912ca21b76fde18a3f181c8acbd7076337ef003;hb=f6ed527150d1fbda58264392de587c85f70df17f;hp=b7a3db263803e676aa76e71f13bf93db9f83bf45;hpb=5ac0f94cc7fc45e3ae81e8575facb88aa1740a98;p=pazpar2-moved-to-github.git

diff --git a/src/reclists.c b/src/reclists.c
index b7a3db2..7912ca2 100644
--- a/src/reclists.c
+++ b/src/reclists.c
@@ -25,7 +25,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include <yaz/yaz-util.h>
 
-#include "pazpar2.h"
+#include "ppmutex.h"
+#include "session.h"
 #include "reclists.h"
 #include "jenkins_hash.h"
 
@@ -42,13 +43,12 @@ struct reclist
     YAZ_MUTEX mutex;
 };
 
-static struct reclist_sortparms *qsort_sortparms = 0; /* thread pr */
-
 struct reclist_bucket
 {
     struct record_cluster *record;
     struct reclist_bucket *hnext;
     struct reclist_bucket *snext;
+    struct reclist_sortparms *sort_parms;
 };
 
 struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms,
@@ -121,12 +121,14 @@ 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_bucket **) p1)->sort_parms;
     struct record_cluster *r1 = (*(struct reclist_bucket**) p1)->record;
     struct record_cluster *r2 = (*(struct reclist_bucket**) p2)->record;
     struct reclist_sortparms *s;
     int res = 0;
 
-    for (s = qsort_sortparms; s && res == 0; s = s->next)
+    for (s = sortparms; s && res == 0; s = s->next)
     {
         union data_types *ut1 = r1->sortkeys[s->offset];
         union data_types *ut2 = r2->sortkeys[s->offset];
@@ -173,7 +175,6 @@ static int reclist_cmp(const void *p1, const void *p2)
 
 void reclist_sort(struct reclist *l, struct reclist_sortparms *parms)
 {
-
     struct reclist_bucket **flatlist = xmalloc(sizeof(*flatlist) * l->num_records);
     struct reclist_bucket *ptr;
     struct reclist_bucket **prev;
@@ -185,13 +186,13 @@ void reclist_sort(struct reclist *l, struct reclist_sortparms *parms)
     prev = &l->sorted_list;
     while (ptr)
     {
+        ptr->sort_parms = parms;
         flatlist[i] = ptr;
         ptr = ptr->snext;
         i++;
     }
     assert(i == l->num_records);
 
-    qsort_sortparms = parms;
     qsort(flatlist, l->num_records, sizeof(*flatlist), reclist_cmp);
     for (i = 0; i < l->num_records; i++)
     {
@@ -249,13 +250,14 @@ struct reclist *reclist_create(NMEM nmem)
 
     res->num_records = 0;
     res->mutex = 0;
-    yaz_mutex_create(&res->mutex);
+    pazpar2_mutex_create(&res->mutex, "reclist");
     return res;
 }
 
 void reclist_destroy(struct reclist *l)
 {
-    yaz_mutex_destroy(&l->mutex);
+    if (l)
+        yaz_mutex_destroy(&l->mutex);
 }
 
 int reclist_get_num_records(struct reclist *l)
@@ -266,10 +268,10 @@ 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 record  *record,
-                                       char *merge_key, int *total)
+struct record_cluster *reclist_insert(struct reclist *l,
+                                      struct conf_service *service, 
+                                      struct record *record,
+                                      const char *merge_key, int *total)
 {
     unsigned int bucket;
     struct reclist_bucket **p;
@@ -307,10 +309,10 @@ struct record_cluster *reclist_insert( struct reclist *l,
         new->record = cluster;
         new->hnext = 0;
         cluster->records = record;
-        cluster->merge_key = merge_key;
+        cluster->merge_key = nmem_strdup(l->nmem, merge_key);
         cluster->relevance_score = 0;
         cluster->term_frequency_vec = 0;
-        cluster->recid = merge_key;
+        cluster->recid = nmem_strdup(l->nmem, merge_key);
         (*total)++;
         cluster->metadata =
             nmem_malloc(l->nmem,