X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Freclists.c;h=27a48f447e66d26ca5cbabf8d1e7e52c5351fdd3;hb=caa025a9ad1dc0f12b5e921acc69a46403e331ac;hp=6bca856f5a41ac94d8bbcd65021fe726a5af75f3;hpb=7ce18cf5c766487c184322478d9a656ac63e1456;p=pazpar2-moved-to-github.git

diff --git a/src/reclists.c b/src/reclists.c
index 6bca856..27a48f4 100644
--- a/src/reclists.c
+++ b/src/reclists.c
@@ -1,21 +1,27 @@
 /*
- * $Id: reclists.c,v 1.2 2007-01-05 20:33:05 adam Exp $
+ * $Id: reclists.c,v 1.5 2007-01-09 22:06:49 quinn Exp $
  */
 
 #include <assert.h>
 
+#if HAVE_CONFIG_H
+#include <cconfig.h>
+#endif
+
 #include <yaz/yaz-util.h>
 
 #include "pazpar2.h"
 #include "reclists.h"
 
+extern struct parameters global_parameters;
+
 struct reclist_bucket
 {
-    struct record *record;
+    struct record_cluster *record;
     struct reclist_bucket *next;
 };
 
-struct record *reclist_read_record(struct reclist *l)
+struct record_cluster *reclist_read_record(struct reclist *l)
 {
     if (l->pointer < l->num_records)
         return l->flatlist[l->pointer++];
@@ -61,47 +67,59 @@ struct reclist *reclist_create(NMEM nmem, int numrecs)
     res->hashmask = hashsize - 1; // Creates a bitmask
 
     res->num_records = 0;
-    res->flatlist = nmem_malloc(nmem, numrecs * sizeof(struct record*));
+    res->flatlist = nmem_malloc(nmem, numrecs * sizeof(struct record_cluster*));
     res->flatlist_size = numrecs;
 
     return res;
 }
 
-struct record *reclist_insert(struct reclist *l, struct record  *record)
+// Insert a record. Return record cluster (newly formed or pre-existing)
+struct record_cluster *reclist_insert(struct reclist *l, struct record  *record,
+        char *merge_key, int *total)
 {
     unsigned int bucket;
     struct reclist_bucket **p;
-    struct record *head = 0;
+    struct record_cluster *cluster = 0;
+    struct conf_service *service = global_parameters.server->service;
 
-    bucket = hash((unsigned char*) record->merge_key) & l->hashmask;
+    bucket = hash((unsigned char*) merge_key) & l->hashmask;
     for (p = &l->hashtable[bucket]; *p; p = &(*p)->next)
     {
         // We found a matching record. Merge them
-        if (!strcmp(record->merge_key, (*p)->record->merge_key))
+        if (!strcmp(merge_key, (*p)->record->merge_key))
         {
-            struct record *existing = (*p)->record;
-            record->next_cluster = existing->next_cluster;
-            existing->next_cluster = record;
-            head = existing;
+            struct record_cluster *existing = (*p)->record;
+            record->next = existing->records;
+            existing->records = record;
+            cluster = existing;
             break;
         }
     }
-    if (!head && l->num_records < l->flatlist_size)
+    if (!cluster && l->num_records < l->flatlist_size)
     {
         struct reclist_bucket *new =
             nmem_malloc(l->nmem, sizeof(struct reclist_bucket));
+        struct record_cluster *newc =
+            nmem_malloc(l->nmem, sizeof(struct record_cluster));
         
-        assert(!*p);
-        
-        new->record = record;
-        record->next_cluster = 0;
+        record->next = 0;
+        new->record = newc;
         new->next = 0;
+        newc->records = record;
+        newc->merge_key = merge_key;
+        newc->relevance = 0;
+        newc->term_frequency_vec = 0;
+        newc->recid = (*total)++;
+        newc->metadata = 0;
+        newc->metadata = nmem_malloc(l->nmem,
+                sizeof(struct record_metadata*) * service->num_metadata);
+        bzero(newc->metadata, sizeof(struct record_metadata*) * service->num_metadata);
+
         *p = new;
-        assert(l->num_records < l->flatlist_size);
-        l->flatlist[l->num_records++] = record;
-        head = record;
+        l->flatlist[l->num_records++] = newc;
+        cluster = newc;
     }
-    return head;
+    return cluster;
 }