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

diff --git a/src/reclists.c b/src/reclists.c
index b7a3db2..99c9c87 100644
--- a/src/reclists.c
+++ b/src/reclists.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2010 Index Data
+   Copyright (C) 2006-2011 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -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,
@@ -85,6 +85,10 @@ 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;
         }
         else
         {
@@ -112,6 +116,7 @@ struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms,
         new->offset = offset;
         new->type = type;
         new->increasing = increasing;
+        new->name = nmem_strdup(nmem, parm);
         rp = &new->next;
         if (*(parms = cpp))
             parms++;
@@ -121,12 +126,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];
@@ -161,6 +168,23 @@ static int reclist_cmp(const void *p1, const void *p2)
             else
                 res = 0;
             break;
+        case Metadata_sortkey_position:
+            if (r1->records && r2->records)
+            {
+                int pos1 = 0, pos2 = 0;
+                struct record *rec;
+                for (rec = r1->records; rec; rec = rec->next)
+                    if (pos1 == 0 || rec->position < pos1)
+                        pos1 = rec->position;
+                for (rec = r2->records; rec; rec = rec->next)
+                    if (pos2 == 0 || rec->position < pos2)
+                        pos2 = rec->position;
+                if (s->increasing)
+                    res = pos1 - pos2;
+                else
+                    res = pos2 - pos1;
+            }
+            break;
         default:
             yaz_log(YLOG_WARN, "Bad sort type: %d", s->type);
             res = 0;
@@ -173,7 +197,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 +208,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 +272,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 +290,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 +331,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,