X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fextract.c;h=59822b9b0bb9a13ef1b9962c74291a2cd0c53ab3;hb=9eebf93dc2525854867cbc43920ea8ba4a199ab5;hp=8f0cf0bef0b9a3e70df42aaffc72bdbc634d44ff;hpb=49d0ee122a9f86ec2967b577dcc297c501785edd;p=idzebra-moved-to-github.git diff --git a/index/extract.c b/index/extract.c index 8f0cf0b..59822b9 100644 --- a/index/extract.c +++ b/index/extract.c @@ -1,4 +1,4 @@ -/* $Id: extract.c,v 1.178 2005-04-15 10:47:48 adam Exp $ +/* $Id: extract.c,v 1.187 2005-06-23 06:45:46 adam Exp $ Copyright (C) 1995-2005 Index Data ApS @@ -25,7 +25,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #ifdef WIN32 #include -#else +#endif +#if HAVE_UNISTD_H #include #endif #include @@ -79,14 +80,19 @@ static void logRecord (ZebraHandle zh) } } +static void extract_set_store_data_prepare(struct recExtractCtrl *p); + static void extract_init (struct recExtractCtrl *p, RecWord *w) { w->zebra_maps = p->zebra_maps; w->seqno = 1; +#if NATTR +#else w->attrSet = VAL_BIB1; w->attrUse = 1016; - w->attrStr = 0; - w->reg_type = 'w'; +#endif + w->index_name = 0; + w->index_type = 'w'; w->extractCtrl = p; w->record_id = 0; w->section_id = 0; @@ -114,7 +120,7 @@ static const char **searchRecordKey (ZebraHandle zh, int attrSet, attrUse; iscz1_decode(decode_handle, &dst, &src); - assert(key.len < 4 && key.len > 2); + assert(key.len <= 4 && key.len > 2); attrSet = (int) key.mem[0] >> 16; attrUse = (int) key.mem[0] & 65535; @@ -146,8 +152,6 @@ struct file_read_info { off_t file_moffset; /* offset of rec/rec boundary */ int file_more; int fd; - char *sdrbuf; - int sdrmax; }; static struct file_read_info *file_read_start (int fd) @@ -158,8 +162,8 @@ static struct file_read_info *file_read_start (int fd) fi->fd = fd; fi->file_max = 0; fi->file_moffset = 0; - fi->sdrbuf = 0; - fi->sdrmax = 0; + fi->file_offset = 0; + fi->file_more = 0; return fi; } @@ -172,8 +176,6 @@ static off_t file_seek (void *handle, off_t offset) { struct file_read_info *p = (struct file_read_info *) handle; p->file_offset = offset; - if (p->sdrbuf) - return offset; return lseek (p->fd, offset, SEEK_SET); } @@ -188,16 +190,7 @@ static int file_read (void *handle, char *buf, size_t count) struct file_read_info *p = (struct file_read_info *) handle; int fd = p->fd; int r; - if (p->sdrbuf) - { - r = count; - if (r > p->sdrmax - p->file_offset) - r = p->sdrmax - p->file_offset; - if (r) - memcpy (buf, p->sdrbuf + p->file_offset, r); - } - else - r = read (fd, buf, count); + r = read (fd, buf, count); if (r > 0) { p->file_offset += r; @@ -207,23 +200,15 @@ static int file_read (void *handle, char *buf, size_t count) return r; } -static void file_begin (void *handle) -{ - struct file_read_info *p = (struct file_read_info *) handle; - - p->file_offset = p->file_moffset; - if (!p->sdrbuf && p->file_moffset) - lseek (p->fd, p->file_moffset, SEEK_SET); - p->file_more = 0; -} - static void file_end (void *handle, off_t offset) { struct file_read_info *p = (struct file_read_info *) handle; - assert (p->file_more == 0); - p->file_more = 1; - p->file_moffset = offset; + if (offset != p->file_moffset) + { + p->file_moffset = offset; + p->file_more = 1; + } } static char *fileMatchStr (ZebraHandle zh, @@ -388,12 +373,28 @@ void create_rec_keys_codec(struct recKeys *keys) keys->buf_used = 0; iscz1_reset(keys->codec_handle); } - + +static void init_extractCtrl(ZebraHandle zh, struct recExtractCtrl *ctrl) +{ + int i; + for (i = 0; i<256; i++) + { + if (zebra_maps_is_positioned(zh->reg->zebra_maps, i)) + ctrl->seqno[i] = 1; + else + ctrl->seqno[i] = 0; + } + ctrl->zebra_maps = zh->reg->zebra_maps; + ctrl->flagShowRecords = !zh->m_flag_rw; +} + static int file_extract_record(ZebraHandle zh, SYSNO *sysno, const char *fname, int deleteFlag, struct file_read_info *fi, - int force_update) + int force_update, + RecType recType, + void *recTypeClientData) { RecordAttr *recordAttr; int r; @@ -401,17 +402,7 @@ static int file_extract_record(ZebraHandle zh, SYSNO sysnotmp; Record rec; off_t recordOffset = 0; - RecType recType; - void *clientData; - if (!(recType = - recType_byName (zh->reg->recTypes, zh->res, zh->m_record_type, - &clientData))) - { - yaz_log (YLOG_WARN, "No such record type: %s", zh->m_record_type); - return 0; - } - /* announce database */ if (zebraExplain_curDatabase (zh->reg->zei, zh->basenames[0])) { @@ -425,13 +416,14 @@ static int file_extract_record(ZebraHandle zh, struct recExtractCtrl extractCtrl; /* we are going to read from a file, so prepare the extraction */ - int i; - create_rec_keys_codec(&zh->reg->keys); - +#if NATTR + create_rec_keys_codec(&zh->reg->sortKeys); +#else zh->reg->sortKeys.buf_used = 0; - +#endif recordOffset = fi->file_moffset; + extractCtrl.handle = zh; extractCtrl.offset = fi->file_moffset; extractCtrl.readf = file_read; extractCtrl.seekf = file_seek; @@ -443,16 +435,11 @@ static int file_extract_record(ZebraHandle zh, extractCtrl.schemaAdd = extract_schema_add; extractCtrl.dh = zh->reg->dh; extractCtrl.match_criteria[0] = '\0'; - extractCtrl.handle = zh; - for (i = 0; i<256; i++) - { - if (zebra_maps_is_positioned(zh->reg->zebra_maps, i)) - extractCtrl.seqno[i] = 1; - else - extractCtrl.seqno[i] = 0; - } - extractCtrl.zebra_maps = zh->reg->zebra_maps; - extractCtrl.flagShowRecords = !zh->m_flag_rw; + extractCtrl.first_record = fi->file_offset ? 0 : 1; + + extract_set_store_data_prepare(&extractCtrl); + + init_extractCtrl(zh, &extractCtrl); if (!zh->m_flag_rw) printf ("File: %s " PRINTF_OFF_T "\n", fname, recordOffset); @@ -463,7 +450,7 @@ static int file_extract_record(ZebraHandle zh, yaz_log_init_prefix2 (msg); } - r = (*recType->extract)(clientData, &extractCtrl); + r = (*recType->extract)(recTypeClientData, &extractCtrl); yaz_log_init_prefix2 (0); if (r == RECCTRL_EXTRACT_EOF) @@ -567,7 +554,11 @@ static int file_extract_record(ZebraHandle zh, { /* record already exists */ struct recKeys delkeys; +#if NATTR + struct recKeys sortKeys; +#else struct sortKeys sortKeys; +#endif rec = rec_get (zh->reg->records, *sysno); assert (rec); @@ -685,7 +676,13 @@ static int file_extract_record(ZebraHandle zh, /* update store data */ xfree (rec->info[recInfo_storeData]); - if (zh->m_store_data) + if (zh->store_data_buf) + { + rec->size[recInfo_storeData] = zh->store_data_size; + rec->info[recInfo_storeData] = zh->store_data_buf; + zh->store_data_buf = 0; + } + else if (zh->m_store_data) { rec->size[recInfo_storeData] = recordAttr->recordSize; rec->info[recInfo_storeData] = (char *) @@ -732,6 +729,8 @@ int fileExtract (ZebraHandle zh, SYSNO *sysno, const char *fname, char ext_res[128]; struct file_read_info *fi; const char *original_record_type = 0; + RecType recType; + void *recTypeClientData; if (!zh->m_group || !*zh->m_group) *gprefix = '\0'; @@ -770,6 +769,21 @@ int fileExtract (ZebraHandle zh, SYSNO *sysno, const char *fname, zh->m_record_id = res_get (zh->res, ext_res); } + if (!(recType = + recType_byName (zh->reg->recTypes, zh->res, zh->m_record_type, + &recTypeClientData))) + { + yaz_log(YLOG_WARN, "No such record type: %s", zh->m_record_type); + return 0; + } + + switch(recType->version) + { + case 0: + break; + default: + yaz_log(YLOG_WARN, "Bad filter version: %s", zh->m_record_type); + } if (sysno && deleteFlag) fd = -1; else @@ -796,9 +810,17 @@ int fileExtract (ZebraHandle zh, SYSNO *sysno, const char *fname, fi = file_read_start (fd); do { - file_begin (fi); - r = file_extract_record (zh, sysno, fname, deleteFlag, fi, 1); - } while (r && !sysno && fi->file_more); + fi->file_moffset = fi->file_offset; + fi->file_more = 0; /* file_end not called (yet) */ + r = file_extract_record (zh, sysno, fname, deleteFlag, fi, 1, + recType, recTypeClientData); + if (fi->file_more) + { /* file_end has been called so reset offset .. */ + fi->file_offset = fi->file_moffset; + lseek(fi->fd, fi->file_moffset, SEEK_SET); + } + } + while (r && !sysno); file_read_stop (fi); if (fd != -1) close (fd); @@ -825,7 +847,7 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh, { RecordAttr *recordAttr; struct recExtractCtrl extractCtrl; - int i, r; + int r; const char *matchStr = 0; RecType recType = NULL; void *clientData; @@ -850,12 +872,15 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh, extractCtrl.seekf = zebra_record_int_seek; extractCtrl.tellf = zebra_record_int_tell; extractCtrl.endf = zebra_record_int_end; + extractCtrl.first_record = 1; extractCtrl.fh = &fc; create_rec_keys_codec(&zh->reg->keys); - +#if NATTR + create_rec_keys_codec(&zh->reg->sortKeys); +#else zh->reg->sortKeys.buf_used = 0; - +#endif if (zebraExplain_curDatabase (zh->reg->zei, zh->basenames[0])) { if (zebraExplain_newDatabase (zh->reg->zei, zh->basenames[0], @@ -893,16 +918,11 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh, extractCtrl.schemaAdd = extract_schema_add; extractCtrl.dh = zh->reg->dh; extractCtrl.handle = zh; - extractCtrl.zebra_maps = zh->reg->zebra_maps; - extractCtrl.flagShowRecords = 0; extractCtrl.match_criteria[0] = '\0'; - for (i = 0; i<256; i++) - { - if (zebra_maps_is_positioned(zh->reg->zebra_maps, i)) - extractCtrl.seqno[i] = 1; - else - extractCtrl.seqno[i] = 0; - } + + init_extractCtrl(zh, &extractCtrl); + + extract_set_store_data_prepare(&extractCtrl); r = (*recType->extract)(clientData, &extractCtrl); @@ -992,7 +1012,11 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh, { /* record already exists */ struct recKeys delkeys; +#if NATTR + struct recKeys sortKeys; +#else struct sortKeys sortKeys; +#endif if (!allow_update) { @@ -1132,7 +1156,15 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh, /* update store data */ xfree (rec->info[recInfo_storeData]); - if (zh->m_store_data) + + /* update store data */ + if (zh->store_data_buf) + { + rec->size[recInfo_storeData] = zh->store_data_size; + rec->info[recInfo_storeData] = zh->store_data_buf; + zh->store_data_buf = 0; + } + else if (zh->m_store_data) { rec->size[recInfo_storeData] = recordAttr->recordSize; rec->info[recInfo_storeData] = (char *) @@ -1162,7 +1194,6 @@ int explain_extract (void *handle, Record rec, data1_node *n) { ZebraHandle zh = (ZebraHandle) handle; struct recExtractCtrl extractCtrl; - int i; if (zebraExplain_curDatabase (zh->reg->zei, rec->info[recInfo_databaseName])) @@ -1174,19 +1205,24 @@ int explain_extract (void *handle, Record rec, data1_node *n) } create_rec_keys_codec(&zh->reg->keys); - +#if NATTR + create_rec_keys_codec(&zh->reg->sortKeys); +#else zh->reg->sortKeys.buf_used = 0; - +#endif extractCtrl.init = extract_init; extractCtrl.tokenAdd = extract_token_add; extractCtrl.schemaAdd = extract_schema_add; extractCtrl.dh = zh->reg->dh; - for (i = 0; i<256; i++) - extractCtrl.seqno[i] = 0; - extractCtrl.zebra_maps = zh->reg->zebra_maps; + + init_extractCtrl(zh, &extractCtrl); + extractCtrl.flagShowRecords = 0; extractCtrl.match_criteria[0] = '\0'; extractCtrl.handle = handle; + extractCtrl.first_record = 1; + + extract_set_store_data_prepare(&extractCtrl); if (n) grs_extract_tree(&extractCtrl, n); @@ -1194,7 +1230,11 @@ int explain_extract (void *handle, Record rec, data1_node *n) if (rec->size[recInfo_delKeys]) { struct recKeys delkeys; +#if NATTR + struct recKeys sortkeys; +#else struct sortKeys sortkeys; +#endif delkeys.buf_used = rec->size[recInfo_delKeys]; delkeys.buf = rec->info[recInfo_delKeys]; @@ -1429,11 +1469,11 @@ void extract_flushWriteKeys (ZebraHandle zh, int final) } void extract_add_it_key (ZebraHandle zh, + struct recKeys *keys, int reg_type, const char *str, int slen, struct it_key *key) { char *dst; - struct recKeys *keys = &zh->reg->keys; const char *src = (char*) key; if (keys->buf_used+1024 > keys->buf_max) @@ -1448,13 +1488,90 @@ void extract_add_it_key (ZebraHandle zh, iscz1_encode(keys->codec_handle, &dst, &src); +#if REG_TYPE_PREFIX *dst++ = reg_type; +#endif memcpy (dst, str, slen); dst += slen; *dst++ = '\0'; keys->buf_used = dst - keys->buf; } +ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh, struct recKeys *reckeys, + zebra_snippets *snippets) +{ + void *decode_handle = iscz1_start(); + int off = 0; + int seqno = 0; + NMEM nmem = nmem_create(); + + yaz_log(YLOG_LOG, "zebra_rec_keys_snippets buf=%p sz=%d", reckeys->buf, + reckeys->buf_used); + assert(reckeys->buf); + while (off < reckeys->buf_used) + { + const char *src = reckeys->buf + off; + struct it_key key; + char *dst = (char*) &key; + char dst_buf[IT_MAX_WORD]; + char *dst_term = dst_buf; + + iscz1_decode(decode_handle, &dst, &src); + assert(key.len <= 4 && key.len > 2); + + seqno = (int) key.mem[key.len-1]; + + zebra_term_untrans_iconv(zh, nmem, src[0], &dst_term, src+1); + zebra_snippets_append(snippets, seqno, src[0], key.mem[0], dst_term); + while (*src++) + ; + off = src - reckeys->buf; + nmem_reset(nmem); + } + nmem_destroy(nmem); + iscz1_stop(decode_handle); + return ZEBRA_OK; +} + +void print_rec_keys(ZebraHandle zh, struct recKeys *reckeys) +{ + void *decode_handle = iscz1_start(); + int off = 0; + int seqno = 0; + NMEM nmem = nmem_create(); + + yaz_log(YLOG_LOG, "print_rec_keys buf=%p sz=%d", reckeys->buf, + reckeys->buf_used); + assert(reckeys->buf); + while (off < reckeys->buf_used) + { + const char *src = reckeys->buf + off; + struct it_key key; + char *dst = (char*) &key; + int attrSet, attrUse; + char dst_buf[IT_MAX_WORD]; + char *dst_term = dst_buf; + + iscz1_decode(decode_handle, &dst, &src); + assert(key.len <= 4 && key.len > 2); + + attrSet = (int) key.mem[0] >> 16; + attrUse = (int) key.mem[0] & 65535; + seqno = (int) key.mem[key.len-1]; + + zebra_term_untrans_iconv(zh, nmem, src[0], &dst_term, src+1); + + yaz_log(YLOG_LOG, "ord=" ZINT_FORMAT " seqno=%d term=%s", + key.mem[0], seqno, dst_term); + while (*src++) + ; + off = src - reckeys->buf; + nmem_reset(nmem); + } + nmem_destroy(nmem); + iscz1_stop(decode_handle); +} + void extract_add_index_string (RecWord *p, const char *str, int length) { struct it_key key; @@ -1463,17 +1580,23 @@ void extract_add_index_string (RecWord *p, const char *str, int length) ZebraExplainInfo zei = zh->reg->zei; int ch; - if (p->attrStr) + if (p->index_name) { - ch = zebraExplain_lookup_attr_str(zei, p->attrStr); + ch = zebraExplain_lookup_attr_str(zei, p->index_type, p->index_name); if (ch < 0) - ch = zebraExplain_add_attr_str(zei, p->attrStr); + ch = zebraExplain_add_attr_str(zei, p->index_type, p->index_name); } else { - ch = zebraExplain_lookup_attr_su(zei, p->attrSet, p->attrUse); +#if NATTR + return; +#else + ch = zebraExplain_lookup_attr_su(zei, p->index_type, + p->attrSet, p->attrUse); if (ch < 0) - ch = zebraExplain_add_attr_su(zei, p->attrSet, p->attrUse); + ch = zebraExplain_add_attr_su(zei, p->index_type, + p->attrSet, p->attrUse); +#endif } key.len = 4; key.mem[0] = ch; @@ -1488,12 +1611,44 @@ void extract_add_index_string (RecWord *p, const char *str, int length) p->attrSet, p->attrUse, p->record_id, p->section_id, p->seqno); #endif - extract_add_it_key(p->extractCtrl->handle, p->reg_type, str, + extract_add_it_key(p->extractCtrl->handle, + &zh->reg->keys, + p->index_type, str, length, &key); } -static void extract_add_sort_string (RecWord *p, const char *str, - int length) +#if NATTR +static void extract_add_sort_string (RecWord *p, const char *str, int length) +{ + struct it_key key; + + ZebraHandle zh = p->extractCtrl->handle; + ZebraExplainInfo zei = zh->reg->zei; + int ch; + + if (p->index_name) + { + ch = zebraExplain_lookup_attr_str(zei, p->index_type, p->index_name); + if (ch < 0) + ch = zebraExplain_add_attr_str(zei, p->index_type, p->index_name); + } + else + { + return; + } + key.len = 4; + key.mem[0] = ch; + key.mem[1] = p->record_id; + key.mem[2] = p->section_id; + key.mem[3] = p->seqno; + + extract_add_it_key(p->extractCtrl->handle, + &zh->reg->sortKeys, + p->index_type, str, + length, &key); +} +#else +static void extract_add_sort_string (RecWord *p, const char *str, int length) { ZebraHandle zh = p->extractCtrl->handle; struct sortKeys *sk = &zh->reg->sortKeys; @@ -1528,11 +1683,12 @@ static void extract_add_sort_string (RecWord *p, const char *str, memcpy (sk->buf + off, str, length); sk->buf_used = off + length; } +#endif void extract_add_string (RecWord *p, const char *string, int length) { assert (length > 0); - if (zebra_maps_is_sort (p->zebra_maps, p->reg_type)) + if (zebra_maps_is_sort (p->zebra_maps, p->index_type)) extract_add_sort_string (p, string, length); else extract_add_index_string (p, string, length); @@ -1547,7 +1703,7 @@ static void extract_add_incomplete_field (RecWord *p) yaz_log(YLOG_DEBUG, "Incomplete field, w='%.*s'", p->term_len, p->term_buf); if (remain > 0) - map = zebra_maps_input(p->zebra_maps, p->reg_type, &b, remain, 0); + map = zebra_maps_input(p->zebra_maps, p->index_type, &b, remain, 0); while (map) { @@ -1559,7 +1715,8 @@ static void extract_add_incomplete_field (RecWord *p) { remain = p->term_len - (b - p->term_buf); if (remain > 0) - map = zebra_maps_input(p->zebra_maps, p->reg_type, &b, remain, 0); + map = zebra_maps_input(p->zebra_maps, p->index_type, &b, + remain, 0); else map = 0; } @@ -1574,7 +1731,7 @@ static void extract_add_incomplete_field (RecWord *p) buf[i++] = *(cp++); remain = p->term_len - (b - p->term_buf); if (remain > 0) - map = zebra_maps_input(p->zebra_maps, p->reg_type, &b, remain, 0); + map = zebra_maps_input(p->zebra_maps, p->index_type, &b, remain, 0); else map = 0; } @@ -1596,7 +1753,7 @@ static void extract_add_complete_field (RecWord *p) p->term_len, p->term_buf); if (remain > 0) - map = zebra_maps_input (p->zebra_maps, p->reg_type, &b, remain, 1); + map = zebra_maps_input (p->zebra_maps, p->index_type, &b, remain, 1); while (remain > 0 && i < IT_MAX_WORD) { @@ -1607,7 +1764,7 @@ static void extract_add_complete_field (RecWord *p) if (remain > 0) { int first = i ? 0 : 1; /* first position */ - map = zebra_maps_input(p->zebra_maps, p->reg_type, &b, remain, first); + map = zebra_maps_input(p->zebra_maps, p->index_type, &b, remain, first); } else map = 0; @@ -1636,7 +1793,7 @@ static void extract_add_complete_field (RecWord *p) remain = p->term_len - (b - p->term_buf); if (remain > 0) { - map = zebra_maps_input (p->zebra_maps, p->reg_type, &b, + map = zebra_maps_input (p->zebra_maps, p->index_type, &b, remain, 0); } else @@ -1657,24 +1814,84 @@ void extract_token_add (RecWord *p) p->reg_type, p->attrSet, p->attrUse, p->seqno, p->length, p->string); #endif - if ((wrbuf = zebra_replace(p->zebra_maps, p->reg_type, 0, + if ((wrbuf = zebra_replace(p->zebra_maps, p->index_type, 0, p->term_buf, p->term_len))) { p->term_buf = wrbuf_buf(wrbuf); p->term_len = wrbuf_len(wrbuf); } - if (zebra_maps_is_complete (p->zebra_maps, p->reg_type)) + if (zebra_maps_is_complete (p->zebra_maps, p->index_type)) extract_add_complete_field (p); else extract_add_incomplete_field(p); } +static void extract_set_store_data_cb(struct recExtractCtrl *p, + void *buf, size_t sz) +{ + ZebraHandle zh = (ZebraHandle) p->handle; + + xfree(zh->store_data_buf); + zh->store_data_buf = 0; + zh->store_data_size = 0; + if (buf && sz) + { + zh->store_data_buf = xmalloc(sz); + zh->store_data_size = sz; + memcpy(zh->store_data_buf, buf, sz); + } +} + +static void extract_set_store_data_prepare(struct recExtractCtrl *p) +{ + ZebraHandle zh = (ZebraHandle) p->handle; + xfree(zh->store_data_buf); + zh->store_data_buf = 0; + zh->store_data_size = 0; + p->setStoreData = extract_set_store_data_cb; +} + void extract_schema_add (struct recExtractCtrl *p, Odr_oid *oid) { - ZebraHandle zh = (ZebraHandle) (p->handle); + ZebraHandle zh = (ZebraHandle) p->handle; zebraExplain_addSchema (zh->reg->zei, oid); } +#if NATTR +void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno, + int cmd, struct recKeys *reckeys) +{ + SortIdx sortIdx = zh->reg->sortIdx; + void *decode_handle = iscz1_start(); + int off = 0; + int ch = 0; + + while (off < reckeys->buf_used) + { + const char *src = reckeys->buf + off; + struct it_key key; + char *dst = (char*) &key; + + iscz1_decode(decode_handle, &dst, &src); + assert(key.len == 4); + + ch = (int) key.mem[0]; /* ordinal for field/use/attribute */ + + sortIdx_type(sortIdx, ch); + if (cmd == 1) + sortIdx_add(sortIdx, src, strlen(src)); + else + sortIdx_add(sortIdx, "", 1); + + src += strlen(src); + src++; + + off = src - reckeys->buf; + } + assert (off == reckeys->buf_used); + iscz1_stop(decode_handle); +} +#else void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno, int cmd, struct sortKeys *sk) { @@ -1699,6 +1916,7 @@ void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno, off += slen; } } +#endif void encode_key_init (struct encode_info *i) {