X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fextract.c;h=dcd42068311279b31e09a39ae26d60c654ad5308;hb=1fde4f52fc72af8e10a600a81c6f0924105add6a;hp=ca6d01267309f3db72f8ad848b8c7546c3c9b6fc;hpb=94bf7abfff6a30fab5567d8275db14122ed01822;p=idzebra-moved-to-github.git diff --git a/index/extract.c b/index/extract.c index ca6d012..dcd4206 100644 --- a/index/extract.c +++ b/index/extract.c @@ -1,4 +1,4 @@ -/* $Id: extract.c,v 1.184 2005-06-07 11:36:38 adam Exp $ +/* $Id: extract.c,v 1.195 2005-09-16 09:58:38 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 @@ -42,6 +43,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #define USE_SHELLSORT 0 +#define REC_MULTI_SKIP 0 + #if USE_SHELLSORT static void shellsort(void *ar, int r, size_t s, int (*cmp)(const void *a, const void *b)) @@ -85,51 +88,57 @@ 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; } -static const char **searchRecordKey (ZebraHandle zh, - struct recKeys *reckeys, - int attrSetS, int attrUseS) +static void searchRecordKey(ZebraHandle zh, + const struct recKeys *reckeys, + int attrSetS, int attrUseS, + const char **ws, int ws_length) { - static const char *ws[32]; void *decode_handle = iscz1_start(); int off = 0; int startSeq = -1; int seqno = 0; int i; + int ch; - for (i = 0; i<32; i++) + for (i = 0; ireg->zei, + attrSetS, attrUseS); + if (ch < 0) + return ; + while (off < reckeys->buf_used) { const char *src = reckeys->buf + off; struct it_key key; char *dst = (char*) &key; - int attrSet, attrUse; 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]; - if (attrUseS == attrUse && attrSetS == attrSet) + if (key.mem[0] == ch) { int woff; if (startSeq == -1) startSeq = seqno; woff = seqno - startSeq; - if (woff >= 0 && woff < 31) + if (woff >= 0 && woff < ws_length) ws[woff] = src; } @@ -139,7 +148,6 @@ static const char **searchRecordKey (ZebraHandle zh, } iscz1_stop(decode_handle); assert (off == reckeys->buf_used); - return ws; } struct file_read_info { @@ -214,7 +222,6 @@ static char *fileMatchStr (ZebraHandle zh, static char dstBuf[2048]; /* static here ??? */ char *dst = dstBuf; const char *s = spec; - static const char **w; while (1) { @@ -224,6 +231,7 @@ static char *fileMatchStr (ZebraHandle zh, break; if (*s == '(') { + const char *ws[32]; char attset_str[64], attname_str[64]; data1_attset *attset; int i; @@ -256,8 +264,7 @@ static char *fileMatchStr (ZebraHandle zh, else attUse = atoi (attname_str); } - w = searchRecordKey (zh, reckeys, attSet, attUse); - assert (w); + searchRecordKey (zh, reckeys, attSet, attUse, ws, 32); if (*s == ')') { @@ -273,15 +280,15 @@ static char *fileMatchStr (ZebraHandle zh, s++; for (i = 0; i<32; i++) - if (matchFlag[i] && w[i]) + if (matchFlag[i] && ws[i]) { if (first) { *dst++ = ' '; first = 0; } - strcpy (dst, w[i]); - dst += strlen(w[i]); + strcpy (dst, ws[i]); + dst += strlen(ws[i]); } if (first) { @@ -398,6 +405,7 @@ static int file_extract_record(ZebraHandle zh, SYSNO sysnotmp; Record rec; off_t recordOffset = 0; + struct recExtractCtrl extractCtrl; /* announce database */ if (zebraExplain_curDatabase (zh->reg->zei, zh->basenames[0])) @@ -409,13 +417,13 @@ static int file_extract_record(ZebraHandle zh, if (fi->fd != -1) { - struct recExtractCtrl extractCtrl; - /* we are going to read from a file, so prepare the extraction */ 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; @@ -429,6 +437,8 @@ static int file_extract_record(ZebraHandle zh, extractCtrl.schemaAdd = extract_schema_add; extractCtrl.dh = zh->reg->dh; extractCtrl.match_criteria[0] = '\0'; + extractCtrl.staticrank = 0; + extractCtrl.first_record = fi->file_offset ? 0 : 1; extract_set_store_data_prepare(&extractCtrl); @@ -473,7 +483,7 @@ static int file_extract_record(ZebraHandle zh, return 0; } if (extractCtrl.match_criteria[0]) - matchStr = extractCtrl.match_criteria; + matchStr = extractCtrl.match_criteria; } /* perform match if sysno not known and if match criteria is specified */ @@ -534,13 +544,15 @@ static int file_extract_record(ZebraHandle zh, *sysno = rec->sysno; recordAttr = rec_init_attr (zh->reg->zei, rec); + recordAttr->staticrank = extractCtrl.staticrank; if (matchStr) { dict_insert (zh->reg->matchDict, matchStr, sizeof(*sysno), sysno); } extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys); - extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys); + extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys, + recordAttr->staticrank); zh->records_inserted++; } @@ -548,13 +560,18 @@ 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); recordAttr = rec_init_attr (zh->reg->zei, rec); +#if REC_MULTI_SKIP if (!force_update && recordAttr->runNumber == zebraExplain_runNumberIncrement (zh->reg->zei, 0)) { @@ -567,6 +584,8 @@ static int file_extract_record(ZebraHandle zh, logRecord (zh); return 1; } +#endif + /* flush old keys for sort&search etc. */ delkeys.buf_used = rec->size[recInfo_delKeys]; delkeys.buf = rec->info[recInfo_delKeys]; @@ -574,7 +593,8 @@ static int file_extract_record(ZebraHandle zh, sortKeys.buf = rec->info[recInfo_sortKeys]; extract_flushSortKeys (zh, *sysno, 0, &sortKeys); - extract_flushRecordKeys (zh, *sysno, 0, &delkeys); + extract_flushRecordKeys (zh, *sysno, 0, &delkeys, + recordAttr->staticrank); /* old values */ if (deleteFlag) { /* record going to be deleted */ @@ -609,11 +629,14 @@ static int file_extract_record(ZebraHandle zh, } else { + /* flush new keys for sort&search etc */ if (zh->records_processed < zh->m_file_verbose_limit) yaz_log (YLOG_LOG, "update %s %s " PRINTF_OFF_T, zh->m_record_type, fname, recordOffset); + recordAttr->staticrank = extractCtrl.staticrank; extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys); - extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys); + extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys, + recordAttr->staticrank); zh->records_updated++; } } @@ -866,9 +889,11 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh, 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], @@ -907,6 +932,7 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh, extractCtrl.dh = zh->reg->dh; extractCtrl.handle = zh; extractCtrl.match_criteria[0] = '\0'; + extractCtrl.staticrank = 0; init_extractCtrl(zh, &extractCtrl); @@ -985,6 +1011,7 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh, *sysno = rec->sysno; recordAttr = rec_init_attr (zh->reg->zei, rec); + recordAttr->staticrank = extractCtrl.staticrank; if (matchStr) { @@ -992,7 +1019,8 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh, sizeof(*sysno), sysno); } extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys); - extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys); + extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys, + recordAttr->staticrank); zh->records_inserted++; } @@ -1000,7 +1028,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) { @@ -1016,6 +1048,7 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh, recordAttr = rec_init_attr (zh->reg->zei, rec); +#if REC_MULTI_SKIP if (!force_update) { if (recordAttr->runNumber == zebraExplain_runNumberIncrement (zh->reg->zei, 0)) @@ -1029,6 +1062,7 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh, return ZEBRA_FAIL; } } +#endif delkeys.buf_used = rec->size[recInfo_delKeys]; delkeys.buf = rec->info[recInfo_delKeys]; @@ -1037,7 +1071,8 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh, sortKeys.buf = rec->info[recInfo_sortKeys]; extract_flushSortKeys (zh, *sysno, 0, &sortKeys); - extract_flushRecordKeys (zh, *sysno, 0, &delkeys); + extract_flushRecordKeys (zh, *sysno, 0, &delkeys, + recordAttr->staticrank); if (delete_flag) { /* record going to be deleted */ @@ -1082,8 +1117,10 @@ ZEBRA_RES buffer_extract_record (ZebraHandle zh, if (show_progress) yaz_log (YLOG_LOG, "update %s %s %ld", recordType, pr_fname, (long) recordOffset); + recordAttr->staticrank = extractCtrl.staticrank; extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys); - extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys); + extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys, + recordAttr->staticrank); zh->records_updated++; } } @@ -1189,9 +1226,11 @@ 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; @@ -1201,6 +1240,7 @@ int explain_extract (void *handle, Record rec, data1_node *n) extractCtrl.flagShowRecords = 0; extractCtrl.match_criteria[0] = '\0'; + extractCtrl.staticrank = 0; extractCtrl.handle = handle; extractCtrl.first_record = 1; @@ -1212,7 +1252,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]; @@ -1221,9 +1265,9 @@ int explain_extract (void *handle, Record rec, data1_node *n) sortkeys.buf = rec->info[recInfo_sortKeys]; extract_flushSortKeys (zh, rec->sysno, 0, &sortkeys); - extract_flushRecordKeys (zh, rec->sysno, 0, &delkeys); + extract_flushRecordKeys (zh, rec->sysno, 0, &delkeys, 0); } - extract_flushRecordKeys (zh, rec->sysno, 1, &zh->reg->keys); + extract_flushRecordKeys (zh, rec->sysno, 1, &zh->reg->keys, 0); extract_flushSortKeys (zh, rec->sysno, 1, &zh->reg->sortKeys); xfree (rec->info[recInfo_delKeys]); @@ -1242,7 +1286,8 @@ int explain_extract (void *handle, Record rec, data1_node *n) } void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno, - int cmd, struct recKeys *reckeys) + int cmd, struct recKeys *reckeys, + zint staticrank) { void *decode_handle = iscz1_start(); int off = 0; @@ -1270,11 +1315,13 @@ void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno, while (off < reckeys->buf_used) { const char *src = reckeys->buf + off; - struct it_key key; - char *dst = (char*) &key; + struct it_key key_in; + struct it_key key_out; + char *dst = (char*) &key_in; + zint *keyp = key_out.mem; iscz1_decode(decode_handle, &dst, &src); - assert(key.len == 4); + assert(key_in.len == 4); if (zh->reg->key_buf_used + 1024 > (zh->reg->ptr_top -zh->reg->ptr_i)*sizeof(char*)) @@ -1284,7 +1331,7 @@ void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno, (zh->reg->key_buf)[zh->reg->ptr_top - zh->reg->ptr_i] = (char*)zh->reg->key_buf + zh->reg->key_buf_used; - ch = (int) key.mem[0]; /* ordinal for field/use/attribute */ + ch = (int) key_in.mem[0]; /* ordinal for field/use/attribute */ zh->reg->key_buf_used += key_SU_encode (ch,((char*)zh->reg->key_buf) + @@ -1295,17 +1342,24 @@ void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno, ((char*)(zh->reg->key_buf))[(zh->reg->key_buf_used)++] = '\0'; ((char*)(zh->reg->key_buf))[(zh->reg->key_buf_used)++] = cmd; - key.len = 3; - if (key.mem[1]) /* filter specified record ID */ - key.mem[0] = key.mem[1]; + if (zh->m_staticrank) /* rank config enabled ? */ + { + *keyp++ = staticrank; + key_out.len = 4; + } + else + key_out.len = 3; + + if (key_in.mem[1]) /* filter specified record ID */ + *keyp++ = key_in.mem[1]; else - key.mem[0] = sysno; - key.mem[1] = key.mem[2]; /* section_id */ - key.mem[2] = key.mem[3]; /* sequence .. */ + *keyp++ = sysno; + *keyp++ = key_in.mem[2]; /* section_id */ + *keyp++ = key_in.mem[3]; /* sequence .. */ memcpy ((char*)zh->reg->key_buf + zh->reg->key_buf_used, - &key, sizeof(key)); - (zh->reg->key_buf_used) += sizeof(key); + &key_out, sizeof(key_out)); + (zh->reg->key_buf_used) += sizeof(key_out); off = src - reckeys->buf; } assert (off == reckeys->buf_used); @@ -1447,11 +1501,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) @@ -1466,7 +1520,9 @@ 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'; @@ -1476,13 +1532,11 @@ void extract_add_it_key (ZebraHandle zh, ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh, struct recKeys *reckeys, zebra_snippets *snippets) { - void *decode_handle = iscz1_start(); + 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) { @@ -1491,14 +1545,20 @@ ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh, struct recKeys *reckeys, char *dst = (char*) &key; char dst_buf[IT_MAX_WORD]; char *dst_term = dst_buf; + int index_type = 0, ord; 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, key.mem[0], dst_term); + ord = key.mem[0]; + + zebraExplain_lookup_ord(zh->reg->zei, ord, &index_type, + 0/* db */, 0/* set */, 0/* use */); + assert(index_type); + zebra_term_untrans_iconv(zh, nmem, index_type, + &dst_term, src); + zebra_snippets_append(snippets, seqno, ord, dst_term); while (*src++) ; off = src - reckeys->buf; @@ -1556,17 +1616,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; @@ -1581,12 +1647,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; @@ -1596,9 +1694,9 @@ static void extract_add_sort_string (RecWord *p, const char *str, { int set, use, slen; - off += key_SU_decode(&set, sk->buf + off); - off += key_SU_decode(&use, sk->buf + off); - off += key_SU_decode(&slen, sk->buf + off); + off += key_SU_decode(&set, (unsigned char *) sk->buf + off); + off += key_SU_decode(&use, (unsigned char *) sk->buf + off); + off += key_SU_decode(&slen, (unsigned char *) sk->buf + off); off += slen; if (p->attrSet == set && p->attrUse == use) return; @@ -1621,11 +1719,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); @@ -1640,7 +1739,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) { @@ -1652,7 +1751,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; } @@ -1667,7 +1767,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; } @@ -1689,7 +1789,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) { @@ -1700,7 +1800,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; @@ -1729,7 +1829,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 @@ -1750,13 +1850,13 @@ 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); @@ -1793,6 +1893,41 @@ void extract_schema_add (struct recExtractCtrl *p, Odr_oid *oid) 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) { @@ -1805,9 +1940,9 @@ void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno, { int set, use, slen; - off += key_SU_decode(&set, sk->buf + off); - off += key_SU_decode(&use, sk->buf + off); - off += key_SU_decode(&slen, sk->buf + off); + off += key_SU_decode(&set, (unsigned char *) sk->buf + off); + off += key_SU_decode(&use, (unsigned char *) sk->buf + off); + off += key_SU_decode(&slen, (unsigned char *) sk->buf + off); sortIdx_type(sortIdx, use); if (cmd == 1) @@ -1817,6 +1952,7 @@ void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno, off += slen; } } +#endif void encode_key_init (struct encode_info *i) {