X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Freclists.c;h=817c1339f988ff26b54be4b4ddc756b976cce81d;hb=d8c3965cc2bb222a012481819c47db36a8a5905b;hp=8e7522ae0702a34eca4bafcd05acd00b0578073b;hpb=7db45d2bc967511916800d163b2c3e290c62da40;p=pazpar2-moved-to-github.git

diff --git a/src/reclists.c b/src/reclists.c
index 8e7522a..817c133 100644
--- a/src/reclists.c
+++ b/src/reclists.c
@@ -36,8 +36,8 @@ struct reclist
     unsigned hash_size;
 
     int num_records;
-    struct reclist_bucket *sorted_list;
-    struct reclist_bucket *sorted_ptr;
+    struct record_cluster *sorted_list;
+    struct record_cluster *sorted_ptr;
     NMEM nmem;
     YAZ_MUTEX mutex;
 };
@@ -46,24 +46,26 @@ struct reclist_bucket
 {
     struct record_cluster *record;
     struct reclist_bucket *hash_next;
-    struct reclist_bucket *sorted_next;
-    struct reclist_sortparms *sort_parms;
 };
 
 static void append_merge_keys(struct record_metadata_attr **p,
-                              struct record_metadata_attr *a,
+                              const struct record_metadata_attr *a,
                               NMEM nmem)
 {
-    while (*p)
-        p = &(*p)->next;
     for (; a; a = a->next)
     {
-        *p = (struct record_metadata_attr *) nmem_malloc(nmem, sizeof(**p));
-        (*p)->name = nmem_strdup_null(nmem, a->name);
-        (*p)->value = nmem_strdup_null(nmem, a->value);
-        p = &(*p)->next;
+        struct record_metadata_attr **pi = p;
+        for (; *pi; pi = &(*pi)->next)
+            if (!strcmp((*pi)->value, a->value))
+                break;
+        if (!*pi)
+        {
+            *pi = (struct record_metadata_attr *) nmem_malloc(nmem, sizeof(**p));
+            (*pi)->name = nmem_strdup_null(nmem, a->name);
+            (*pi)->value = nmem_strdup_null(nmem, a->value);
+            (*pi)->next = 0;
+        }
     }
-    *p = 0;
 }
 
 struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms,
@@ -82,7 +84,7 @@ struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms,
         int increasing = 0;
         int i;
         int offset = 0;
-        enum conf_sortkey_type type = Metadata_sortkey_string;
+        enum conf_metadata_type type = Metadata_type_generic;
         struct reclist_sortparms *new;
 
         if (!(cpp = strchr(parms, ',')))
@@ -105,21 +107,21 @@ struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms,
             if (pp[2])
             {
                 if (pp[2] == 'p')
-                    type = Metadata_sortkey_position;
+                    type = Metadata_type_position;
                 else
                     yaz_log(YLOG_FATAL, "Bad sortkey modifier: %s", parm);
             }
             *pp = '\0';
         }
-        if (type != Metadata_sortkey_position)
+        if (type != Metadata_type_position)
         {
             if (!strcmp(parm, "relevance"))
             {
-                type = Metadata_sortkey_relevance;
+                type = Metadata_type_relevance;
             }
             else if (!strcmp(parm, "position"))
             {
-                type = Metadata_sortkey_position;
+                type = Metadata_type_position;
             }
             else
             {
@@ -129,8 +131,6 @@ struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms,
                     if (!strcmp(sk->name, parm))
                     {
                         type = sk->type;
-                        if (type == Metadata_sortkey_skiparticle)
-                            type = Metadata_sortkey_string;
                         break;
                     }
                 }
@@ -158,10 +158,9 @@ 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 record_cluster *r1 = (*(struct record_cluster**) p1);
+    struct record_cluster *r2 = (*(struct record_cluster**) p2);
+    struct reclist_sortparms *sortparms = r1->sort_parms;
     struct reclist_sortparms *s;
     int res = 0;
 
@@ -172,35 +171,38 @@ static int reclist_cmp(const void *p1, const void *p2)
         const char *s1, *s2;
         switch (s->type)
         {
-        case Metadata_sortkey_relevance:
-            res = r2->relevance_score - r1->relevance_score;
+        case Metadata_type_relevance:
+            res = r1->relevance_score - r2->relevance_score;
             break;
-        case Metadata_sortkey_string:
+        case Metadata_type_generic:
+        case Metadata_type_skiparticle:
             s1 = ut1 ? ut1->text.sort : "";
             s2 = ut2 ? ut2->text.sort : "";
-            res = strcmp(s2, s1);
-            if (res)
-            {
-                if (s->increasing)
-                    res *= -1;
-            }
+            res = strcmp(s1, s2);
             break;
-        case Metadata_sortkey_numeric:
+        case Metadata_type_year:
+        case Metadata_type_date:
             if (ut1 && ut2)
             {
                 if (s->increasing)
                     res = ut1->number.min  - ut2->number.min;
                 else
-                    res = ut2->number.max  - ut1->number.max;
+                    res = ut1->number.max  - ut2->number.max;
             }
             else if (ut1 && !ut2)
-                res = -1;
+            {
+                res = -1; /* without date/year: last! */
+                continue;
+            }
             else if (!ut1 && ut2)
-                res = 1;
+            {
+                res = 1; /* without date/year: last! */
+                continue;
+            }
             else
                 res = 0;
             break;
-        case Metadata_sortkey_position:
+        case Metadata_type_position:
             if (r1->records && r2->records)
             {
                 int pos1 = 0, pos2 = 0;
@@ -212,13 +214,29 @@ static int reclist_cmp(const void *p1, const void *p2)
                     if (pos2 == 0 || rec->position < pos2)
                         pos2 = rec->position;
                 res = pos1 - pos2;
+                continue;
             }
             break;
-        default:
-            yaz_log(YLOG_WARN, "Bad sort type: %d", s->type);
-            res = 0;
+        case Metadata_type_float:
+            if (ut1 && ut2)
+            {
+                if (ut1->fnumber == ut2->fnumber)
+                    res = 0;
+                else if (ut1->fnumber > ut2->fnumber)
+                    res = 1;
+                else
+                    res = -1;
+            }
+            else if (ut1)
+                res = 1;
+            else if (ut2)
+                res = -1;
+            else
+                res = 0;
             break;
         }
+        if (res && !s->increasing)
+            res *= -1;
     }
     if (res == 0)
         res = strcmp(r1->recid, r2->recid);
@@ -229,7 +247,7 @@ void reclist_limit(struct reclist *l, struct session *se, int lazy)
 {
     unsigned i;
     int num = 0;
-    struct reclist_bucket **pp = &l->sorted_list;
+    struct record_cluster **pp = &l->sorted_list;
 
     reclist_enter(l);
 
@@ -239,12 +257,22 @@ void reclist_limit(struct reclist *l, struct session *se, int lazy)
         {
             struct reclist_bucket *p;
             for (p = l->hashtable[i]; p; p = p->hash_next)
+                p->record->sorted_next = 0;
+        }
+        for (i = 0; i < l->hash_size; i++)
+        {
+            struct reclist_bucket *p;
+            for (p = l->hashtable[i]; p; p = p->hash_next)
             {
                 if (session_check_cluster_limit(se, p->record))
                 {
-                    *pp = p;
-                    pp = &p->sorted_next;
-                    num++;
+                    if (!p->record->sorted_next)
+                    {
+                        *pp = p->record;
+                        pp = &p->record->sorted_next;
+                        *pp = p->record; /* signal already in use */
+                        num++;
+                    }
                 }
             }
         }
@@ -256,9 +284,9 @@ void reclist_limit(struct reclist *l, struct session *se, int lazy)
 
 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;
+    struct record_cluster **flatlist = xmalloc(sizeof(*flatlist) * l->num_records);
+    struct record_cluster *ptr;
+    struct record_cluster **prev;
     int i = 0;
 
     reclist_enter(l);
@@ -291,7 +319,7 @@ struct record_cluster *reclist_read_record(struct reclist *l)
 {
     if (l && l->sorted_ptr)
     {
-        struct record_cluster *t = l->sorted_ptr->record;
+        struct record_cluster *t = l->sorted_ptr;
         l->sorted_ptr = l->sorted_ptr->sorted_next;
         return t;
     }
@@ -345,6 +373,8 @@ void reclist_destroy(struct reclist *l)
             {
                 wrbuf_destroy(p->record->relevance_explain1);
                 wrbuf_destroy(p->record->relevance_explain2);
+                p->record->relevance_explain1 = 0;
+                p->record->relevance_explain2 = 0;
             }
         }
         yaz_mutex_destroy(&l->mutex);
@@ -358,8 +388,82 @@ int reclist_get_num_records(struct reclist *l)
     return 0;
 }
 
+static void merge_cluster(struct reclist *l,
+                          struct relevance *r,
+                          struct record_cluster *dst,
+                          struct record_cluster *src)
+{
+    struct record_metadata_attr *mkl;
+    struct record **rp = &dst->records;
+    for (; *rp; rp = &(*rp)->next)
+        ;
+    *rp = src->records;
+
+    for (mkl = src->merge_keys; mkl; mkl = mkl->next)
+    {
+        const char *merge_key = mkl->value;
+        unsigned int bucket =
+            jenkins_hash((unsigned char*) merge_key) % l->hash_size;
+        struct reclist_bucket *p;
+
+        for (p = l->hashtable[bucket]; p; p = p->hash_next)
+            if (p->record == src)
+                p->record = dst;
+    }
+
+    /* not merging metadata and sortkeys yet */
+
+    relevance_mergerec(r, dst, src);
+
+    wrbuf_puts(dst->relevance_explain1, wrbuf_cstr(src->relevance_explain1));
+    wrbuf_puts(dst->relevance_explain2, wrbuf_cstr(src->relevance_explain2));
+
+    wrbuf_destroy(src->relevance_explain1);
+    src->relevance_explain1 = 0;
+    wrbuf_destroy(src->relevance_explain2);
+    src->relevance_explain2 = 0;
+
+    append_merge_keys(&dst->merge_keys, src->merge_keys, l->nmem);
+}
+
+static struct record_cluster *new_cluster(
+    struct reclist *l,
+    struct relevance *r,
+    struct conf_service *service,
+    struct record *record,
+    struct record_metadata_attr *merge_keys
+    )
+{
+    struct record_cluster *cluster;
+    cluster = nmem_malloc(l->nmem, sizeof(*cluster));
+
+    record->next = 0;
+    cluster->records = record;
+    cluster->merge_keys = 0;
+    append_merge_keys(&cluster->merge_keys, merge_keys, l->nmem);
+    cluster->relevance_score = 0;
+    cluster->recid = cluster->merge_keys->value;
+    cluster->metadata =
+        nmem_malloc(l->nmem,
+                    sizeof(struct record_metadata*) * service->num_metadata);
+    memset(cluster->metadata, 0,
+           sizeof(struct record_metadata*) * service->num_metadata);
+    cluster->sortkeys =
+        nmem_malloc(l->nmem, sizeof(struct record_metadata*) * service->num_sortkeys);
+    memset(cluster->sortkeys, 0,
+           sizeof(union data_types*) * service->num_sortkeys);
+    relevance_newrec(r, cluster);
+    cluster->relevance_explain1 = wrbuf_alloc();
+    cluster->relevance_explain2 = wrbuf_alloc();
+    /* attach to hash list */
+    l->num_records++;
+    l->sorted_list = l->sorted_ptr = 0;
+    return cluster;
+}
+
 // Insert a record. Return record cluster (newly formed or pre-existing)
 struct record_cluster *reclist_insert(struct reclist *l,
+                                      struct relevance *r,
                                       struct conf_service *service,
                                       struct record *record,
                                       struct record_metadata_attr *merge_keys,
@@ -367,7 +471,6 @@ struct record_cluster *reclist_insert(struct reclist *l,
 {
     struct record_cluster *cluster = 0;
     struct record_metadata_attr *mkl = merge_keys;
-    struct reclist_bucket **p;
 
     assert(service);
     assert(l);
@@ -382,6 +485,8 @@ struct record_cluster *reclist_insert(struct reclist *l,
         const char *merge_key = mkl->value;
         unsigned int bucket =
             jenkins_hash((unsigned char*) merge_key) % l->hash_size;
+        struct reclist_bucket **p;
+        struct reclist_bucket *rb = 0;
 
         for (p = &l->hashtable[bucket]; *p; p = &(*p)->hash_next)
         {
@@ -391,61 +496,49 @@ struct record_cluster *reclist_insert(struct reclist *l,
                 // We found a matching record. Merge them
                 if (!strcmp(merge_key, mkr->value))
                 {
-                    struct record **re;
-
-                    cluster = (*p)->record;
-                    for (re = &cluster->records; *re; re = &(*re)->next)
+                    rb = *p;
+                    if (!cluster)
                     {
-                        if ((*re)->client == record->client &&
-                            record_compare(record, *re, service))
+                        struct record **re;
+                        for (re = &rb->record->records; *re; re = &(*re)->next)
                         {
-                            yaz_mutex_leave(l->mutex);
-                            return 0;
+                            if ((*re)->client == record->client &&
+                                record_compare(record, *re, service))
+                            {
+                                yaz_mutex_leave(l->mutex);
+                                return 0;
+                            }
+                        }
+                        cluster = rb->record;
+                        *re = record;
+                        record->next = 0;
+                    }
+                    else
+                    {
+                        if (cluster != rb->record)
+                        {
+                            assert(rb->record->relevance_explain1);
+                            merge_cluster(l, r, cluster, rb->record);
+                            (*total)--;
                         }
                     }
-                    *re = record;
-                    record->next = 0;
-                    goto out;
                 }
             }
         }
-    }
-out:
-    if (!cluster)
-    {
-        struct reclist_bucket *new =
-            nmem_malloc(l->nmem, sizeof(*new));
-
-        cluster = nmem_malloc(l->nmem, sizeof(*cluster));
-
-        record->next = 0;
-        new->record = cluster;
-        new->hash_next = 0;
-        cluster->records = record;
-
-        cluster->merge_keys = 0;
-        append_merge_keys(&cluster->merge_keys, merge_keys, l->nmem);
-
-        cluster->relevance_score = 0;
-        cluster->term_frequency_vec = 0;
-        cluster->recid = merge_keys->value;
-        (*total)++;
-        cluster->metadata =
-            nmem_malloc(l->nmem,
-                        sizeof(struct record_metadata*) * service->num_metadata);
-        memset(cluster->metadata, 0,
-               sizeof(struct record_metadata*) * service->num_metadata);
-        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;
-        l->num_records++;
-        l->sorted_list = l->sorted_ptr = 0;
+        if (!cluster)
+        {
+            (*total)++;
+            cluster = new_cluster(l, r, service, record, merge_keys);
+        }
+
+        if (!rb)
+        {
+            rb = nmem_malloc(l->nmem, sizeof(*rb));
+            rb->record = cluster;
+            rb->hash_next = 0;
+
+            *p = rb;
+        }
     }
     yaz_mutex_leave(l->mutex);
     return cluster;