- for (i = 1; i<=nkeys; i++)
- {
- extract_get_fname_tmp (zh, rbuf, i);
- unlink (rbuf);
- }
- for (i = 1; i<=nkeys; i++)
- key_file_destroy (kf[i]);
- xfree (kf);
+ kf[i] = key_file_init(i, 8192, zh->res);
+ kf[i]->readHandler = progressFunc;
+ kf[i]->readInfo = &progressInfo;
+ progressInfo.totalBytes += kf[i]->length;
+ progressInfo.totalOffset += kf[i]->buf_size;
+ }
+ hi = key_heap_init_file(zh, nkeys, key_qsort_compare);
+ hi->reg = zh->reg;
+
+ for (i = 1; i<=nkeys; i++)
+ if ((r = key_file_read(kf[i], rbuf)))
+ key_heap_insert(hi, rbuf, r, kf[i]);
+
+ if (1)
+ {
+ struct heap_cread_info hci;
+
+ hci.key = (char *) xmalloc(KEY_SIZE);
+ hci.key_1 = (char *) xmalloc(KEY_SIZE);
+ hci.key_2 = (char *) xmalloc(KEY_SIZE);
+ hci.ret = -1;
+ hci.first_in_list = 1;
+ hci.hi = hi;
+ hci.look_level = 0;
+ hci.more = heap_read_one(hi, hci.cur_name, hci.key);
+
+ if (zh->reg->isams)
+ heap_inps(&hci, hi);
+ if (zh->reg->isamc)
+ heap_inpc(&hci, hi);
+ if (zh->reg->isamb)
+ heap_inpb(&hci, hi);
+
+ xfree(hci.key);
+ xfree(hci.key_1);
+ xfree(hci.key_2);
+ }
+
+ for (i = 1; i<=nkeys; i++)
+ {
+ extract_get_fname_tmp (zh, rbuf, i);
+ unlink(rbuf);