+ return hi;
+}
+
+struct heap_info *key_heap_init_raw(ZebraHandle zh,
+ int (*cmp)(const void *p1, const void *p2))
+{
+ struct heap_info *hi=key_heap_malloc();
+ hi->cmp = cmp;
+ hi->zh = zh;
+ hi->raw_reading = 1;
+ return hi;
+}
+
+void key_heap_destroy (struct heap_info *hi, int nkeys)
+{
+ int i;
+ yaz_log (YLOG_DEBUG, "key_heap_destroy");
+ yaz_log (YLOG_DEBUG, "key_heap_destroy nk=%d",nkeys);
+ if (!hi->raw_reading)
+ for (i = 0; i<=nkeys; i++)
+ xfree (hi->info.buf[i]);
+
+ 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->raw_reading)
+ 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++;