- if (re->client == record->client &&
- record_compare(record, re, service))
- {
- yaz_mutex_leave(l->mutex);
- return 0;
+ // 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;