+ xfree (hi->info.buf);
+ xfree (hi->ptr);
+ xfree (hi->info.file);
+ xfree (hi);
+}
+
+static void key_heap_swap (struct heap_info *hi, int i1, int i2)
+{
+ int swap;
+
+ swap = hi->ptr[i1];
+ hi->ptr[i1] = hi->ptr[i2];
+ hi->ptr[i2] = swap;
+}
+
+
+static void key_heap_delete (struct heap_info *hi)
+{
+ int cur = 1, child = 2;
+
+ assert (hi->heapnum > 0);
+
+ key_heap_swap (hi, 1, hi->heapnum);
+ hi->heapnum--;
+ while (child <= hi->heapnum) {
+ if (child < hi->heapnum &&
+ (*hi->cmp)(&hi->info.buf[hi->ptr[child]],
+ &hi->info.buf[hi->ptr[child+1]]) > 0)
+ child++;
+ if ((*hi->cmp)(&hi->info.buf[hi->ptr[cur]],
+ &hi->info.buf[hi->ptr[child]]) > 0)
+ {
+ key_heap_swap (hi, cur, child);
+ cur = child;
+ child = 2*cur;
+ }
+ else
+ break;
+ }
+}
+
+static void key_heap_insert (struct heap_info *hi, const char *buf, int nbytes,
+ struct key_file *kf)
+{
+ int cur, parent;
+
+ cur = ++(hi->heapnum);
+ memcpy (hi->info.buf[hi->ptr[cur]], buf, nbytes);
+ hi->info.file[hi->ptr[cur]] = kf;
+
+ parent = cur/2;
+ while (parent && (*hi->cmp)(&hi->info.buf[hi->ptr[parent]],
+ &hi->info.buf[hi->ptr[cur]]) > 0)
+ {
+ key_heap_swap (hi, cur, parent);
+ cur = parent;
+ parent = cur/2;
+ }
+}
+
+static int heap_read_one_raw (struct heap_info *hi, char *name, char *key)
+{
+ ZebraHandle zh=hi->zh;
+ size_t ptr_i = zh->reg->ptr_i;
+ char *cp;
+ if (!ptr_i)
+ return 0;
+ --(zh->reg->ptr_i);
+ cp=(zh->reg->key_buf)[zh->reg->ptr_top - ptr_i];
+ yaz_log (YLOG_DEBUG, " raw: i=%ld top=%ld cp=%p", (long) ptr_i,
+ (long) zh->reg->ptr_top, cp);
+ strcpy(name, cp);
+ memcpy(key, cp+strlen(name)+1, KEY_SIZE);
+ hi->no_iterations++;
+ return 1;
+}
+
+static int heap_read_one (struct heap_info *hi, char *name, char *key)
+{
+ int n, r;
+ char rbuf[INP_NAME_MAX];
+ struct key_file *kf;
+
+ if (hi->zh) /* bypass the heap stuff, we have a readymade buffer */
+ return heap_read_one_raw(hi, name, key);
+
+ if (!hi->heapnum)
+ return 0;
+ n = hi->ptr[1];
+ strcpy (name, hi->info.buf[n]);
+ kf = hi->info.file[n];
+ r = strlen(name);
+ memcpy (key, hi->info.buf[n] + r+1, KEY_SIZE);
+ key_heap_delete (hi);
+ if ((r = key_file_read (kf, rbuf)))
+ key_heap_insert (hi, rbuf, r, kf);
+ hi->no_iterations++;
+ return 1;
+}
+
+#define PR_KEY_LOW 0
+#define PR_KEY_TOP 0
+
+#if 0
+static void pkey(const char *b, int mode)
+{
+ key_logdump_txt(YLOG_LOG, b, mode ? "i" : "d");
+}
+#endif
+
+#if 1
+/* for debugging only */
+static void print_dict_item(ZebraHandle zh, const char *s)
+{
+ char dst[IT_MAX_WORD+1];
+ int ord;
+ int len = key_SU_decode(&ord, (const unsigned char *) s);
+ int index_type;
+ const char *db = 0;
+
+ zebraExplain_lookup_ord (zh->reg->zei,
+ ord, &index_type, &db, 0, 0);
+
+ zebra_term_untrans(zh, index_type, dst, s + len);
+
+ yaz_log(YLOG_LOG, "ord=%d term=%s", ord, dst);
+}
+#endif
+
+struct heap_cread_info {
+ char prev_name[INP_NAME_MAX];
+ char cur_name[INP_NAME_MAX];
+ char *key;
+ char *key_1, *key_2;
+ int mode_1, mode_2;
+ int sz_1, sz_2;
+ struct heap_info *hi;
+ int first_in_list;
+ int more;
+ int ret;
+ int look_level;
+};
+
+static int heap_cread_item (void *vp, char **dst, int *insertMode);
+
+int heap_cread_item2(void *vp, char **dst, int *insertMode)
+{
+ struct heap_cread_info *p = (struct heap_cread_info *) vp;
+ int level = 0;
+
+ if (p->look_level)