X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fextract.c;h=be000c2dd8ae2b11732e94979cbc380bf5d5cc0a;hp=10ff2bfd21c07fa568311b1d92ac136068cacadf;hb=4097bac1dce126e79ce1550fad8b2034a311ff80;hpb=3168ab325caf86d3bac38c33f7d3b701d1110539 diff --git a/index/extract.c b/index/extract.c index 10ff2bf..be000c2 100644 --- a/index/extract.c +++ b/index/extract.c @@ -1,5 +1,5 @@ -/* $Id: extract.c,v 1.208 2006-05-09 11:31:37 marc Exp $ - Copyright (C) 1995-2005 +/* $Id: extract.c,v 1.275 2007-12-20 11:15:42 adam Exp $ + Copyright (C) 1995-2007 Index Data ApS This file is part of the Zebra server. @@ -15,9 +15,13 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Zebra; see the file LICENSE.zebra. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + +/** \file + \brief indexes records and extract tokens for indexing and sorting */ #include @@ -31,106 +35,357 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #endif #include + #include "index.h" #include "orddict.h" #include #include +#include -#if _FILE_OFFSET_BITS == 64 -#define PRINTF_OFF_T "%Ld" -#else -#define PRINTF_OFF_T "%ld" -#endif +static int log_level_extract = 0; +static int log_level_details = 0; +static int log_level_initialized = 0; -#define USE_SHELLSORT 0 +/* 1 if we use eliminitate identical delete/insert keys */ +/* eventually this the 0-case code will be removed */ +#define FLUSH2 1 -#if USE_SHELLSORT -static void shellsort(void *ar, int r, size_t s, - int (*cmp)(const void *a, const void *b)) +void extract_flush_record_keys2(ZebraHandle zh, zint sysno, + zebra_rec_keys_t ins_keys, + zint ins_rank, + zebra_rec_keys_t del_keys, + zint del_rank); + +static void zebra_init_log_level(void) { - char *a = ar; - char v[100]; - int h, i, j, k; - static const int incs[16] = { 1391376, 463792, 198768, 86961, 33936, - 13776, 4592, 1968, 861, 336, - 112, 48, 21, 7, 3, 1 }; - for ( k = 0; k < 16; k++) - for (h = incs[k], i = h; i < r; i++) - { - memcpy (v, a+s*i, s); - j = i; - while (j > h && (*cmp)(a + s*(j-h), v) > 0) - { - memcpy (a + s*j, a + s*(j-h), s); - j -= h; - } - memcpy (a+s*j, v, s); - } + if (!log_level_initialized) + { + log_level_initialized = 1; + + log_level_extract = yaz_log_module_level("extract"); + log_level_details = yaz_log_module_level("indexdetails"); + } +} + +static void extract_flush_sort_keys(ZebraHandle zh, zint sysno, + int cmd, zebra_rec_keys_t skp); +static void extract_schema_add(struct recExtractCtrl *p, Odr_oid *oid); +static void extract_token_add(RecWord *p); + +static void check_log_limit(ZebraHandle zh) +{ + if (zh->records_processed + zh->records_skipped == zh->m_file_verbose_limit) + { + yaz_log(YLOG_LOG, "More than %d file log entries. Omitting rest", + zh->m_file_verbose_limit); + } } -#endif -static void logRecord (ZebraHandle zh) +static void logRecord(ZebraHandle zh) { + check_log_limit(zh); ++zh->records_processed; if (!(zh->records_processed % 1000)) { - yaz_log (YLOG_LOG, "Records: "ZINT_FORMAT" i/u/d " - ZINT_FORMAT"/"ZINT_FORMAT"/"ZINT_FORMAT, - zh->records_processed, zh->records_inserted, zh->records_updated, - zh->records_deleted); + yaz_log(YLOG_LOG, "Records: "ZINT_FORMAT" i/u/d " + ZINT_FORMAT"/"ZINT_FORMAT"/"ZINT_FORMAT, + zh->records_processed, zh->records_inserted, + zh->records_updated, zh->records_deleted); } } +static void init_extractCtrl(ZebraHandle zh, struct recExtractCtrl *ctrl) +{ + ctrl->flagShowRecords = !zh->m_flag_rw; +} + + +static void extract_add_index_string(RecWord *p, + zinfo_index_category_t cat, + const char *str, int length); + static void extract_set_store_data_prepare(struct recExtractCtrl *p); -static void extract_init (struct recExtractCtrl *p, RecWord *w) +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; -#endif - w->index_name = 0; - w->index_type = 'w'; + w->index_name = "any"; + w->index_type = "w"; w->extractCtrl = p; w->record_id = 0; w->section_id = 0; + w->segment = 0; +} + +struct snip_rec_info { + ZebraHandle zh; + zebra_snippets *snippets; +}; + + +static void snippet_add_complete_field(RecWord *p, int ord, + zebra_map_t zm) +{ + struct snip_rec_info *h = p->extractCtrl->handle; + + const char *b = p->term_buf; + char buf[IT_MAX_WORD+1]; + const char **map = 0; + int i = 0, remain = p->term_len; + const char *start = b; + const char *last = 0; + + if (remain > 0) + map = zebra_maps_input(zm, &b, remain, 1); + + while (remain > 0 && i < IT_MAX_WORD) + { + while (map && *map && **map == *CHR_SPACE) + { + remain = p->term_len - (b - p->term_buf); + + if (i == 0) + start = b; /* set to first non-ws area */ + if (remain > 0) + { + int first = i ? 0 : 1; /* first position */ + + map = zebra_maps_input(zm, &b, remain, first); + } + else + map = 0; + } + if (!map) + break; + + if (i && i < IT_MAX_WORD) + buf[i++] = *CHR_SPACE; + while (map && *map && **map != *CHR_SPACE) + { + const char *cp = *map; + + if (**map == *CHR_CUT) + { + i = 0; + } + else + { + if (i >= IT_MAX_WORD) + break; + while (i < IT_MAX_WORD && *cp) + buf[i++] = *(cp++); + } + last = b; + remain = p->term_len - (b - p->term_buf); + if (remain > 0) + { + map = zebra_maps_input(zm, &b, remain, 0); + } + else + map = 0; + } + } + if (!i) + return; + if (last && start != last) + zebra_snippets_appendn(h->snippets, p->seqno, 0, ord, + start, last - start); +} + +static void snippet_add_incomplete_field(RecWord *p, int ord, zebra_map_t zm) +{ + struct snip_rec_info *h = p->extractCtrl->handle; + const char *b = p->term_buf; + int remain = p->term_len; + int first = 1; + const char **map = 0; + const char *start = b; + const char *last = b; + + if (remain > 0) + map = zebra_maps_input(zm, &b, remain, 0); + + while (map) + { + char buf[IT_MAX_WORD+1]; + int i, remain; + + /* Skip spaces */ + while (map && *map && **map == *CHR_SPACE) + { + remain = p->term_len - (b - p->term_buf); + last = b; + if (remain > 0) + map = zebra_maps_input(zm, &b, remain, 0); + else + map = 0; + } + if (!map) + break; + if (start != last) + { + zebra_snippets_appendn(h->snippets, p->seqno, 1, ord, + start, last - start); + + } + start = last; + + i = 0; + while (map && *map && **map != *CHR_SPACE) + { + const char *cp = *map; + + while (i < IT_MAX_WORD && *cp) + buf[i++] = *(cp++); + remain = p->term_len - (b - p->term_buf); + last = b; + if (remain > 0) + map = zebra_maps_input(zm, &b, remain, 0); + else + map = 0; + } + if (!i) + return; + + if (first) + { + first = 0; + if (zebra_maps_is_first_in_field(zm)) + { + /* first in field marker */ + p->seqno++; + } + } + if (start != last) + zebra_snippets_appendn(h->snippets, p->seqno, 0, ord, + start, last - start); + start = last; + p->seqno++; + } + +} + +static void snippet_add_icu(RecWord *p, int ord, zebra_map_t zm) +{ + struct snip_rec_info *h = p->extractCtrl->handle; + + const char *res_buf = 0; + size_t res_len = 0; + + const char *display_buf = 0; + size_t display_len = 0; + + zebra_map_tokenize_start(zm, p->term_buf, p->term_len); + while (zebra_map_tokenize_next(zm, &res_buf, &res_len, + &display_buf, &display_len)) + { + zebra_snippets_appendn(h->snippets, p->seqno, 0, ord, + display_buf, display_len); + p->seqno++; + } +} + +static void snippet_token_add(RecWord *p) +{ + struct snip_rec_info *h = p->extractCtrl->handle; + ZebraHandle zh = h->zh; + zebra_map_t zm = zebra_map_get(zh->reg->zebra_maps, p->index_type); + + if (zm && zebra_maps_is_index(zm)) + { + ZebraExplainInfo zei = zh->reg->zei; + int ch = zebraExplain_lookup_attr_str( + zei, zinfo_index_category_index, p->index_type, p->index_name); + + if (zebra_maps_is_icu(zm)) + snippet_add_icu(p, ch, zm); + else + { + if (zebra_maps_is_complete(zm)) + snippet_add_complete_field(p, ch, zm); + else + snippet_add_incomplete_field(p, ch, zm); + } + } +} + +static void snippet_schema_add( + struct recExtractCtrl *p, Odr_oid *oid) +{ + +} + +void extract_snippet(ZebraHandle zh, zebra_snippets *sn, + struct ZebraRecStream *stream, + RecType rt, void *recTypeClientData) +{ + struct recExtractCtrl extractCtrl; + struct snip_rec_info info; + int r; + + extractCtrl.stream = stream; + extractCtrl.first_record = 1; + extractCtrl.init = extract_init; + extractCtrl.tokenAdd = snippet_token_add; + extractCtrl.schemaAdd = snippet_schema_add; + assert(zh->reg); + assert(zh->reg->dh); + + extractCtrl.dh = zh->reg->dh; + + info.zh = zh; + info.snippets = sn; + extractCtrl.handle = &info; + extractCtrl.match_criteria[0] = '\0'; + extractCtrl.staticrank = 0; + extractCtrl.action = action_insert; + + init_extractCtrl(zh, &extractCtrl); + + extractCtrl.setStoreData = 0; + + r = (*rt->extract)(recTypeClientData, &extractCtrl); + } static void searchRecordKey(ZebraHandle zh, zebra_rec_keys_t reckeys, - int attrSetS, int attrUseS, + const char *index_name, const char **ws, int ws_length) { int i; - int ch; + int ch = -1; + zinfo_index_category_t cat = zinfo_index_category_index; for (i = 0; ireg->zei, - attrSetS, attrUseS); + if (ch < 0) + ch = zebraExplain_lookup_attr_str(zh->reg->zei, cat, "0", index_name); + if (ch < 0) + ch = zebraExplain_lookup_attr_str(zh->reg->zei, cat, "p", index_name); + if (ch < 0) + ch = zebraExplain_lookup_attr_str(zh->reg->zei, cat, "w", index_name); + if (ch < 0) return ; if (zebra_rec_keys_rewind(reckeys)) { - int startSeq = -1; + zint startSeq = -1; const char *str; size_t slen; struct it_key key; zint seqno; while (zebra_rec_keys_read(reckeys, &str, &slen, &key)) { - assert(key.len <= 4 && key.len > 2); + assert(key.len <= IT_KEY_LEVEL_MAX && key.len > 2); seqno = key.mem[key.len-1]; if (key.mem[0] == ch) { - int woff; + zint woff; if (startSeq == -1) startSeq = seqno; @@ -142,76 +397,11 @@ static void searchRecordKey(ZebraHandle zh, } } -struct file_read_info { - off_t file_max; /* maximum offset so far */ - off_t file_offset; /* current offset */ - off_t file_moffset; /* offset of rec/rec boundary */ - int file_more; - int fd; -}; - -static struct file_read_info *file_read_start (int fd) -{ - struct file_read_info *fi = (struct file_read_info *) - xmalloc (sizeof(*fi)); - - fi->fd = fd; - fi->file_max = 0; - fi->file_moffset = 0; - fi->file_offset = 0; - fi->file_more = 0; - return fi; -} - -static void file_read_stop (struct file_read_info *fi) -{ - xfree (fi); -} - -static off_t file_seek (void *handle, off_t offset) -{ - struct file_read_info *p = (struct file_read_info *) handle; - p->file_offset = offset; - return lseek (p->fd, offset, SEEK_SET); -} - -static off_t file_tell (void *handle) -{ - struct file_read_info *p = (struct file_read_info *) handle; - return p->file_offset; -} - -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; - r = read (fd, buf, count); - if (r > 0) - { - p->file_offset += r; - if (p->file_offset > p->file_max) - p->file_max = p->file_offset; - } - return r; -} - -static void file_end (void *handle, off_t offset) -{ - struct file_read_info *p = (struct file_read_info *) handle; - - if (offset != p->file_moffset) - { - p->file_moffset = offset; - p->file_more = 1; - } -} - #define FILE_MATCH_BLANK "\t " -static char *fileMatchStr (ZebraHandle zh, - zebra_rec_keys_t reckeys, - const char *fname, const char *spec) +static char *get_match_from_spec(ZebraHandle zh, + zebra_rec_keys_t reckeys, + const char *fname, const char *spec) { static char dstBuf[2048]; /* static here ??? */ char *dst = dstBuf; @@ -227,9 +417,7 @@ static char *fileMatchStr (ZebraHandle zh, { const char *ws[32]; char attset_str[64], attname_str[64]; - data1_attset *attset; int i; - int attSet = 1, attUse = 1; int first = 1; for (s++; strchr(FILE_MATCH_BLANK, *s); s++) @@ -242,7 +430,9 @@ static char *fileMatchStr (ZebraHandle zh, for (; strchr(FILE_MATCH_BLANK, *s); s++) ; - if (*s == ',') + if (*s != ',') + strcpy(attname_str, attset_str); + else { for (s++; strchr(FILE_MATCH_BLANK, *s); s++) ; @@ -252,22 +442,12 @@ static char *fileMatchStr (ZebraHandle zh, attname_str[i++] = *s; attname_str[i] = '\0'; } - - if ((attset = data1_get_attset (zh->reg->dh, attset_str))) - { - data1_att *att; - attSet = attset->reference; - att = data1_getattbyname(zh->reg->dh, attset, attname_str); - if (att) - attUse = att->value; - else - attUse = atoi (attname_str); - } - searchRecordKey (zh, reckeys, attSet, attUse, ws, 32); + + searchRecordKey(zh, reckeys, attname_str, ws, 32); if (*s != ')') { - yaz_log (YLOG_WARN, "Missing ) in match criteria %s in group %s", + yaz_log(YLOG_WARN, "Missing ) in match criteria %s in group %s", spec, zh->m_group ? zh->m_group : "none"); return NULL; } @@ -281,12 +461,12 @@ static char *fileMatchStr (ZebraHandle zh, *dst++ = ' '; first = 0; } - strcpy (dst, ws[i]); + strcpy(dst, ws[i]); dst += strlen(ws[i]); } if (first) { - yaz_log (YLOG_WARN, "Record didn't contain match" + yaz_log(YLOG_WARN, "Record didn't contain match" " fields in (%s,%s)", attset_str, attname_str); return NULL; } @@ -303,485 +483,129 @@ static char *fileMatchStr (ZebraHandle zh, spec_len = s1 - s; if (spec_len > sizeof(special)-1) spec_len = sizeof(special)-1; - memcpy (special, s, spec_len); + memcpy(special, s, spec_len); special[spec_len] = '\0'; s = s1; - if (!strcmp (special, "group")) + if (!strcmp(special, "group")) spec_src = zh->m_group; - else if (!strcmp (special, "database")) + else if (!strcmp(special, "database")) spec_src = zh->basenames[0]; - else if (!strcmp (special, "filename")) { + else if (!strcmp(special, "filename")) { spec_src = fname; } - else if (!strcmp (special, "type")) + else if (!strcmp(special, "type")) spec_src = zh->m_record_type; else spec_src = NULL; if (spec_src) { - strcpy (dst, spec_src); - dst += strlen (spec_src); - } - } - else if (*s == '\"' || *s == '\'') - { - int stopMarker = *s++; - char tmpString[64]; - int i = 0; - - while (*s && *s != stopMarker) - { - if (i+1 < sizeof(tmpString)) - tmpString[i++] = *s++; - } - if (*s) - s++; - tmpString[i] = '\0'; - strcpy (dst, tmpString); - dst += strlen (tmpString); - } - else - { - yaz_log (YLOG_WARN, "Syntax error in match criteria %s in group %s", - spec, zh->m_group ? zh->m_group : "none"); - return NULL; - } - *dst++ = 1; - } - if (dst == dstBuf) - { - yaz_log (YLOG_WARN, "No match criteria for record %s in group %s", - fname, zh->m_group ? zh->m_group : "none"); - return NULL; - } - *dst = '\0'; - return dstBuf; -} - -struct recordLogInfo { - const char *fname; - int recordOffset; - struct recordGroup *rGroup; -}; - -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 ZEBRA_RES file_extract_record(ZebraHandle zh, - SYSNO *sysno, const char *fname, - int deleteFlag, - struct file_read_info *fi, - int force_update, - RecType recType, - void *recTypeClientData) -{ - RecordAttr *recordAttr; - int r; - const char *matchStr = 0; - SYSNO sysnotmp; - Record rec; - off_t recordOffset = 0; - struct recExtractCtrl extractCtrl; - - /* announce database */ - if (zebraExplain_curDatabase (zh->reg->zei, zh->basenames[0])) - { - if (zebraExplain_newDatabase (zh->reg->zei, zh->basenames[0], - zh->m_explain_database)) - return ZEBRA_FAIL; - } - - if (fi->fd != -1) - { - /* we are going to read from a file, so prepare the extraction */ - zebra_rec_keys_reset(zh->reg->keys); - -#if NATTR - zebra_rec_keys_reset(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; - extractCtrl.tellf = file_tell; - extractCtrl.endf = file_end; - extractCtrl.fh = fi; - extractCtrl.init = extract_init; - extractCtrl.tokenAdd = extract_token_add; - 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); - - init_extractCtrl(zh, &extractCtrl); - - if (!zh->m_flag_rw) - printf ("File: %s " PRINTF_OFF_T "\n", fname, recordOffset); - if (zh->m_flag_rw) - { - char msg[512]; - sprintf (msg, "%s:" PRINTF_OFF_T , fname, recordOffset); - yaz_log_init_prefix2 (msg); - } - - r = (*recType->extract)(recTypeClientData, &extractCtrl); - - yaz_log_init_prefix2 (0); - if (r == RECCTRL_EXTRACT_EOF) - return ZEBRA_FAIL; - else if (r == RECCTRL_EXTRACT_ERROR_GENERIC) - { - /* error occured during extraction ... */ - if (zh->m_flag_rw && - zh->records_processed < zh->m_file_verbose_limit) - { - yaz_log (YLOG_WARN, "fail %s %s " PRINTF_OFF_T, zh->m_record_type, - fname, recordOffset); - } - return ZEBRA_FAIL; - } - else if (r == RECCTRL_EXTRACT_ERROR_NO_SUCH_FILTER) - { - /* error occured during extraction ... */ - if (zh->m_flag_rw && - zh->records_processed < zh->m_file_verbose_limit) - { - yaz_log (YLOG_WARN, "no filter for %s %s " - PRINTF_OFF_T, zh->m_record_type, - fname, recordOffset); - } - return ZEBRA_FAIL; - } - if (extractCtrl.match_criteria[0]) - matchStr = extractCtrl.match_criteria; - } - - /* perform match if sysno not known and if match criteria is specified */ - if (!sysno) - { - sysnotmp = 0; - sysno = &sysnotmp; - - if (matchStr == 0 && zh->m_record_id && *zh->m_record_id) - { - matchStr = fileMatchStr (zh, zh->reg->keys, fname, - zh->m_record_id); - if (!matchStr) - { - yaz_log(YLOG_WARN, "Bad match criteria"); - return ZEBRA_FAIL; - } - } - if (matchStr) - { - int db_ord = zebraExplain_get_database_ord(zh->reg->zei); - char *rinfo = dict_lookup_ord(zh->reg->matchDict, db_ord, - matchStr); - if (rinfo) - { - assert(*rinfo == sizeof(*sysno)); - memcpy (sysno, rinfo+1, sizeof(*sysno)); - } - } - } - if (! *sysno && zebra_rec_keys_empty(zh->reg->keys) ) - { - /* the extraction process returned no information - the record - is probably empty - unless flagShowRecords is in use */ - if (!zh->m_flag_rw) - return ZEBRA_OK; - - if (zh->records_processed < zh->m_file_verbose_limit) - yaz_log (YLOG_WARN, "empty %s %s " PRINTF_OFF_T, zh->m_record_type, - fname, recordOffset); - return ZEBRA_OK; - } - - if (! *sysno) - { - /* new record */ - if (deleteFlag) - { - yaz_log (YLOG_LOG, "delete %s %s " PRINTF_OFF_T, zh->m_record_type, - fname, recordOffset); - yaz_log (YLOG_WARN, "cannot delete record above (seems new)"); - return ZEBRA_OK; - } - - rec = rec_new (zh->reg->records); - - *sysno = rec->sysno; - - if (zh->records_processed < zh->m_file_verbose_limit) - if (matchStr) - yaz_log(YLOG_LOG, "add %s %s " PRINTF_OFF_T - " " ZINT_FORMAT " %s" , - zh->m_record_type, - fname, recordOffset, *sysno, matchStr); - else - yaz_log(YLOG_LOG, "add %s %s " PRINTF_OFF_T - " " ZINT_FORMAT , - zh->m_record_type, - fname, recordOffset, *sysno); - - recordAttr = rec_init_attr (zh->reg->zei, rec); - recordAttr->staticrank = extractCtrl.staticrank; - - if (matchStr) - { - int db_ord = zebraExplain_get_database_ord(zh->reg->zei); - dict_insert_ord(zh->reg->matchDict, db_ord, matchStr, - sizeof(*sysno), sysno); - } - - -#if NATTR - extract_flushSortKeys (zh, *sysno, 1, zh->reg->sortKeys); -#else - extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys); -#endif - extract_flushRecordKeys (zh, *sysno, 1, zh->reg->keys, - recordAttr->staticrank); - zh->records_inserted++; - } - else - { - /* record already exists */ - zebra_rec_keys_t delkeys = zebra_rec_keys_open(); - -#if NATTR - zebra_rec_keys_t sortKeys = zebra_rec_keys_open(); -#else - struct sortKeys sortKeys; -#endif - - rec = rec_get (zh->reg->records, *sysno); - assert (rec); - - recordAttr = rec_init_attr (zh->reg->zei, rec); - - zebra_rec_keys_set_buf(delkeys, - rec->info[recInfo_delKeys], - rec->size[recInfo_delKeys], - 0); - -#if NATTR - zebra_rec_keys_set_buf(sortKeys, - rec->info[recInfo_sortKeys], - rec->size[recInfo_sortKeys], - 0); - extract_flushSortKeys (zh, *sysno, 0, sortKeys); -#else - sortKeys.buf_used = rec->size[recInfo_sortKeys]; - sortKeys.buf = rec->info[recInfo_sortKeys]; - extract_flushSortKeys (zh, *sysno, 0, &sortKeys); -#endif - - extract_flushRecordKeys (zh, *sysno, 0, delkeys, - recordAttr->staticrank); /* old values */ - if (deleteFlag) - { - /* record going to be deleted */ - if (zebra_rec_keys_empty(delkeys)) - { - yaz_log (YLOG_LOG, "delete %s %s " PRINTF_OFF_T - " " ZINT_FORMAT, - zh->m_record_type, fname, recordOffset, *sysno); - yaz_log (YLOG_WARN, "cannot delete file above, storeKeys false (1)"); - } - else - { - if (zh->records_processed < zh->m_file_verbose_limit) - if (matchStr) - yaz_log(YLOG_LOG, "delete %s %s " PRINTF_OFF_T - " " ZINT_FORMAT " %s" , - zh->m_record_type, - fname, recordOffset, *sysno, matchStr); - else - yaz_log(YLOG_LOG, "delete %s %s " PRINTF_OFF_T - " " ZINT_FORMAT , - zh->m_record_type, - fname, recordOffset, *sysno); - - - - zh->records_deleted++; - if (matchStr) - { - int db_ord = zebraExplain_get_database_ord(zh->reg->zei); - dict_delete_ord(zh->reg->matchDict, db_ord, matchStr); - } - rec_del (zh->reg->records, &rec); + strcpy(dst, spec_src); + dst += strlen(spec_src); } - rec_rm (&rec); - logRecord (zh); - return ZEBRA_OK; } - else + else if (*s == '\"' || *s == '\'') { - /* flush new keys for sort&search etc */ - if (zh->records_processed < zh->m_file_verbose_limit) - if (matchStr) - yaz_log(YLOG_LOG, "update %s %s " PRINTF_OFF_T - " " ZINT_FORMAT " %s" , - zh->m_record_type, - fname, recordOffset, *sysno, matchStr); - else - yaz_log(YLOG_LOG, "update %s %s " PRINTF_OFF_T - " " ZINT_FORMAT , - zh->m_record_type, - fname, recordOffset, *sysno); - - recordAttr->staticrank = extractCtrl.staticrank; -#if NATTR - extract_flushSortKeys (zh, *sysno, 1, zh->reg->sortKeys); -#else - extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys); -#endif - extract_flushRecordKeys (zh, *sysno, 1, zh->reg->keys, - recordAttr->staticrank); - zh->records_updated++; - } - zebra_rec_keys_close(delkeys); -#if NATTR - zebra_rec_keys_close(sortKeys); -#endif - } - /* update file type */ - xfree (rec->info[recInfo_fileType]); - rec->info[recInfo_fileType] = - rec_strdup (zh->m_record_type, &rec->size[recInfo_fileType]); - - /* update filename */ - xfree (rec->info[recInfo_filename]); - rec->info[recInfo_filename] = - rec_strdup (fname, &rec->size[recInfo_filename]); - - /* update delete keys */ - xfree (rec->info[recInfo_delKeys]); - if (!zebra_rec_keys_empty(zh->reg->keys) && zh->m_store_keys == 1) - { - zebra_rec_keys_get_buf(zh->reg->keys, - &rec->info[recInfo_delKeys], - &rec->size[recInfo_delKeys]); - } - else - { - rec->info[recInfo_delKeys] = NULL; - rec->size[recInfo_delKeys] = 0; - } - - /* update sort keys */ - xfree (rec->info[recInfo_sortKeys]); - -#if NATTR - zebra_rec_keys_get_buf(zh->reg->sortKeys, - &rec->info[recInfo_sortKeys], - &rec->size[recInfo_sortKeys]); -#else - rec->size[recInfo_sortKeys] = zh->reg->sortKeys.buf_used; - rec->info[recInfo_sortKeys] = zh->reg->sortKeys.buf; - zh->reg->sortKeys.buf = NULL; - zh->reg->sortKeys.buf_max = 0; -#endif - - /* save file size of original record */ - zebraExplain_recordBytesIncrement (zh->reg->zei, - - recordAttr->recordSize); - recordAttr->recordSize = fi->file_moffset - recordOffset; - if (!recordAttr->recordSize) - recordAttr->recordSize = fi->file_max - recordOffset; - zebraExplain_recordBytesIncrement (zh->reg->zei, - recordAttr->recordSize); - - /* set run-number for this record */ - recordAttr->runNumber = zebraExplain_runNumberIncrement (zh->reg->zei, - 0); + int stopMarker = *s++; + char tmpString[64]; + int i = 0; - /* update store data */ - xfree (rec->info[recInfo_storeData]); - 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 *) - xmalloc (recordAttr->recordSize); - if (lseek (fi->fd, recordOffset, SEEK_SET) < 0) - { - yaz_log (YLOG_ERRNO|YLOG_FATAL, "seek to " PRINTF_OFF_T " in %s", - recordOffset, fname); - exit (1); + while (*s && *s != stopMarker) + { + if (i+1 < sizeof(tmpString)) + tmpString[i++] = *s++; + } + if (*s) + s++; + tmpString[i] = '\0'; + strcpy(dst, tmpString); + dst += strlen(tmpString); } - if (read (fi->fd, rec->info[recInfo_storeData], recordAttr->recordSize) - < recordAttr->recordSize) + else { - yaz_log (YLOG_ERRNO|YLOG_FATAL, "read %d bytes of %s", - recordAttr->recordSize, fname); - exit (1); + yaz_log(YLOG_WARN, "Syntax error in match criteria %s in group %s", + spec, zh->m_group ? zh->m_group : "none"); + return NULL; } + *dst++ = 1; } - else + if (dst == dstBuf) { - rec->info[recInfo_storeData] = NULL; - rec->size[recInfo_storeData] = 0; + yaz_log(YLOG_WARN, "No match criteria for record %s in group %s", + fname, zh->m_group ? zh->m_group : "none"); + return NULL; } - /* update database name */ - xfree (rec->info[recInfo_databaseName]); - rec->info[recInfo_databaseName] = - rec_strdup (zh->basenames[0], &rec->size[recInfo_databaseName]); + *dst = '\0'; + return dstBuf; +} - /* update offset */ - recordAttr->recordOffset = recordOffset; +struct recordLogInfo { + const char *fname; + int recordOffset; + struct recordGroup *rGroup; +}; + +/** \brief add the always-matches index entry and map to real record ID + \param ctrl record control + \param record_id custom record ID + \param sysno system record ID - /* commit this record */ - rec_put (zh->reg->records, &rec); - logRecord (zh); - return ZEBRA_OK; + This function serves two purposes.. It adds the always matches + entry and makes a pointer from the custom record ID (if defined) + back to the system record ID (sysno) + See zebra_recid_to_sysno . + */ +static void all_matches_add(struct recExtractCtrl *ctrl, zint record_id, + zint sysno) +{ + RecWord word; + extract_init(ctrl, &word); + word.record_id = record_id; + /* we use the seqno as placeholder for a way to get back to + record database from _ALLRECORDS.. This is used if a custom + RECORD was defined */ + word.seqno = sysno; + word.index_name = "_ALLRECORDS"; + word.index_type = "w"; + + extract_add_index_string(&word, zinfo_index_category_alwaysmatches, + "", 0); } -ZEBRA_RES zebra_extract_file(ZebraHandle zh, SYSNO *sysno, const char *fname, - int deleteFlag) +ZEBRA_RES zebra_extract_records_stream(ZebraHandle zh, + struct ZebraRecStream *stream, + enum zebra_recctrl_action_t action, + int test_mode, + const char *recordType, + zint *sysno, + const char *match_criteria, + const char *fname, + RecType recType, + void *recTypeClientData); + + +ZEBRA_RES zebra_extract_file(ZebraHandle zh, zint *sysno, const char *fname, + enum zebra_recctrl_action_t action) { ZEBRA_RES r = ZEBRA_OK; int i, fd; char gprefix[128]; char ext[128]; char ext_res[128]; - struct file_read_info *fi; + struct file_read_info *fi = 0; const char *original_record_type = 0; RecType recType; void *recTypeClientData; + struct ZebraRecStream stream, *streamp; + + zebra_init_log_level(); if (!zh->m_group || !*zh->m_group) *gprefix = '\0'; else - sprintf (gprefix, "%s.", zh->m_group); + sprintf(gprefix, "%s.", zh->m_group); - yaz_log (YLOG_DEBUG, "fileExtract %s", fname); + yaz_log(log_level_extract, "zebra_extract_file %s", fname); /* determine file extension */ *ext = '\0'; @@ -790,31 +614,34 @@ ZEBRA_RES zebra_extract_file(ZebraHandle zh, SYSNO *sysno, const char *fname, break; else if (fname[i] == '.') { - strcpy (ext, fname+i+1); + strcpy(ext, fname+i+1); break; } /* determine file type - depending on extension */ original_record_type = zh->m_record_type; if (!zh->m_record_type) { - sprintf (ext_res, "%srecordType.%s", gprefix, ext); - zh->m_record_type = res_get (zh->res, ext_res); + sprintf(ext_res, "%srecordType.%s", gprefix, ext); + zh->m_record_type = res_get(zh->res, ext_res); } if (!zh->m_record_type) { - if (zh->records_processed < zh->m_file_verbose_limit) - yaz_log (YLOG_LOG, "? %s", fname); + check_log_limit(zh); + if (zh->records_processed + zh->records_skipped + < zh->m_file_verbose_limit) + yaz_log(YLOG_LOG, "? %s", fname); + zh->records_skipped++; return 0; } /* determine match criteria */ if (!zh->m_record_id) { - sprintf (ext_res, "%srecordId.%s", gprefix, ext); - zh->m_record_id = res_get (zh->res, ext_res); + sprintf(ext_res, "%srecordId.%s", gprefix, ext); + zh->m_record_id = res_get(zh->res, ext_res); } if (!(recType = - recType_byName (zh->reg->recTypes, zh->res, zh->m_record_type, + 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); @@ -828,52 +655,43 @@ ZEBRA_RES zebra_extract_file(ZebraHandle zh, SYSNO *sysno, const char *fname, default: yaz_log(YLOG_WARN, "Bad filter version: %s", zh->m_record_type); } - if (sysno && deleteFlag) - fd = -1; + if (sysno && (action == action_delete || action == action_a_delete)) + { + streamp = 0; + fi = 0; + } else { char full_rep[1024]; - if (zh->path_reg && !yaz_is_abspath (fname)) + if (zh->path_reg && !yaz_is_abspath(fname)) { - strcpy (full_rep, zh->path_reg); - strcat (full_rep, "/"); - strcat (full_rep, fname); + strcpy(full_rep, zh->path_reg); + strcat(full_rep, "/"); + strcat(full_rep, fname); } else - strcpy (full_rep, fname); + strcpy(full_rep, fname); - if ((fd = open (full_rep, O_BINARY|O_RDONLY)) == -1) + if ((fd = open(full_rep, O_BINARY|O_RDONLY)) == -1) { - yaz_log (YLOG_WARN|YLOG_ERRNO, "open %s", full_rep); + yaz_log(YLOG_WARN|YLOG_ERRNO, "open %s", full_rep); zh->m_record_type = original_record_type; return ZEBRA_FAIL; } - } - fi = file_read_start (fd); - while(1) - { - 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); - } - if (r != ZEBRA_OK) - { - break; - } - if (sysno) - { - break; - } - } - file_read_stop (fi); - if (fd != -1) - close (fd); + streamp = &stream; + zebra_create_stream_fd(streamp, fd, 0); + } + r = zebra_extract_records_stream(zh, streamp, + action, + 0, /* tst_mode */ + zh->m_record_type, + sysno, + 0, /*match_criteria */ + fname, + recType, recTypeClientData); + if (streamp) + stream.destroy(streamp); zh->m_record_type = original_record_type; return r; } @@ -884,132 +702,237 @@ ZEBRA_RES zebra_extract_file(ZebraHandle zh, SYSNO *sysno, const char *fname, If not, and a record is provided, then sysno is got from there */ -ZEBRA_RES buffer_extract_record(ZebraHandle zh, - const char *buf, size_t buf_size, - int delete_flag, - int test_mode, - const char *recordType, - SYSNO *sysno, - const char *match_criteria, - const char *fname, - int force_update, - int allow_update) + +ZEBRA_RES zebra_buffer_extract_record(ZebraHandle zh, + const char *buf, size_t buf_size, + enum zebra_recctrl_action_t action, + int test_mode, + const char *recordType, + zint *sysno, + const char *match_criteria, + const char *fname) { - SYSNO sysno0 = 0; - RecordAttr *recordAttr; - struct recExtractCtrl extractCtrl; - int r; - const char *matchStr = 0; - RecType recType = NULL; + struct ZebraRecStream stream; + ZEBRA_RES res; void *clientData; - Record rec; - long recordOffset = 0; - struct zebra_fetch_control fc; - const char *pr_fname = fname; /* filename to print .. */ - int show_progress = zh->records_processed < zh->m_file_verbose_limit ? 1:0; - - if (!pr_fname) - pr_fname = ""; /* make it printable if file is omitted */ - - fc.fd = -1; - fc.record_int_buf = buf; - fc.record_int_len = buf_size; - fc.record_int_pos = 0; - fc.offset_end = 0; - fc.record_offset = 0; - - extractCtrl.offset = 0; - extractCtrl.readf = zebra_record_int_read; - 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; - - zebra_rec_keys_reset(zh->reg->keys); + RecType recType = 0; -#if NATTR - zebra_rec_keys_reset(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], - zh->m_explain_database)) - return ZEBRA_FAIL; - } - if (recordType && *recordType) { - yaz_log (YLOG_DEBUG, "Record type explicitly specified: %s", recordType); - recType = recType_byName (zh->reg->recTypes, zh->res, recordType, + yaz_log(log_level_extract, + "Record type explicitly specified: %s", recordType); + recType = recType_byName(zh->reg->recTypes, zh->res, recordType, &clientData); } else { if (!(zh->m_record_type)) { - yaz_log (YLOG_WARN, "No such record type defined"); + yaz_log(YLOG_WARN, "No such record type defined"); return ZEBRA_FAIL; } - yaz_log (YLOG_DEBUG, "Get record type from rgroup: %s",zh->m_record_type); - recType = recType_byName (zh->reg->recTypes, zh->res, + yaz_log(log_level_extract, "Get record type from rgroup: %s", + zh->m_record_type); + recType = recType_byName(zh->reg->recTypes, zh->res, zh->m_record_type, &clientData); recordType = zh->m_record_type; } if (!recType) { - yaz_log (YLOG_WARN, "No such record type: %s", recordType); + yaz_log(YLOG_WARN, "No such record type: %s", recordType); return ZEBRA_FAIL; } - - extractCtrl.init = extract_init; - extractCtrl.tokenAdd = extract_token_add; - extractCtrl.schemaAdd = extract_schema_add; - extractCtrl.dh = zh->reg->dh; - extractCtrl.handle = zh; - extractCtrl.match_criteria[0] = '\0'; - extractCtrl.staticrank = 0; - - init_extractCtrl(zh, &extractCtrl); - extract_set_store_data_prepare(&extractCtrl); + zebra_create_stream_mem(&stream, buf, buf_size); + + res = zebra_extract_records_stream(zh, &stream, + action, + test_mode, + recordType, + sysno, + match_criteria, + fname, + recType, clientData); + stream.destroy(&stream); + return res; +} + +ZEBRA_RES zebra_extract_records_stream(ZebraHandle zh, + struct ZebraRecStream *stream, + enum zebra_recctrl_action_t action, + int test_mode, + const char *recordType, + zint *sysno, + const char *match_criteria, + const char *fname, + RecType recType, + void *recTypeClientData) +{ + ZEBRA_RES res = ZEBRA_OK; + while (1) + { + int more = 0; + res = zebra_extract_record_stream(zh, stream, + action, + test_mode, + recordType, + sysno, + match_criteria, + fname, + recType, recTypeClientData, &more); + if (!more) + { + res = ZEBRA_OK; + break; + } + if (res != ZEBRA_OK) + break; + if (sysno) + break; + } + return res; +} - r = (*recType->extract)(clientData, &extractCtrl); - if (r == RECCTRL_EXTRACT_EOF) - return ZEBRA_FAIL; - else if (r == RECCTRL_EXTRACT_ERROR_GENERIC) +static WRBUF wrbuf_hex_str(const char *cstr) +{ + size_t i; + WRBUF w = wrbuf_alloc(); + for (i = 0; cstr[i]; i++) { - /* error occured during extraction ... */ - yaz_log (YLOG_WARN, "extract error: generic"); - return ZEBRA_FAIL; + if (cstr[i] < ' ' || cstr[i] > 126) + wrbuf_printf(w, "\\%02X", cstr[i] & 0xff); + else + wrbuf_putc(w, cstr[i]); } - else if (r == RECCTRL_EXTRACT_ERROR_NO_SUCH_FILTER) + return w; +} + +ZEBRA_RES zebra_extract_record_stream(ZebraHandle zh, + struct ZebraRecStream *stream, + enum zebra_recctrl_action_t action, + int test_mode, + const char *recordType, + zint *sysno, + const char *match_criteria, + const char *fname, + RecType recType, + void *recTypeClientData, + int *more) + +{ + zint sysno0 = 0; + RecordAttr *recordAttr; + struct recExtractCtrl extractCtrl; + int r; + const char *matchStr = 0; + Record rec; + off_t start_offset = 0, end_offset = 0; + const char *pr_fname = fname; /* filename to print .. */ + int show_progress = zh->records_processed + zh->records_skipped + < zh->m_file_verbose_limit ? 1:0; + + zebra_init_log_level(); + + if (!pr_fname) + pr_fname = ""; /* make it printable if file is omitted */ + + zebra_rec_keys_reset(zh->reg->keys); + zebra_rec_keys_reset(zh->reg->sortKeys); + + if (zebraExplain_curDatabase(zh->reg->zei, zh->basenames[0])) { - /* error occured during extraction ... */ - yaz_log (YLOG_WARN, "extract error: no such filter"); - return ZEBRA_FAIL; + if (zebraExplain_newDatabase(zh->reg->zei, zh->basenames[0], + zh->m_explain_database)) + return ZEBRA_FAIL; } - if (extractCtrl.match_criteria[0]) - match_criteria = extractCtrl.match_criteria; + if (stream) + { + off_t null_offset = 0; + extractCtrl.stream = stream; + + start_offset = stream->tellf(stream); + + extractCtrl.first_record = start_offset ? 0 : 1; + + stream->endf(stream, &null_offset);; + + extractCtrl.init = extract_init; + extractCtrl.tokenAdd = extract_token_add; + extractCtrl.schemaAdd = extract_schema_add; + extractCtrl.dh = zh->reg->dh; + extractCtrl.handle = zh; + extractCtrl.match_criteria[0] = '\0'; + extractCtrl.staticrank = 0; + extractCtrl.action = action; + + init_extractCtrl(zh, &extractCtrl); + + extract_set_store_data_prepare(&extractCtrl); + + r = (*recType->extract)(recTypeClientData, &extractCtrl); + + if (action == action_update) + { + action = extractCtrl.action; + } + + switch (r) + { + case RECCTRL_EXTRACT_EOF: + return ZEBRA_FAIL; + case RECCTRL_EXTRACT_ERROR_GENERIC: + /* error occured during extraction ... */ + yaz_log(YLOG_WARN, "extract error: generic"); + return ZEBRA_FAIL; + case RECCTRL_EXTRACT_ERROR_NO_SUCH_FILTER: + /* error occured during extraction ... */ + yaz_log(YLOG_WARN, "extract error: no such filter"); + return ZEBRA_FAIL; + case RECCTRL_EXTRACT_SKIP: + if (show_progress) + yaz_log(YLOG_LOG, "skip %s %s " ZINT_FORMAT, + recordType, pr_fname, (zint) start_offset); + *more = 1; + + end_offset = stream->endf(stream, 0); + if (end_offset) + stream->seekf(stream, end_offset); + + return ZEBRA_OK; + case RECCTRL_EXTRACT_OK: + break; + default: + yaz_log(YLOG_WARN, "extract error: unknown error: %d", r); + return ZEBRA_FAIL; + } + end_offset = stream->endf(stream, 0); + if (end_offset) + stream->seekf(stream, end_offset); + else + end_offset = stream->tellf(stream); - if (!sysno) { + if (extractCtrl.match_criteria[0]) + match_criteria = extractCtrl.match_criteria; + } + *more = 1; + if (!sysno) + { sysno = &sysno0; if (match_criteria && *match_criteria) { matchStr = match_criteria; } else { if (zh->m_record_id && *zh->m_record_id) { - matchStr = fileMatchStr (zh, zh->reg->keys, pr_fname, - zh->m_record_id); + matchStr = get_match_from_spec(zh, zh->reg->keys, pr_fname, + zh->m_record_id); if (!matchStr) { - yaz_log (YLOG_WARN, "Bad match criteria (recordID)"); + yaz_log(YLOG_LOG, "error %s %s " ZINT_FORMAT, recordType, + pr_fname, (zint) start_offset); return ZEBRA_FAIL; } } @@ -1019,13 +942,22 @@ ZEBRA_RES buffer_extract_record(ZebraHandle zh, int db_ord = zebraExplain_get_database_ord(zh->reg->zei); char *rinfo = dict_lookup_ord(zh->reg->matchDict, db_ord, matchStr); + + + if (log_level_extract) + { + WRBUF w = wrbuf_hex_str(matchStr); + yaz_log(log_level_extract, "matchStr: %s", wrbuf_cstr(w)); + wrbuf_destroy(w); + } if (rinfo) { assert(*rinfo == sizeof(*sysno)); - memcpy (sysno, rinfo+1, sizeof(*sysno)); + memcpy(sysno, rinfo+1, sizeof(*sysno)); } - } + } } + if (zebra_rec_keys_empty(zh->reg->keys)) { /* the extraction process returned no information - the record @@ -1036,23 +968,50 @@ ZEBRA_RES buffer_extract_record(ZebraHandle zh, if (! *sysno) { - /* new record */ - if (delete_flag) + /* new record AKA does not exist already */ + if (action == action_delete) { - yaz_log (YLOG_LOG, "delete %s %s %ld", recordType, - pr_fname, (long) recordOffset); - yaz_log (YLOG_WARN, "cannot delete record above (seems new)"); + yaz_log(YLOG_LOG, "delete %s %s " ZINT_FORMAT, recordType, + pr_fname, (zint) start_offset); + yaz_log(YLOG_WARN, "cannot delete record above (seems new)"); return ZEBRA_FAIL; } + else if (action == action_a_delete) + { + if (show_progress) + yaz_log(YLOG_LOG, "delete %s %s " ZINT_FORMAT, recordType, + pr_fname, (zint) start_offset); + return ZEBRA_OK; + } + else if (action == action_replace) + { + yaz_log(YLOG_LOG, "update %s %s " ZINT_FORMAT, recordType, + pr_fname, (zint) start_offset); + yaz_log(YLOG_WARN, "cannot update record above (seems new)"); + return ZEBRA_FAIL; + } if (show_progress) - yaz_log (YLOG_LOG, "add %s %s %ld", recordType, pr_fname, - (long) recordOffset); - rec = rec_new (zh->reg->records); + yaz_log(YLOG_LOG, "add %s %s " ZINT_FORMAT, recordType, pr_fname, + (zint) start_offset); + rec = rec_new(zh->reg->records); *sysno = rec->sysno; - recordAttr = rec_init_attr (zh->reg->zei, rec); - recordAttr->staticrank = extractCtrl.staticrank; + + if (stream) + { + all_matches_add(&extractCtrl, + zebra_rec_keys_get_custom_record_id(zh->reg->keys), + *sysno); + } + + + recordAttr = rec_init_attr(zh->reg->zei, rec); + if (extractCtrl.staticrank < 0) + { + yaz_log(YLOG_WARN, "Negative staticrank for record. Set to 0"); + extractCtrl.staticrank = 0; + } if (matchStr) { @@ -1061,123 +1020,127 @@ ZEBRA_RES buffer_extract_record(ZebraHandle zh, sizeof(*sysno), sysno); } - -#if NATTR - extract_flushSortKeys (zh, *sysno, 1, zh->reg->sortKeys); + extract_flush_sort_keys(zh, *sysno, 1, zh->reg->sortKeys); +#if FLUSH2 + extract_flush_record_keys2(zh, *sysno, + zh->reg->keys, extractCtrl.staticrank, + 0, recordAttr->staticrank); #else - extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys); -#endif - -#if 0 - print_rec_keys(zh, zh->reg->keys); + extract_flush_record_keys(zh, *sysno, 1, zh->reg->keys, + extractCtrl.staticrank); #endif - extract_flushRecordKeys (zh, *sysno, 1, zh->reg->keys, - recordAttr->staticrank); + recordAttr->staticrank = extractCtrl.staticrank; zh->records_inserted++; } else { /* record already exists */ zebra_rec_keys_t delkeys = zebra_rec_keys_open(); -#if NATTR zebra_rec_keys_t sortKeys = zebra_rec_keys_open(); -#else - struct sortKeys sortKeys; -#endif - - if (!allow_update) + if (action == action_insert) { - yaz_log (YLOG_LOG, "skipped %s %s %ld", - recordType, pr_fname, (long) recordOffset); + yaz_log(YLOG_LOG, "skipped %s %s " ZINT_FORMAT, + recordType, pr_fname, (zint) start_offset); logRecord(zh); return ZEBRA_FAIL; } - rec = rec_get (zh->reg->records, *sysno); - assert (rec); + rec = rec_get(zh->reg->records, *sysno); + assert(rec); + + if (stream) + { + all_matches_add(&extractCtrl, + zebra_rec_keys_get_custom_record_id(zh->reg->keys), + *sysno); + } - recordAttr = rec_init_attr (zh->reg->zei, rec); + recordAttr = rec_init_attr(zh->reg->zei, rec); + + /* decrease total size */ + zebraExplain_recordBytesIncrement(zh->reg->zei, + - recordAttr->recordSize); zebra_rec_keys_set_buf(delkeys, rec->info[recInfo_delKeys], rec->size[recInfo_delKeys], 0); -#if NATTR zebra_rec_keys_set_buf(sortKeys, rec->info[recInfo_sortKeys], rec->size[recInfo_sortKeys], 0); -#else - sortKeys.buf_used = rec->size[recInfo_sortKeys]; - sortKeys.buf = rec->info[recInfo_sortKeys]; -#endif -#if NATTR - extract_flushSortKeys (zh, *sysno, 0, sortKeys); -#else - extract_flushSortKeys (zh, *sysno, 0, &sortKeys); + extract_flush_sort_keys(zh, *sysno, 0, sortKeys); +#if !FLUSH2 + extract_flush_record_keys(zh, *sysno, 0, delkeys, + recordAttr->staticrank); #endif - extract_flushRecordKeys (zh, *sysno, 0, delkeys, - recordAttr->staticrank); - if (delete_flag) + if (action == action_delete || action == action_a_delete) { /* record going to be deleted */ +#if FLUSH2 + extract_flush_record_keys2(zh, *sysno, 0, recordAttr->staticrank, + delkeys, recordAttr->staticrank); +#endif if (zebra_rec_keys_empty(delkeys)) { - yaz_log (YLOG_LOG, "delete %s %s %ld", recordType, - pr_fname, (long) recordOffset); - yaz_log (YLOG_WARN, "cannot delete file above, " - "storeKeys false (3)"); + yaz_log(YLOG_LOG, "delete %s %s " ZINT_FORMAT, recordType, + pr_fname, (zint) start_offset); + yaz_log(YLOG_WARN, "cannot delete file above, " + "storeKeys false (3)"); } else { if (show_progress) - yaz_log (YLOG_LOG, "delete %s %s %ld", recordType, - pr_fname, (long) recordOffset); + yaz_log(YLOG_LOG, "delete %s %s " ZINT_FORMAT, recordType, + pr_fname, (zint) start_offset); zh->records_deleted++; if (matchStr) { int db_ord = zebraExplain_get_database_ord(zh->reg->zei); dict_delete_ord(zh->reg->matchDict, db_ord, matchStr); } - rec_del (zh->reg->records, &rec); + rec_del(zh->reg->records, &rec); } - rec_rm (&rec); + zebra_rec_keys_close(delkeys); + zebra_rec_keys_close(sortKeys); + rec_free(&rec); logRecord(zh); return ZEBRA_OK; } else - { + { /* update or special_update */ if (show_progress) - yaz_log (YLOG_LOG, "update %s %s %ld", recordType, - pr_fname, (long) recordOffset); - recordAttr->staticrank = extractCtrl.staticrank; -#if NATTR - extract_flushSortKeys (zh, *sysno, 1, zh->reg->sortKeys); + yaz_log(YLOG_LOG, "update %s %s " ZINT_FORMAT, recordType, + pr_fname, (zint) start_offset); + extract_flush_sort_keys(zh, *sysno, 1, zh->reg->sortKeys); + +#if FLUSH2 + extract_flush_record_keys2(zh, *sysno, + zh->reg->keys, extractCtrl.staticrank, + delkeys, recordAttr->staticrank); #else - extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys); + extract_flush_record_keys(zh, *sysno, 1, + zh->reg->keys, extractCtrl.staticrank); #endif - extract_flushRecordKeys (zh, *sysno, 1, zh->reg->keys, - recordAttr->staticrank); + recordAttr->staticrank = extractCtrl.staticrank; zh->records_updated++; } zebra_rec_keys_close(delkeys); -#if NATTR zebra_rec_keys_close(sortKeys); -#endif } /* update file type */ - xfree (rec->info[recInfo_fileType]); + xfree(rec->info[recInfo_fileType]); rec->info[recInfo_fileType] = - rec_strdup (recordType, &rec->size[recInfo_fileType]); + rec_strdup(recordType, &rec->size[recInfo_fileType]); /* update filename */ - xfree (rec->info[recInfo_filename]); + xfree(rec->info[recInfo_filename]); rec->info[recInfo_filename] = - rec_strdup (fname, &rec->size[recInfo_filename]); + rec_strdup(fname, &rec->size[recInfo_filename]); /* update delete keys */ - xfree (rec->info[recInfo_delKeys]); + xfree(rec->info[recInfo_delKeys]); if (!zebra_rec_keys_empty(zh->reg->keys) && zh->m_store_keys == 1) { zebra_rec_keys_get_buf(zh->reg->keys, @@ -1190,38 +1153,25 @@ ZEBRA_RES buffer_extract_record(ZebraHandle zh, rec->size[recInfo_delKeys] = 0; } /* update sort keys */ - xfree (rec->info[recInfo_sortKeys]); + xfree(rec->info[recInfo_sortKeys]); -#if NATTR zebra_rec_keys_get_buf(zh->reg->sortKeys, &rec->info[recInfo_sortKeys], &rec->size[recInfo_sortKeys]); -#else - rec->size[recInfo_sortKeys] = zh->reg->sortKeys.buf_used; - rec->info[recInfo_sortKeys] = zh->reg->sortKeys.buf; - zh->reg->sortKeys.buf = NULL; - zh->reg->sortKeys.buf_max = 0; -#endif - /* save file size of original record */ - zebraExplain_recordBytesIncrement (zh->reg->zei, - - recordAttr->recordSize); -#if 0 - recordAttr->recordSize = fi->file_moffset - recordOffset; - if (!recordAttr->recordSize) - recordAttr->recordSize = fi->file_max - recordOffset; -#else - recordAttr->recordSize = buf_size; -#endif - zebraExplain_recordBytesIncrement (zh->reg->zei, - recordAttr->recordSize); + if (stream) + { + recordAttr->recordSize = end_offset - start_offset; + zebraExplain_recordBytesIncrement(zh->reg->zei, + recordAttr->recordSize); + } /* set run-number for this record */ recordAttr->runNumber = - zebraExplain_runNumberIncrement (zh->reg->zei, 0); + zebraExplain_runNumberIncrement(zh->reg->zei, 0); /* update store data */ - xfree (rec->info[recInfo_storeData]); + xfree(rec->info[recInfo_storeData]); /* update store data */ if (zh->store_data_buf) @@ -1229,13 +1179,19 @@ ZEBRA_RES buffer_extract_record(ZebraHandle zh, rec->size[recInfo_storeData] = zh->store_data_size; rec->info[recInfo_storeData] = zh->store_data_buf; zh->store_data_buf = 0; + recordAttr->recordSize = zh->store_data_size; } else if (zh->m_store_data) { + off_t cur_offset = stream->tellf(stream); + rec->size[recInfo_storeData] = recordAttr->recordSize; rec->info[recInfo_storeData] = (char *) - xmalloc (recordAttr->recordSize); - memcpy (rec->info[recInfo_storeData], buf, recordAttr->recordSize); + xmalloc(recordAttr->recordSize); + stream->seekf(stream, start_offset); + stream->readf(stream, rec->info[recInfo_storeData], + recordAttr->recordSize); + stream->seekf(stream, cur_offset); } else { @@ -1243,40 +1199,36 @@ ZEBRA_RES buffer_extract_record(ZebraHandle zh, rec->size[recInfo_storeData] = 0; } /* update database name */ - xfree (rec->info[recInfo_databaseName]); + xfree(rec->info[recInfo_databaseName]); rec->info[recInfo_databaseName] = - rec_strdup (zh->basenames[0], &rec->size[recInfo_databaseName]); + rec_strdup(zh->basenames[0], &rec->size[recInfo_databaseName]); /* update offset */ - recordAttr->recordOffset = recordOffset; + recordAttr->recordOffset = start_offset; /* commit this record */ - rec_put (zh->reg->records, &rec); + rec_put(zh->reg->records, &rec); logRecord(zh); return ZEBRA_OK; } -int explain_extract (void *handle, Record rec, data1_node *n) +ZEBRA_RES zebra_extract_explain(void *handle, Record rec, data1_node *n) { ZebraHandle zh = (ZebraHandle) handle; struct recExtractCtrl extractCtrl; - if (zebraExplain_curDatabase (zh->reg->zei, + if (zebraExplain_curDatabase(zh->reg->zei, rec->info[recInfo_databaseName])) { abort(); - if (zebraExplain_newDatabase (zh->reg->zei, + if (zebraExplain_newDatabase(zh->reg->zei, rec->info[recInfo_databaseName], 0)) - abort (); + abort(); } zebra_rec_keys_reset(zh->reg->keys); - -#if NATTR zebra_rec_keys_reset(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; @@ -1287,6 +1239,8 @@ int explain_extract (void *handle, Record rec, data1_node *n) extractCtrl.flagShowRecords = 0; extractCtrl.match_criteria[0] = '\0'; extractCtrl.staticrank = 0; + extractCtrl.action = action_update; + extractCtrl.handle = handle; extractCtrl.first_record = 1; @@ -1299,284 +1253,243 @@ int explain_extract (void *handle, Record rec, data1_node *n) { zebra_rec_keys_t delkeys = zebra_rec_keys_open(); -#if NATTR zebra_rec_keys_t sortkeys = zebra_rec_keys_open(); -#else - struct sortKeys sortkeys; -#endif zebra_rec_keys_set_buf(delkeys, rec->info[recInfo_delKeys], rec->size[recInfo_delKeys], 0); - extract_flushRecordKeys (zh, rec->sysno, 0, delkeys, 0); +#if FLUSH2 + extract_flush_record_keys2(zh, rec->sysno, + zh->reg->keys, 0, delkeys, 0); +#else + extract_flush_record_keys(zh, rec->sysno, 0, delkeys, 0); + extract_flush_record_keys(zh, rec->sysno, 1, zh->reg->keys, 0); +#endif zebra_rec_keys_close(delkeys); -#if NATTR + zebra_rec_keys_set_buf(sortkeys, rec->info[recInfo_sortKeys], rec->size[recInfo_sortKeys], 0); - extract_flushSortKeys (zh, rec->sysno, 0, sortkeys); + extract_flush_sort_keys(zh, rec->sysno, 0, sortkeys); zebra_rec_keys_close(sortkeys); -#else - sortkeys.buf_used = rec->size[recInfo_sortKeys]; - sortkeys.buf = rec->info[recInfo_sortKeys]; - extract_flushSortKeys (zh, rec->sysno, 0, &sortkeys); -#endif } - extract_flushRecordKeys (zh, rec->sysno, 1, zh->reg->keys, 0); -#if NATTR - extract_flushSortKeys (zh, rec->sysno, 1, zh->reg->sortKeys); + else + { +#if FLUSH2 + extract_flush_record_keys2(zh, rec->sysno, zh->reg->keys, 0, 0, 0); #else - extract_flushSortKeys (zh, rec->sysno, 1, &zh->reg->sortKeys); + extract_flush_record_keys(zh, rec->sysno, 1, zh->reg->keys, 0); #endif - - xfree (rec->info[recInfo_delKeys]); + } + extract_flush_sort_keys(zh, rec->sysno, 1, zh->reg->sortKeys); + + xfree(rec->info[recInfo_delKeys]); zebra_rec_keys_get_buf(zh->reg->keys, &rec->info[recInfo_delKeys], &rec->size[recInfo_delKeys]); - xfree (rec->info[recInfo_sortKeys]); -#if NATTR + xfree(rec->info[recInfo_sortKeys]); zebra_rec_keys_get_buf(zh->reg->sortKeys, &rec->info[recInfo_sortKeys], &rec->size[recInfo_sortKeys]); -#else - rec->size[recInfo_sortKeys] = zh->reg->sortKeys.buf_used; - rec->info[recInfo_sortKeys] = zh->reg->sortKeys.buf; - zh->reg->sortKeys.buf = NULL; - zh->reg->sortKeys.buf_max = 0; -#endif - - return 0; + return ZEBRA_OK; } -void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno, - int cmd, - zebra_rec_keys_t reckeys, - zint staticrank) +void extract_rec_keys_log(ZebraHandle zh, int is_insert, + zebra_rec_keys_t reckeys, + int level) { - ZebraExplainInfo zei = zh->reg->zei; - - if (!zh->reg->key_buf) + if (zebra_rec_keys_rewind(reckeys)) { - int mem= 1024*1024* atoi( res_get_def( zh->res, "memmax", "8")); - if (mem <= 0) - { - yaz_log(YLOG_WARN, "Invalid memory setting, using default 8 MB"); - mem= 1024*1024*8; - } - /* FIXME: That "8" should be in a default settings include */ - /* not hard-coded here! -H */ - zh->reg->key_buf = (char**) xmalloc (mem); - zh->reg->ptr_top = mem/sizeof(char*); - zh->reg->ptr_i = 0; - zh->reg->key_buf_used = 0; - zh->reg->key_file_no = 0; + size_t slen; + const char *str; + struct it_key key; + NMEM nmem = nmem_create(); + + while(zebra_rec_keys_read(reckeys, &str, &slen, &key)) + { + char keystr[200]; /* room for zints to print */ + char *dst_term = 0; + int ord = CAST_ZINT_TO_INT(key.mem[0]); + const char *index_type; + int i; + const char *string_index; + + zebraExplain_lookup_ord(zh->reg->zei, ord, &index_type, + 0/* db */, &string_index); + assert(index_type); + zebra_term_untrans_iconv(zh, nmem, index_type, + &dst_term, str); + *keystr = '\0'; + for (i = 0; ireg->zei; + struct ord_stat { + int no; + int ord; + struct ord_stat *next; + }; if (zebra_rec_keys_rewind(reckeys)) { + struct ord_stat *ord_list = 0; + struct ord_stat *p; size_t slen; const char *str; struct it_key key_in; while(zebra_rec_keys_read(reckeys, &str, &slen, &key_in)) - { - int ch = 0; - struct it_key key_out; - zint *keyp = key_out.mem; + { + int ord = CAST_ZINT_TO_INT(key_in.mem[0]); - assert(key_in.len == 4); - - /* check for buffer overflow */ - if (zh->reg->key_buf_used + 1024 > - (zh->reg->ptr_top -zh->reg->ptr_i)*sizeof(char*)) - extract_flushWriteKeys (zh, 0); - - ++(zh->reg->ptr_i); - assert(zh->reg->ptr_i > 0); - (zh->reg->key_buf)[zh->reg->ptr_top - zh->reg->ptr_i] = - (char*)zh->reg->key_buf + zh->reg->key_buf_used; - - /* encode the ordinal value (field/use/attribute) .. */ - ch = (int) key_in.mem[0]; - zh->reg->key_buf_used += - key_SU_encode(ch, (char*)zh->reg->key_buf + - zh->reg->key_buf_used); - - /* copy the 0-terminated stuff from str to output */ - memcpy((char*)zh->reg->key_buf + zh->reg->key_buf_used, str, slen); - zh->reg->key_buf_used += slen; - ((char*)zh->reg->key_buf)[(zh->reg->key_buf_used)++] = '\0'; + for (p = ord_list; p ; p = p->next) + if (p->ord == ord) + { + p->no++; + break; + } + if (!p) + { + p = xmalloc(sizeof(*p)); + p->no = 1; + p->ord = ord; + p->next = ord_list; + ord_list = p; + } + } - /* the delete/insert indicator */ - ((char*)zh->reg->key_buf)[(zh->reg->key_buf_used)++] = cmd; + p = ord_list; + while (p) + { + struct ord_stat *p1 = p; - if (zh->m_staticrank) /* rank config enabled ? */ - { - if (staticrank < 0) - { - yaz_log(YLOG_WARN, "staticrank = %ld. Setting to 0", - (long) staticrank); - staticrank = 0; - } - *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 - *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_out, sizeof(key_out)); - (zh->reg->key_buf_used) += sizeof(key_out); - } + if (is_insert) + zebraExplain_ord_adjust_occurrences(zei, p->ord, p->no, 1); + else + zebraExplain_ord_adjust_occurrences(zei, p->ord, - p->no, -1); + p = p->next; + xfree(p1); + } } } -void extract_flushWriteKeys (ZebraHandle zh, int final) - /* optimizing: if final=1, and no files written yet */ - /* push the keys directly to merge, sidestepping the */ - /* temp file altogether. Speeds small updates */ +void extract_flush_record_keys2(ZebraHandle zh, zint sysno, + zebra_rec_keys_t ins_keys, zint ins_rank, + zebra_rec_keys_t del_keys, zint del_rank) { - FILE *outf; - char out_fname[200]; - char *prevcp, *cp; - struct encode_info encode_info; - int ptr_i = zh->reg->ptr_i; - int temp_policy; -#if SORT_EXTRA - int i; -#endif - if (!zh->reg->key_buf || ptr_i <= 0) - { - yaz_log (YLOG_DEBUG, " nothing to flush section=%d buf=%p i=%d", - zh->reg->key_file_no, zh->reg->key_buf, ptr_i); - yaz_log (YLOG_DEBUG, " buf=%p ", - zh->reg->key_buf); - yaz_log (YLOG_DEBUG, " ptr=%d ",zh->reg->ptr_i); - yaz_log (YLOG_DEBUG, " reg=%p ",zh->reg); - - return; - } - - (zh->reg->key_file_no)++; - yaz_log (YLOG_LOG, "sorting section %d", (zh->reg->key_file_no)); - yaz_log (YLOG_DEBUG, " sort_buff at %p n=%d", - zh->reg->key_buf + zh->reg->ptr_top - ptr_i,ptr_i); -#if !SORT_EXTRA - qsort (zh->reg->key_buf + zh->reg->ptr_top - ptr_i, ptr_i, - sizeof(char*), key_qsort_compare); - - /* zebra.cfg: tempfiles: - Y: always use temp files (old way) - A: use temp files, if more than one (auto) - = if this is both the last and the first - N: never bother with temp files (new) */ - - temp_policy=toupper(res_get_def(zh->res,"tempfiles","auto")[0]); - if (temp_policy != 'Y' && temp_policy != 'N' && temp_policy != 'A') { - yaz_log (YLOG_WARN, "Illegal tempfiles setting '%c'. using 'Auto' ", - temp_policy); - temp_policy='A'; - } + ZebraExplainInfo zei = zh->reg->zei; + int normal = 0; + int optimized = 0; - if ( ( temp_policy =='N' ) || /* always from memory */ - ( ( temp_policy =='A' ) && /* automatic */ - (zh->reg->key_file_no == 1) && /* this is first time */ - (final) ) ) /* and last (=only) time */ - { /* go directly from memory */ - zh->reg->key_file_no =0; /* signal not to read files */ - zebra_index_merge(zh); - zh->reg->ptr_i = 0; - zh->reg->key_buf_used = 0; - return; + if (!zh->reg->key_block) + { + int mem = 1024*1024 * atoi( res_get_def( zh->res, "memmax", "8")); + const char *key_tmp_dir = res_get_def(zh->res, "keyTmpDir", "."); + int use_threads = atoi(res_get_def(zh->res, "threads", "1")); + zh->reg->key_block = key_block_create(mem, key_tmp_dir, use_threads); } - /* Not doing directly from memory, write into a temp file */ - extract_get_fname_tmp (zh, out_fname, zh->reg->key_file_no); - - if (!(outf = fopen (out_fname, "wb"))) + if (ins_keys) { - yaz_log (YLOG_FATAL|YLOG_ERRNO, "fopen %s", out_fname); - exit (1); + extract_rec_keys_adjust(zh, 1, ins_keys); + if (!del_keys) + zebraExplain_recordCountIncrement(zei, 1); + zebra_rec_keys_rewind(ins_keys); } - yaz_log (YLOG_LOG, "writing section %d", zh->reg->key_file_no); - prevcp = cp = (zh->reg->key_buf)[zh->reg->ptr_top - ptr_i]; - - encode_key_init (&encode_info); - encode_key_write (cp, &encode_info, outf); - - while (--ptr_i > 0) + if (del_keys) { - cp = (zh->reg->key_buf)[zh->reg->ptr_top - ptr_i]; - if (strcmp (cp, prevcp)) - { - encode_key_flush ( &encode_info, outf); - encode_key_init (&encode_info); - encode_key_write (cp, &encode_info, outf); - prevcp = cp; - } - else - encode_key_write (cp + strlen(cp), &encode_info, outf); + extract_rec_keys_adjust(zh, 0, del_keys); + if (!ins_keys) + zebraExplain_recordCountIncrement(zei, -1); + zebra_rec_keys_rewind(del_keys); } - encode_key_flush ( &encode_info, outf); -#else - qsort (key_buf + ptr_top-ptr_i, ptr_i, sizeof(char*), key_x_compare); - extract_get_fname_tmp (out_fname, key_file_no); - if (!(outf = fopen (out_fname, "wb"))) - { - yaz_log (YLOG_FATAL|YLOG_ERRNO, "fopen %s", out_fname); - exit (1); - } - yaz_log (YLOG_LOG, "writing section %d", key_file_no); - i = ptr_i; - prevcp = key_buf[ptr_top-i]; while (1) - if (!--i || strcmp (prevcp, key_buf[ptr_top-i])) + { + size_t del_slen; + const char *del_str; + struct it_key del_key_in; + int del = 0; + + size_t ins_slen; + const char *ins_str; + struct it_key ins_key_in; + int ins = 0; + + if (del_keys) + del = zebra_rec_keys_read(del_keys, &del_str, &del_slen, + &del_key_in); + if (ins_keys) + ins = zebra_rec_keys_read(ins_keys, &ins_str, &ins_slen, + &ins_key_in); + + if (del && ins && ins_rank == del_rank + && !key_compare(&del_key_in, &ins_key_in) + && ins_slen == del_slen && !memcmp(del_str, ins_str, del_slen)) { - key_y_len = strlen(prevcp)+1; -#if 0 - yaz_log (YLOG_LOG, "key_y_len: %2d %02x %02x %s", - key_y_len, prevcp[0], prevcp[1], 2+prevcp); -#endif - qsort (key_buf + ptr_top-ptr_i, ptr_i - i, - sizeof(char*), key_y_compare); - cp = key_buf[ptr_top-ptr_i]; - --key_y_len; - encode_key_init (&encode_info); - encode_key_write (cp, &encode_info, outf); - while (--ptr_i > i) - { - cp = key_buf[ptr_top-ptr_i]; - encode_key_write (cp+key_y_len, &encode_info, outf); - } - encode_key_flush ( &encode_info, outf); - if (!i) - break; - prevcp = key_buf[ptr_top-ptr_i]; + optimized++; + continue; } -#endif - if (fclose (outf)) - { - yaz_log (YLOG_FATAL|YLOG_ERRNO, "fclose %s", out_fname); - exit (1); - } - yaz_log (YLOG_LOG, "finished section %d", zh->reg->key_file_no); - zh->reg->ptr_i = 0; - zh->reg->key_buf_used = 0; + if (!del && !ins) + break; + + normal++; + if (del) + key_block_write(zh->reg->key_block, sysno, + &del_key_in, 0, del_str, del_slen, + del_rank, zh->m_staticrank); + if (ins) + key_block_write(zh->reg->key_block, sysno, + &ins_key_in, 1, ins_str, ins_slen, + ins_rank, zh->m_staticrank); + } + yaz_log(log_level_extract, "normal=%d optimized=%d", normal, optimized); } -ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh, - zebra_rec_keys_t reckeys, - zebra_snippets *snippets) + +ZEBRA_RES zebra_rec_keys_to_snippets1(ZebraHandle zh, + zebra_rec_keys_t reckeys, + zebra_snippets *snippets) { NMEM nmem = nmem_create(); if (zebra_rec_keys_rewind(reckeys)) @@ -1586,21 +1499,21 @@ ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh, struct it_key key; while (zebra_rec_keys_read(reckeys, &str, &slen, &key)) { - char dst_buf[IT_MAX_WORD]; - char *dst_term = dst_buf; - int ord, seqno; - int index_type; - assert(key.len <= 4 && key.len > 2); - seqno = (int) key.mem[key.len-1]; - ord = key.mem[0]; + char *dst_term = 0; + int ord; + zint seqno; + const char *index_type; + + assert(key.len <= IT_KEY_LEVEL_MAX && key.len > 2); + seqno = key.mem[key.len-1]; + ord = CAST_ZINT_TO_INT(key.mem[0]); zebraExplain_lookup_ord(zh->reg->zei, ord, &index_type, - 0/* db */, 0/* set */, 0/* use */, - 0 /* string_index */); + 0/* db */, 0 /* string_index */); assert(index_type); zebra_term_untrans_iconv(zh, nmem, index_type, &dst_term, str); - zebra_snippets_append(snippets, seqno, ord, dst_term); + zebra_snippets_append(snippets, seqno, 0, ord, dst_term); nmem_reset(nmem); } } @@ -1619,160 +1532,122 @@ void print_rec_keys(ZebraHandle zh, zebra_rec_keys_t reckeys) while (zebra_rec_keys_read(reckeys, &str, &slen, &key)) { char dst_buf[IT_MAX_WORD]; - int seqno; - int index_type; + zint seqno; + const char *index_type; + int ord = CAST_ZINT_TO_INT(key.mem[0]); const char *db = 0; - assert(key.len <= 4 && key.len > 2); + assert(key.len <= IT_KEY_LEVEL_MAX && key.len > 2); - zebraExplain_lookup_ord(zh->reg->zei, - key.mem[0], &index_type, &db, 0, 0, 0); + zebraExplain_lookup_ord(zh->reg->zei, ord, &index_type, &db, 0); - seqno = (int) key.mem[key.len-1]; + seqno = key.mem[key.len-1]; zebra_term_untrans(zh, index_type, dst_buf, str); - yaz_log(YLOG_LOG, "ord=" ZINT_FORMAT " seqno=%d term=%s", - key.mem[0], seqno, dst_buf); + yaz_log(YLOG_LOG, "ord=%d seqno=" ZINT_FORMAT + " term=%s", ord, seqno, dst_buf); } } } -void extract_add_index_string (RecWord *p, const char *str, int length) +static void extract_add_index_string(RecWord *p, zinfo_index_category_t cat, + const char *str, int length) { struct it_key key; - ZebraHandle zh = p->extractCtrl->handle; ZebraExplainInfo zei = zh->reg->zei; - int ch; + int ch, i; - 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 - { -#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->index_type, - p->attrSet, p->attrUse); -#endif - } - key.len = 4; - key.mem[0] = ch; - key.mem[1] = p->record_id; - key.mem[2] = p->section_id; - key.mem[3] = p->seqno; + ch = zebraExplain_lookup_attr_str(zei, cat, p->index_type, p->index_name); + if (ch < 0) + ch = zebraExplain_add_attr_str(zei, cat, p->index_type, p->index_name); -#if 0 - if (1) - { - char strz[80]; - int i; - - strz[0] = 0; - for (i = 0; iattrSet, p->attrUse, p->record_id, p->section_id, p->seqno, - strz); - } -#endif + i = 0; + key.mem[i++] = ch; + key.mem[i++] = p->record_id; + key.mem[i++] = p->section_id; + + if (zh->m_segment_indexing) + key.mem[i++] = p->segment; + key.mem[i++] = p->seqno; + key.len = i; zebra_rec_keys_write(zh->reg->keys, str, length, &key); } -#if NATTR -static void extract_add_sort_string (RecWord *p, const char *str, int length) +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; + zinfo_index_category_t cat = zinfo_index_category_sort; - 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; + ch = zebraExplain_lookup_attr_str(zei, cat, p->index_type, p->index_name); + if (ch < 0) + ch = zebraExplain_add_attr_str(zei, cat, p->index_type, p->index_name); + key.len = 2; key.mem[0] = ch; key.mem[1] = p->record_id; - key.mem[2] = p->section_id; - key.mem[3] = p->seqno; zebra_rec_keys_write(zh->reg->sortKeys, str, length, &key); } -#else -static void extract_add_sort_string (RecWord *p, const char *str, int length) + +static void extract_add_staticrank_string(RecWord *p, + const char *str, int length) { - ZebraHandle zh = p->extractCtrl->handle; - struct sortKeys *sk = &zh->reg->sortKeys; - int off = 0; + char valz[40]; + struct recExtractCtrl *ctrl = p->extractCtrl; + + if (length > sizeof(valz)-1) + length = sizeof(valz)-1; + + memcpy(valz, str, length); + valz[length] = '\0'; + ctrl->staticrank = atozint(valz); +} + +static void extract_add_string(RecWord *p, zebra_map_t zm, + const char *string, int length) +{ + assert(length > 0); + + if (!p->index_name) + return; - while (off < sk->buf_used) + if (zebra_maps_is_index(zm)) { - int set, use, slen; - - 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; + extract_add_index_string(p, zinfo_index_category_index, + string, length); + if (zebra_maps_is_alwaysmatches(zm)) + { + RecWord word; + memcpy(&word, p, sizeof(word)); + + word.seqno = 1; + extract_add_index_string( + &word, zinfo_index_category_alwaysmatches, "", 0); + } } - assert (off == sk->buf_used); - - if (sk->buf_used + IT_MAX_WORD > sk->buf_max) + else if (zebra_maps_is_sort(zm)) { - char *b; - - b = (char *) xmalloc (sk->buf_max += 128000); - if (sk->buf_used > 0) - memcpy (b, sk->buf, sk->buf_used); - xfree (sk->buf); - sk->buf = b; + extract_add_sort_string(p, string, length); + } + else if (zebra_maps_is_staticrank(zm)) + { + extract_add_staticrank_string(p, string, length); } - off += key_SU_encode(p->attrSet, sk->buf + off); - off += key_SU_encode(p->attrUse, sk->buf + off); - off += key_SU_encode(length, sk->buf + off); - 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->index_type)) - extract_add_sort_string (p, string, length); - else - extract_add_index_string (p, string, length); } -static void extract_add_incomplete_field (RecWord *p) +static void extract_add_incomplete_field(RecWord *p, zebra_map_t zm) { const char *b = p->term_buf; int remain = p->term_len; + int first = 1; const char **map = 0; - 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->index_type, &b, remain, 0); + map = zebra_maps_input(zm, &b, remain, 0); while (map) { @@ -1784,8 +1659,7 @@ 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->index_type, &b, - remain, 0); + map = zebra_maps_input(zm, &b, remain, 0); else map = 0; } @@ -1800,29 +1674,37 @@ 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->index_type, &b, remain, 0); + map = zebra_maps_input(zm, &b, remain, 0); else map = 0; } if (!i) return; - extract_add_string (p, buf, i); + + if (first) + { + first = 0; + if (zebra_maps_is_first_in_field(zm)) + { + /* first in field marker */ + extract_add_string(p, zm, FIRST_IN_FIELD_STR, FIRST_IN_FIELD_LEN); + p->seqno++; + } + } + extract_add_string(p, zm, buf, i); p->seqno++; } } -static void extract_add_complete_field (RecWord *p) +static void extract_add_complete_field(RecWord *p, zebra_map_t zm) { const char *b = p->term_buf; char buf[IT_MAX_WORD+1]; const char **map = 0; int i = 0, remain = p->term_len; - yaz_log(YLOG_DEBUG, "Complete field, w='%.*s'", - p->term_len, p->term_buf); - if (remain > 0) - map = zebra_maps_input (p->zebra_maps, p->index_type, &b, remain, 1); + map = zebra_maps_input(zm, &b, remain, 1); while (remain > 0 && i < IT_MAX_WORD) { @@ -1833,7 +1715,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->index_type, &b, remain, first); + map = zebra_maps_input(zm, &b, remain, first); } else map = 0; @@ -1855,15 +1737,13 @@ static void extract_add_complete_field (RecWord *p) { if (i >= IT_MAX_WORD) break; - yaz_log(YLOG_DEBUG, "Adding string to index '%d'", **map); while (i < IT_MAX_WORD && *cp) buf[i++] = *(cp++); } remain = p->term_len - (b - p->term_buf); if (remain > 0) { - map = zebra_maps_input (p->zebra_maps, p->index_type, &b, - remain, 0); + map = zebra_maps_input(zm, &b, remain, 0); } else map = 0; @@ -1871,28 +1751,67 @@ static void extract_add_complete_field (RecWord *p) } if (!i) return; - extract_add_string (p, buf, i); + extract_add_string(p, zm, buf, i); +} + +static void extract_add_icu(RecWord *p, zebra_map_t zm) +{ + const char *res_buf = 0; + size_t res_len = 0; + + zebra_map_tokenize_start(zm, p->term_buf, p->term_len); + while (zebra_map_tokenize_next(zm, &res_buf, &res_len, 0, 0)) + { + extract_add_string(p, zm, res_buf, res_len); + p->seqno++; + } } -void extract_token_add (RecWord *p) + +/** \brief top-level indexing handler for recctrl system + \param p token data to be indexed + + Call sequence: + extract_token_add + extract_add_{in}_complete / extract_add_icu + extract_add_string + + extract_add_index_string + or + extract_add_sort_string + or + extract_add_staticrank_string + +*/ +static void extract_token_add(RecWord *p) { + ZebraHandle zh = p->extractCtrl->handle; + zebra_map_t zm = zebra_map_get_or_add(zh->reg->zebra_maps, p->index_type); WRBUF wrbuf; -#if 0 - yaz_log (YLOG_LOG, "token_add " - "reg_type=%c attrSet=%d attrUse=%d seqno=%d s=%.*s", - p->reg_type, p->attrSet, p->attrUse, p->seqno, p->length, - p->string); -#endif - if ((wrbuf = zebra_replace(p->zebra_maps, p->index_type, 0, - p->term_buf, p->term_len))) + + if (log_level_details) + { + yaz_log(log_level_details, "extract_token_add " + "type=%s index=%s seqno=" ZINT_FORMAT " s=%.*s", + p->index_type, p->index_name, + p->seqno, p->term_len, p->term_buf); + } + if ((wrbuf = zebra_replace(zm, 0, p->term_buf, p->term_len))) { - p->term_buf = wrbuf_buf(wrbuf); - p->term_len = wrbuf_len(wrbuf); + p->term_buf = wrbuf_buf(wrbuf); + p->term_len = wrbuf_len(wrbuf); + } + if (zebra_maps_is_icu(zm)) + { + extract_add_icu(p, zm); } - if (zebra_maps_is_complete (p->zebra_maps, p->index_type)) - extract_add_complete_field (p); else - extract_add_incomplete_field(p); + { + if (zebra_maps_is_complete(zm)) + extract_add_complete_field(p, zm); + else + extract_add_incomplete_field(p, zm); + } } static void extract_set_store_data_cb(struct recExtractCtrl *p, @@ -1920,242 +1839,48 @@ static void extract_set_store_data_prepare(struct recExtractCtrl *p) p->setStoreData = extract_set_store_data_cb; } -void extract_schema_add (struct recExtractCtrl *p, Odr_oid *oid) +static void extract_schema_add(struct recExtractCtrl *p, Odr_oid *oid) { ZebraHandle zh = (ZebraHandle) p->handle; - zebraExplain_addSchema (zh->reg->zei, oid); -} - -#if NATTR -#error not done yet with zebra_rec_keys_t -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) -{ - SortIdx sortIdx = zh->reg->sortIdx; - int off = 0; - - sortIdx_sysno (sortIdx, sysno); - - while (off < sk->buf_used) - { - int set, use, slen; - - 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) - sortIdx_add(sortIdx, sk->buf + off, slen); - else - sortIdx_add(sortIdx, "", 1); - off += slen; - } -} -#endif - -void encode_key_init (struct encode_info *i) -{ - i->sysno = 0; - i->seqno = 0; - i->cmd = -1; - i->prevsys=0; - i->prevseq=0; - i->prevcmd=-1; - i->keylen=0; - i->encode_handle = iscz1_start(); - i->decode_handle = iscz1_start(); + zebraExplain_addSchema(zh->reg->zei, oid); } -#define OLDENCODE 1 - -#ifdef OLDENCODE -/* this is the old encode_key_write - * may be deleted once we are confident that the new works - * HL 15-oct-2002 - */ -void encode_key_write (char *k, struct encode_info *i, FILE *outf) +void extract_flush_sort_keys(ZebraHandle zh, zint sysno, + int cmd, zebra_rec_keys_t reckeys) { - struct it_key key; - char *bp = i->buf, *bp0; - const char *src = (char *) &key; - - /* copy term to output buf */ - while ((*bp++ = *k++)) - ; - /* and copy & align key so we can mangle */ - memcpy (&key, k+1, sizeof(struct it_key)); /* *k is insert/delete */ - #if 0 - /* debugging */ - key_logdump_txt(YLOG_LOG, &key, *k ? "i" : "d"); + yaz_log(YLOG_LOG, "extract_flush_sort_keys cmd=%d sysno=" ZINT_FORMAT, + cmd, sysno); + extract_rec_keys_log(zh, cmd, reckeys, YLOG_LOG); #endif - assert(key.mem[0] >= 0); - bp0 = bp++; - iscz1_encode(i->encode_handle, &bp, &src); - - *bp0 = (*k * 128) + bp - bp0 - 1; /* length and insert/delete combined */ - if (fwrite (i->buf, bp - i->buf, 1, outf) != 1) - { - yaz_log (YLOG_FATAL|YLOG_ERRNO, "fwrite"); - exit (1); - } - -#if 0 - /* debugging */ - if (1) + if (zebra_rec_keys_rewind(reckeys)) { - struct it_key key2; - const char *src = bp0+1; - char *dst = (char*) &key2; - iscz1_decode(i->decode_handle, &dst, &src); - - key_logdump_txt(YLOG_LOG, &key2, *k ? "i" : "d"); - - assert(key2.mem[1]); - } -#endif -} - -void encode_key_flush (struct encode_info *i, FILE *outf) -{ - iscz1_stop(i->encode_handle); - iscz1_stop(i->decode_handle); -} - -#else - -/* new encode_key_write - * The idea is to buffer one more key, and compare them - * If we are going to delete and insert the same key, - * we may as well not bother. Should make a difference in - * updates with small modifications (appending to a mbox) - */ -void encode_key_write (char *k, struct encode_info *i, FILE *outf) -{ - struct it_key key; - char *bp; + zebra_sort_index_t si = zh->reg->sort_index; + size_t slen; + const char *str; + struct it_key key_in; - if (*k) /* first time for new key */ - { - bp = i->buf; - while ((*bp++ = *k++)) - ; - i->keylen= bp - i->buf -1; - assert(i->keylen+1+sizeof(struct it_key) < ENCODE_BUFLEN); - } - else - { - bp=i->buf + i->keylen; - *bp++=0; - k++; - } + zebra_sort_sysno(si, sysno); - memcpy (&key, k+1, sizeof(struct it_key)); - if (0==i->prevsys) /* no previous filter, fill up */ - { - i->prevsys=key.sysno; - i->prevseq=key.seqno; - i->prevcmd=*k; - } - else if ( (i->prevsys==key.sysno) && - (i->prevseq==key.seqno) && - (i->prevcmd!=*k) ) - { /* same numbers, diff cmd, they cancel out */ - i->prevsys=0; - } - else - { /* different stuff, write previous, move buf */ - bp = encode_key_int ( (i->prevsys - i->sysno) * 2 + i->prevcmd, bp); - if (i->sysno != i->prevsys) - { - i->sysno = i->prevsys; - i->seqno = 0; - } - else if (!i->seqno && !i->prevseq && i->cmd == i->prevcmd) - { - return; /* ??? Filters some sort of duplicates away */ - /* ??? Can this ever happen -H 15oct02 */ - } - bp = encode_key_int (i->prevseq - i->seqno, bp); - i->seqno = i->prevseq; - i->cmd = i->prevcmd; - if (fwrite (i->buf, bp - i->buf, 1, outf) != 1) + while (zebra_rec_keys_read(reckeys, &str, &slen, &key_in)) { - yaz_log (YLOG_FATAL|YLOG_ERRNO, "fwrite"); - exit (1); + int ord = CAST_ZINT_TO_INT(key_in.mem[0]); + + zebra_sort_type(si, ord); + if (cmd == 1) + zebra_sort_add(si, str, slen); + else + zebra_sort_delete(si); } - i->keylen=0; /* ok, it's written, forget it */ - i->prevsys=key.sysno; - i->prevseq=key.seqno; - i->prevcmd=*k; } } -void encode_key_flush (struct encode_info *i, FILE *outf) -{ /* flush the last key from i */ - char *bp =i->buf + i->keylen; - if (0==i->prevsys) - { - return; /* nothing to flush */ - } - *bp++=0; - bp = encode_key_int ( (i->prevsys - i->sysno) * 2 + i->prevcmd, bp); - if (i->sysno != i->prevsys) - { - i->sysno = i->prevsys; - i->seqno = 0; - } - else if (!i->seqno && !i->prevseq && i->cmd == i->prevcmd) - { - return; /* ??? Filters some sort of duplicates away */ - /* ??? Can this ever happen -H 15oct02 */ - } - bp = encode_key_int (i->prevseq - i->seqno, bp); - i->seqno = i->prevseq; - i->cmd = i->prevcmd; - if (fwrite (i->buf, bp - i->buf, 1, outf) != 1) - { - yaz_log (YLOG_FATAL|YLOG_ERRNO, "fwrite"); - exit (1); - } - i->keylen=0; /* ok, it's written, forget it */ - i->prevsys=0; /* forget the values too */ - i->prevseq=0; -} -#endif +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +