X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Freclists.c;h=6ac71cddbcff3fc6527584d49214d2ed162f2a94;hb=23baa3263f8e150101a6a3a483ab5d186311619a;hp=a4b1ac00e179f826f47b7feec63ba6f4cb77eafd;hpb=ba5951a80fdd0da1d28c318852b69a1178cd6bfa;p=pazpar2-moved-to-github.git

diff --git a/src/reclists.c b/src/reclists.c
index a4b1ac0..6ac71cd 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"
 
@@ -39,15 +40,15 @@ struct reclist
     struct reclist_bucket *sorted_ptr;
     struct reclist_bucket **last;
     NMEM nmem;
+    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,
@@ -84,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
         {
@@ -111,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++;
@@ -120,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];
@@ -133,7 +141,7 @@ static int reclist_cmp(const void *p1, const void *p2)
         switch (s->type)
         {
         case Metadata_sortkey_relevance:
-            res = r2->relevance - r1->relevance;
+            res = r2->relevance_score - r1->relevance_score;
             break;
         case Metadata_sortkey_string:
             s1 = ut1 ? ut1->text.sort : "";
@@ -160,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,18 +198,23 @@ 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 = l->sorted_list;
-    struct reclist_bucket **prev = &l->sorted_list;
+    struct reclist_bucket *ptr;
+    struct reclist_bucket **prev;
     int i = 0;
+
+    reclist_enter(l);
+
+    ptr = l->sorted_list;
+    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++)
     {
@@ -196,7 +226,7 @@ void reclist_sort(struct reclist *l, struct reclist_sortparms *parms)
 
     xfree(flatlist);
 
-    reclist_rewind(l);
+    reclist_leave(l);
 }
 
 struct record_cluster *reclist_read_record(struct reclist *l)
@@ -211,12 +241,22 @@ struct record_cluster *reclist_read_record(struct reclist *l)
         return 0;
 }
 
-void reclist_rewind(struct reclist *l)
+void reclist_enter(struct reclist *l)
 {
+    yaz_mutex_enter(l->mutex);
     if (l)
         l->sorted_ptr = l->sorted_list;
 }
 
+
+void reclist_leave(struct reclist *l)
+{
+    yaz_mutex_leave(l->mutex);
+    if (l)
+        l->sorted_ptr = l->sorted_list;
+}
+
+
 struct reclist *reclist_create(NMEM nmem)
 {
     struct reclist *res = nmem_malloc(nmem, sizeof(struct reclist));
@@ -231,9 +271,17 @@ struct reclist *reclist_create(NMEM nmem)
     res->last = &res->sorted_list;
 
     res->num_records = 0;
+    res->mutex = 0;
+    pazpar2_mutex_create(&res->mutex, "reclist");
     return res;
 }
 
+void reclist_destroy(struct reclist *l)
+{
+    if (l)
+        yaz_mutex_destroy(&l->mutex);
+}
+
 int reclist_get_num_records(struct reclist *l)
 {
     if (l)
@@ -242,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;
@@ -259,12 +307,24 @@ struct record_cluster *reclist_insert( struct reclist *l,
 
     bucket = jenkins_hash((unsigned char*) merge_key) % l->hash_size;
 
+    yaz_mutex_enter(l->mutex);
     for (p = &l->hashtable[bucket]; *p; p = &(*p)->hnext)
     {
         // We found a matching record. Merge them
         if (!strcmp(merge_key, (*p)->record->merge_key))
         {
             struct record_cluster *existing = (*p)->record;
+            struct record *re = existing->records;
+
+            for (; re; re = re->next)
+            {
+                if (re->client == record->client &&
+                    record_compare(record, re, service))
+                { 
+                    yaz_mutex_leave(l->mutex);
+                    return 0;
+                }
+            }
             record->next = existing->records;
             existing->records = record;
             cluster = existing;
@@ -282,10 +342,10 @@ struct record_cluster *reclist_insert( struct reclist *l,
         new->record = cluster;
         new->hnext = 0;
         cluster->records = record;
-        cluster->merge_key = merge_key;
-        cluster->relevance = 0;
+        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,
@@ -308,10 +368,10 @@ struct record_cluster *reclist_insert( struct reclist *l,
 
         l->num_records++;
     }
+    yaz_mutex_leave(l->mutex);
     return cluster;
 }
 
-
 /*
  * Local variables:
  * c-basic-offset: 4