X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fextract.c;h=8189504a7d32c91eedf2e925b8a82006651b76f9;hp=86f868b3a9e7c355a1b6c92e29ed1bf4ee6448d4;hb=c33ea56e3771c3b80ba66ef8fda3a09cad171ebb;hpb=f7a3769dede0071696bdcc13ae2ee1efe6d52d96 diff --git a/index/extract.c b/index/extract.c index 86f868b..8189504 100644 --- a/index/extract.c +++ b/index/extract.c @@ -1,4 +1,4 @@ -/* $Id: extract.c,v 1.214 2006-05-18 12:03:05 adam Exp $ +/* $Id: extract.c,v 1.229 2006-09-08 14:40:52 adam Exp $ Copyright (C) 1995-2006 Index Data ApS @@ -15,9 +15,9 @@ 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 + */ #include @@ -36,18 +36,36 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include -#ifdef WIN32 -#define PRINTF_OFF_T "%I64d" -#else -/* !WIN32 */ -#if SIZEOF_OFF_T == SIZEOF_LONG_LONG -#define PRINTF_OFF_T "%lld" -#else -#define PRINTF_OFF_T "%ld" -#endif +#define ENCODE_BUFLEN 768 +struct encode_info { + void *encode_handle; + void *decode_handle; + char buf[ENCODE_BUFLEN]; +}; -#endif +static int log_level = 0; +static int log_level_initialized = 0; +static void zebra_init_log_level() +{ + if (!log_level_initialized) + { + log_level = yaz_log_module_level("extract"); + log_level_initialized = 1; + } +} + +static void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno, + int cmd, zebra_rec_keys_t reckeys, + zint staticrank); +static void extract_flushSortKeys (ZebraHandle zh, SYSNO 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 encode_key_init (struct encode_info *i); +static void encode_key_write (char *k, struct encode_info *i, FILE *outf); +static void encode_key_flush (struct encode_info *i, FILE *outf); #define USE_SHELLSORT 0 @@ -81,65 +99,68 @@ static void logRecord (ZebraHandle 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 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); 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_name = "any"; w->index_type = 'w'; w->extractCtrl = p; w->record_id = 0; w->section_id = 0; + w->segment = 0; } 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; @@ -151,71 +172,6 @@ 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, @@ -236,9 +192,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++) @@ -251,7 +205,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++) ; @@ -261,18 +217,8 @@ 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 != ')') { @@ -384,7 +330,6 @@ static void init_extractCtrl(ZebraHandle zh, struct recExtractCtrl *ctrl) else ctrl->seqno[i] = 0; } - ctrl->zebra_maps = zh->reg->zebra_maps; ctrl->flagShowRecords = !zh->m_flag_rw; } @@ -392,358 +337,11 @@ static void all_matches_add(struct recExtractCtrl *ctrl) { RecWord word; extract_init(ctrl, &word); - word.index_name = "allrecords"; + word.index_name = "_ALLRECORDS"; word.index_type = 'w'; word.seqno = 1; - extract_add_index_string (&word, "", 0); -} - -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) -{ - const char *match_str_to_print = ""; - 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); - - zebra_rec_keys_reset(zh->reg->sortKeys); - 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; - } - all_matches_add(&extractCtrl); - if (extractCtrl.match_criteria[0]) - matchStr = extractCtrl.match_criteria; - } - - /* if matchStr is set now - we assume it's printable . - For internal matchStr (see below) we don't print */ - if (matchStr) - match_str_to_print = matchStr; - - /* perform internal match if sysno not known and if match criteria is - specified already */ - 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"); - - if (zebra_rec_keys_empty(zh->reg->keys)) - { - yaz_log(YLOG_WARN, "And no index keys"); - } - 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) - { - yaz_log(YLOG_LOG, "add %s %s " PRINTF_OFF_T - " " ZINT_FORMAT " %s" , - zh->m_record_type, - fname, recordOffset, *sysno, match_str_to_print); - } - 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); - } - - - extract_flushSortKeys (zh, *sysno, 1, zh->reg->sortKeys); - 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(); - - zebra_rec_keys_t sortKeys = zebra_rec_keys_open(); - - 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); - - zebra_rec_keys_set_buf(sortKeys, - rec->info[recInfo_sortKeys], - rec->size[recInfo_sortKeys], - 0); - extract_flushSortKeys (zh, *sysno, 0, sortKeys); - 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) - { - yaz_log(YLOG_LOG, "delete %s %s " PRINTF_OFF_T - " " ZINT_FORMAT " %s" , - zh->m_record_type, - fname, recordOffset, *sysno, match_str_to_print); - } - 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_rm (&rec); - logRecord (zh); - return ZEBRA_OK; - } - 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 - " " ZINT_FORMAT " %s" , - zh->m_record_type, - fname, recordOffset, *sysno, match_str_to_print); - } - recordAttr->staticrank = extractCtrl.staticrank; - extract_flushSortKeys (zh, *sysno, 1, zh->reg->sortKeys); - extract_flushRecordKeys (zh, *sysno, 1, zh->reg->keys, - recordAttr->staticrank); - zh->records_updated++; - } - zebra_rec_keys_close(delkeys); - zebra_rec_keys_close(sortKeys); - } - /* 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]); - - zebra_rec_keys_get_buf(zh->reg->sortKeys, - &rec->info[recInfo_sortKeys], - &rec->size[recInfo_sortKeys]); - - /* 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); - - /* 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); - } - if (read (fi->fd, rec->info[recInfo_storeData], recordAttr->recordSize) - < recordAttr->recordSize) - { - yaz_log (YLOG_ERRNO|YLOG_FATAL, "read %d bytes of %s", - recordAttr->recordSize, fname); - exit (1); - } - } - else - { - rec->info[recInfo_storeData] = NULL; - rec->size[recInfo_storeData] = 0; - } - /* update database name */ - xfree (rec->info[recInfo_databaseName]); - rec->info[recInfo_databaseName] = - rec_strdup (zh->basenames[0], &rec->size[recInfo_databaseName]); - - /* update offset */ - recordAttr->recordOffset = recordOffset; - - /* commit this record */ - rec_put (zh->reg->records, &rec); - logRecord (zh); - return ZEBRA_OK; + extract_add_index_string (&word, zinfo_index_category_alwaysmatches, + "", 0); } ZEBRA_RES zebra_extract_file(ZebraHandle zh, SYSNO *sysno, const char *fname, @@ -754,17 +352,20 @@ ZEBRA_RES zebra_extract_file(ZebraHandle zh, SYSNO *sysno, const char *fname, 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); - yaz_log (YLOG_DEBUG, "fileExtract %s", fname); + yaz_log(log_level, "zebra_extract_file %s", fname); /* determine file extension */ *ext = '\0'; @@ -812,7 +413,10 @@ ZEBRA_RES zebra_extract_file(ZebraHandle zh, SYSNO *sysno, const char *fname, yaz_log(YLOG_WARN, "Bad filter version: %s", zh->m_record_type); } if (sysno && deleteFlag) - fd = -1; + { + streamp = 0; + fi = 0; + } else { char full_rep[1024]; @@ -832,19 +436,21 @@ ZEBRA_RES zebra_extract_file(ZebraHandle zh, SYSNO *sysno, const char *fname, zh->m_record_type = original_record_type; return ZEBRA_FAIL; } + streamp = &stream; + zebra_create_stream_fd(streamp, fd, 0); } - 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); - } + r = zebra_extract_record_stream(zh, streamp, + deleteFlag, + 0, /* tst_mode */ + zh->m_record_type, + sysno, + 0, /*match_criteria */ + fname, + 1, /* force_update */ + 1, /* allow_update */ + recType, recTypeClientData); if (r != ZEBRA_OK) { break; @@ -854,9 +460,8 @@ ZEBRA_RES zebra_extract_file(ZebraHandle zh, SYSNO *sysno, const char *fname, break; } } - file_read_stop (fi); - if (fd != -1) - close (fd); + if (streamp) + stream.destroy(streamp); zh->m_record_type = original_record_type; return r; } @@ -867,61 +472,26 @@ 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, + int delete_flag, + int test_mode, + const char *recordType, + SYSNO *sysno, + const char *match_criteria, + const char *fname, + int force_update, + int allow_update) { - 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; + RecType recType = 0; - zebra_rec_keys_reset(zh->reg->keys); - zebra_rec_keys_reset(zh->reg->sortKeys); - - 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); + yaz_log(log_level, "Record type explicitly specified: %s", recordType); recType = recType_byName (zh->reg->recTypes, zh->res, recordType, &clientData); } @@ -932,7 +502,8 @@ ZEBRA_RES buffer_extract_record(ZebraHandle zh, 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); + yaz_log(log_level, "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; @@ -943,41 +514,111 @@ ZEBRA_RES buffer_extract_record(ZebraHandle zh, 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); - r = (*recType->extract)(clientData, &extractCtrl); - if (r == RECCTRL_EXTRACT_EOF) - return ZEBRA_FAIL; - else if (r == RECCTRL_EXTRACT_ERROR_GENERIC) + zebra_create_stream_mem(&stream, buf, buf_size); + + res = zebra_extract_record_stream(zh, &stream, + delete_flag, + test_mode, + recordType, + sysno, + match_criteria, + fname, + force_update, + allow_update, + recType, clientData); + stream.destroy(&stream); + return res; +} + + +ZEBRA_RES zebra_extract_record_stream(ZebraHandle zh, + struct ZebraRecStream *stream, + int delete_flag, + int test_mode, + const char *recordType, + SYSNO *sysno, + const char *match_criteria, + const char *fname, + int force_update, + int allow_update, + RecType recType, + void *recTypeClientData) + +{ + SYSNO sysno0 = 0; + RecordAttr *recordAttr; + struct recExtractCtrl extractCtrl; + int r; + const char *matchStr = 0; + Record rec; + off_t start_offset = 0; + const char *pr_fname = fname; /* filename to print .. */ + int show_progress = zh->records_processed < 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: generic"); - return ZEBRA_FAIL; + if (zebraExplain_newDatabase (zh->reg->zei, zh->basenames[0], + zh->m_explain_database)) + return ZEBRA_FAIL; } - else if (r == RECCTRL_EXTRACT_ERROR_NO_SUCH_FILTER) + + if (stream) { - /* error occured during extraction ... */ - yaz_log (YLOG_WARN, "extract error: no such filter"); - return ZEBRA_FAIL; - } + off_t null_offset = 0; + extractCtrl.stream = stream; + + start_offset = stream->tellf(stream); - all_matches_add(&extractCtrl); + extractCtrl.first_record = start_offset ? 0 : 1; - if (extractCtrl.match_criteria[0]) - match_criteria = extractCtrl.match_criteria; + 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; + + + init_extractCtrl(zh, &extractCtrl); + + extract_set_store_data_prepare(&extractCtrl); + + r = (*recType->extract)(recTypeClientData, &extractCtrl); + + if (r == RECCTRL_EXTRACT_EOF) + return ZEBRA_FAIL; + else if (r == RECCTRL_EXTRACT_ERROR_GENERIC) + { + /* error occured during extraction ... */ + yaz_log (YLOG_WARN, "extract error: generic"); + return ZEBRA_FAIL; + } + else if (r == RECCTRL_EXTRACT_ERROR_NO_SUCH_FILTER) + { + /* error occured during extraction ... */ + yaz_log (YLOG_WARN, "extract error: no such filter"); + return ZEBRA_FAIL; + } + + all_matches_add(&extractCtrl); + + if (extractCtrl.match_criteria[0]) + match_criteria = extractCtrl.match_criteria; + } if (!sysno) { sysno = &sysno0; @@ -1020,14 +661,14 @@ ZEBRA_RES buffer_extract_record(ZebraHandle zh, /* new record */ if (delete_flag) { - 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); yaz_log (YLOG_WARN, "cannot delete record above (seems new)"); return ZEBRA_FAIL; } if (show_progress) - yaz_log (YLOG_LOG, "add %s %s %ld", recordType, pr_fname, - (long) recordOffset); + yaz_log (YLOG_LOG, "add %s %s " ZINT_FORMAT, recordType, pr_fname, + (zint) start_offset); rec = rec_new (zh->reg->records); *sysno = rec->sysno; @@ -1055,8 +696,8 @@ ZEBRA_RES buffer_extract_record(ZebraHandle zh, zebra_rec_keys_t sortKeys = zebra_rec_keys_open(); if (!allow_update) { - 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; } @@ -1083,16 +724,16 @@ ZEBRA_RES buffer_extract_record(ZebraHandle zh, /* record going to be deleted */ 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) { @@ -1108,8 +749,8 @@ ZEBRA_RES buffer_extract_record(ZebraHandle zh, else { if (show_progress) - yaz_log (YLOG_LOG, "update %s %s %ld", recordType, - pr_fname, (long) recordOffset); + yaz_log(YLOG_LOG, "update %s %s " ZINT_FORMAT, recordType, + pr_fname, (zint) ZINT_FORMAT); recordAttr->staticrank = extractCtrl.staticrank; extract_flushSortKeys (zh, *sysno, 1, zh->reg->sortKeys); extract_flushRecordKeys (zh, *sysno, 1, zh->reg->keys, @@ -1152,15 +793,19 @@ ZEBRA_RES buffer_extract_record(ZebraHandle zh, /* 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) + { + off_t end_offset = stream->endf(stream, 0); + + if (!end_offset) + end_offset = stream->tellf(stream); + else + stream->seekf(stream, end_offset); + + recordAttr->recordSize = end_offset - start_offset; + zebraExplain_recordBytesIncrement(zh->reg->zei, + recordAttr->recordSize); + } /* set run-number for this record */ recordAttr->runNumber = @@ -1178,10 +823,15 @@ ZEBRA_RES buffer_extract_record(ZebraHandle zh, } 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); + stream->seekf(stream, start_offset); + stream->readf(stream, rec->info[recInfo_storeData], + recordAttr->recordSize); + stream->seekf(stream, cur_offset); } else { @@ -1194,7 +844,7 @@ ZEBRA_RES buffer_extract_record(ZebraHandle zh, 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); @@ -1202,7 +852,7 @@ ZEBRA_RES buffer_extract_record(ZebraHandle 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; @@ -1268,8 +918,7 @@ int explain_extract (void *handle, Record rec, data1_node *n) zebra_rec_keys_get_buf(zh->reg->sortKeys, &rec->info[recInfo_sortKeys], &rec->size[recInfo_sortKeys]); - - return 0; + return ZEBRA_OK; } void extract_rec_keys_adjust(ZebraHandle zh, int is_insert, @@ -1291,7 +940,7 @@ void extract_rec_keys_adjust(ZebraHandle zh, int is_insert, struct it_key key_in; while(zebra_rec_keys_read(reckeys, &str, &slen, &key_in)) { - int ord = key_in.mem[0]; + int ord = CAST_ZINT_TO_INT(key_in.mem[0]); for (p = ord_list; p ; p = p->next) if (p->ord == ord) @@ -1359,10 +1008,11 @@ void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno, while(zebra_rec_keys_read(reckeys, &str, &slen, &key_in)) { int ch = 0; + int i, j = 0; struct it_key key_out; - zint *keyp = key_out.mem; - assert(key_in.len == 4); + assert(key_in.len >= 2); + assert(key_in.len <= IT_KEY_LEVEL_MAX); /* check for buffer overflow */ if (zh->reg->key_buf_used + 1024 > @@ -1374,8 +1024,11 @@ 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; + /* key_in.mem[0] ord/ch */ + /* key_in.mem[1] filter specified record ID */ + /* encode the ordinal value (field/use/attribute) .. */ - ch = (int) key_in.mem[0]; + ch = CAST_ZINT_TO_INT(key_in.mem[0]); zh->reg->key_buf_used += key_SU_encode(ch, (char*)zh->reg->key_buf + zh->reg->key_buf_used); @@ -1396,19 +1049,17 @@ void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno, (long) staticrank); staticrank = 0; } - *keyp++ = staticrank; - key_out.len = 4; + key_out.mem[j++] = staticrank; } - else - key_out.len = 3; if (key_in.mem[1]) /* filter specified record ID */ - *keyp++ = key_in.mem[1]; + key_out.mem[j++] = key_in.mem[1]; else - *keyp++ = sysno; - *keyp++ = key_in.mem[2]; /* section_id */ - *keyp++ = key_in.mem[3]; /* sequence .. */ - + key_out.mem[j++] = sysno; + for (i = 2; i < key_in.len; i++) + key_out.mem[j++] = key_in.mem[i]; + key_out.len = j; + memcpy((char*)zh->reg->key_buf + zh->reg->key_buf_used, &key_out, sizeof(key_out)); (zh->reg->key_buf_used) += sizeof(key_out); @@ -1432,19 +1083,14 @@ void extract_flushWriteKeys (ZebraHandle zh, int final) #endif if (!zh->reg->key_buf || ptr_i <= 0) { - yaz_log (YLOG_DEBUG, " nothing to flush section=%d buf=%p i=%d", + yaz_log(log_level, " 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", + yaz_log(log_level, " 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, @@ -1564,15 +1210,16 @@ ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh, { char dst_buf[IT_MAX_WORD]; char *dst_term = dst_buf; - int ord, seqno; + int ord; + zint seqno; int index_type; - assert(key.len <= 4 && key.len > 2); - seqno = (int) key.mem[key.len-1]; - ord = key.mem[0]; + + 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); @@ -1595,72 +1242,45 @@ 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; + zint seqno; int 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); } @@ -1668,74 +1288,66 @@ void extract_add_index_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 - { -#if NATTR - return; -#else - ch = zebraExplain_lookup_attr_su(zei, p->index_type, - VAL_IDXPATH, p->attrUse); - if (ch < 0) - ch = zebraExplain_add_attr_su(zei, p->index_type, - VAL_IDXPATH, p->attrUse); -#endif - } - 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; -#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 zebra_rec_keys_write(zh->reg->sortKeys, str, length, &key); } -void extract_add_string (RecWord *p, const char *string, int length) +static void extract_add_string(RecWord *p, const char *string, int length) { + ZebraHandle zh = p->extractCtrl->handle; assert (length > 0); - if (zebra_maps_is_sort (p->zebra_maps, p->index_type)) - extract_add_sort_string (p, string, length); + + if (!p->index_name) + return; + + if (zebra_maps_is_sort(zh->reg->zebra_maps, p->index_type)) + extract_add_sort_string(p, string, length); else - extract_add_index_string (p, string, length); + { + extract_add_index_string(p, zinfo_index_category_index, + string, length); + if (zebra_maps_is_alwaysmatches(zh->reg->zebra_maps, p->index_type)) + { + RecWord word; + memcpy(&word, p, sizeof(word)); + + word.seqno = 1; + extract_add_index_string( + &word, zinfo_index_category_alwaysmatches, "", 0); + } + } } -static void extract_add_incomplete_field (RecWord *p) +static void extract_add_incomplete_field(RecWord *p) { + ZebraHandle zh = p->extractCtrl->handle; const char *b = p->term_buf; int remain = p->term_len; 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(zh->reg->zebra_maps, p->index_type, &b, remain, 0); + if (map) + { + if (zebra_maps_is_first_in_field(zh->reg->zebra_maps, p->index_type)) + { + /* first in field marker */ + extract_add_string(p, FIRST_IN_FIELD_STR, FIRST_IN_FIELD_LEN); + p->seqno++; + } + } while (map) { char buf[IT_MAX_WORD+1]; @@ -1746,7 +1358,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, + map = zebra_maps_input(zh->reg->zebra_maps, p->index_type, &b, remain, 0); else map = 0; @@ -1762,7 +1374,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->index_type, &b, remain, 0); + map = zebra_maps_input(zh->reg->zebra_maps, p->index_type, &b, remain, 0); else map = 0; } @@ -1775,16 +1387,14 @@ static void extract_add_incomplete_field (RecWord *p) static void extract_add_complete_field (RecWord *p) { + ZebraHandle zh = 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; - 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 (zh->reg->zebra_maps, p->index_type, &b, remain, 1); while (remain > 0 && i < IT_MAX_WORD) { @@ -1795,7 +1405,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(zh->reg->zebra_maps, p->index_type, &b, remain, first); } else map = 0; @@ -1817,14 +1427,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, + map = zebra_maps_input (zh->reg->zebra_maps, p->index_type, &b, remain, 0); } else @@ -1836,22 +1445,25 @@ static void extract_add_complete_field (RecWord *p) extract_add_string (p, buf, i); } -void extract_token_add (RecWord *p) +static void extract_token_add(RecWord *p) { + ZebraHandle zh = p->extractCtrl->handle; 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, + + if (log_level) + { + yaz_log(log_level, "extract_token_add " + "type=%c 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(zh->reg->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->index_type)) + if (zebra_maps_is_complete (zh->reg->zebra_maps, p->index_type)) extract_add_complete_field (p); else extract_add_incomplete_field(p); @@ -1882,7 +1494,7 @@ 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); @@ -1902,7 +1514,7 @@ void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno, while (zebra_rec_keys_read(reckeys, &str, &slen, &key_in)) { - int ord = (int) key_in.mem[0]; + int ord = CAST_ZINT_TO_INT(key_in.mem[0]); sortIdx_type(sortIdx, ord); if (cmd == 1) @@ -1913,27 +1525,13 @@ void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno, } } -void encode_key_init (struct encode_info *i) +static 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(); } -#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) +static void encode_key_write (char *k, struct encode_info *i, FILE *outf) { struct it_key key; char *bp = i->buf, *bp0; @@ -1977,113 +1575,12 @@ void encode_key_write (char *k, struct encode_info *i, FILE *outf) #endif } -void encode_key_flush (struct encode_info *i, FILE *outf) +static 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; - - 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++; - } - - 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) - { - yaz_log (YLOG_FATAL|YLOG_ERRNO, "fwrite"); - exit (1); - } - 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