Merge with master. Kept new solr test results

[pazpar2-moved-to-github.git] / src / reclists.c

diff --git a/src/reclists.c b/src/reclists.c
index 2ba9b4d..c4dd4e1 100644 (file)
--- a/src/reclists.c
+++ b/src/reclists.c
@@ -64,52 +64,69 @@ struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms,
         char parm[256];
         char *pp;
         const char *cpp;
-        int increasing;
+        int increasing = 0;
         int i;
         int offset = 0;
-        enum conf_sortkey_type type;
+        enum conf_sortkey_type type = Metadata_sortkey_string;
         struct reclist_sortparms *new;
 
         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, ':')))
         {
-            increasing = pp[1] == '1' ? 1 : 0;
+            if (pp[1] == '1')
+                increasing = 1;
+            else if (pp[1] == '0')
+                increasing = 0;
+            else
+            {
+                yaz_log(YLOG_FATAL, "Bad sortkey modifier: %s", parm);
+                return 0;
+            }
+
+            if (pp[2])
+            {
+                if (pp[2] == 'p')
+                    type = Metadata_sortkey_position;
+                else
+                    yaz_log(YLOG_FATAL, "Bad sortkey modifier: %s", parm);
+            }
             *pp = '\0';
         }
-        else
-            increasing = 0;
-        if (!strcmp(parm, "relevance"))
+        if (type != Metadata_sortkey_position)
         {
-            type = Metadata_sortkey_relevance;
-        } 
-        else if (!strcmp(parm, "position"))
-        {
-            type = Metadata_sortkey_position;
-        }
-        else
-        {
-            for (i = 0; i < service->num_sortkeys; i++)
+            if (!strcmp(parm, "relevance"))
             {
-                struct conf_sortkey *sk = &service->sortkeys[i];
-                if (!strcmp(sk->name, parm))
-                {
-                    type = sk->type;
-                    if (type == Metadata_sortkey_skiparticle)
-                        type = Metadata_sortkey_string;
-                    break;
-                }
+                type = Metadata_sortkey_relevance;
             }
-            if (i >= service->num_sortkeys)
+            else if (!strcmp(parm, "position"))
             {
-                yaz_log(YLOG_FATAL, "Bad sortkey: %s", parm);
-                return 0;
+                type = Metadata_sortkey_position;
             }
             else
+            {
+                for (i = 0; i < service->num_sortkeys; i++)
+                {
+                    struct conf_sortkey *sk = &service->sortkeys[i];
+                    if (!strcmp(sk->name, parm))
+                    {
+                        type = sk->type;
+                        if (type == Metadata_sortkey_skiparticle)
+                            type = Metadata_sortkey_string;
+                        break;
+                    }
+                }
+                if (i >= service->num_sortkeys)
+                {
+                    yaz_log(YLOG_FATAL, "Sortkey not defined in service: %s",
+                            parm);
+                    return 0;
+                }
                 offset = i;
+            }
         }
         new = *rp = nmem_malloc(nmem, sizeof(struct reclist_sortparms));
         new->next = 0;
@@ -126,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;
@@ -179,15 +196,13 @@ static int reclist_cmp(const void *p1, const void *p2)
                 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;
+                res = pos1 - pos2;
             }
             break;
         default:
             yaz_log(YLOG_WARN, "Bad sort type: %d", s->type);
             res = 0;
+            break;
         }
     }
     if (res == 0)
@@ -261,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;
@@ -279,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)
@@ -291,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);
@@ -320,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;
                 }
@@ -337,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;
@@ -350,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;
@@ -372,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