- struct record_cluster *existing = (*p)->record;
- record->next = existing->records;
- existing->records = record;
- cluster = existing;
- break;
+ struct record_metadata_attr *mkr = (*p)->record->merge_keys;
+ for (; mkr; mkr = mkr->next)
+ {
+ // 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)
+ {
+ if ((*re)->client == record->client &&
+ record_compare(record, *re, service))
+ {
+ yaz_mutex_leave(l->mutex);
+ return 0;
+ }
+ }
+ *re = record;
+ record->next = 0;
+ goto out;
+ }
+ }