-/* $Id: extract.c,v 1.196 2005-10-28 07:25:30 adam Exp $
+/* $Id: extract.c,v 1.207 2006-04-05 02:11:44 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
#include <fcntl.h>
#include "index.h"
+#include "orddict.h"
#include <direntz.h>
#include <charmap.h>
}
static void searchRecordKey(ZebraHandle zh,
-#if NEW_REC_KEYS
zebra_rec_keys_t reckeys,
-#else
- const struct recKeys *reckeys,
-#endif
int attrSetS, int attrUseS,
const char **ws, int ws_length)
{
-#if NEW_REC_KEYS
-#else
- void *decode_handle = iscz1_start();
- int off = 0;
- int startSeq = -1;
- int seqno = 0;
-#endif
int i;
int ch;
if (ch < 0)
return ;
-#if NEW_REC_KEYS
if (zebra_rec_keys_rewind(reckeys))
{
int startSeq = -1;
}
}
}
-#else
- 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 && key.len > 2);
-
- seqno = (int) key.mem[key.len-1];
-
- if (key.mem[0] == ch)
- {
- int woff;
-
- if (startSeq == -1)
- startSeq = seqno;
- woff = seqno - startSeq;
- if (woff >= 0 && woff < ws_length)
- ws[woff] = src;
- }
-
- while (*src++)
- ;
- off = src - reckeys->buf;
- }
- iscz1_stop(decode_handle);
- assert (off == reckeys->buf_used);
-#endif
}
struct file_read_info {
}
}
+#define FILE_MATCH_BLANK "\t "
+
static char *fileMatchStr (ZebraHandle zh,
-#if NEW_REC_KEYS
zebra_rec_keys_t reckeys,
-#else
- struct recKeys *reckeys,
-#endif
const char *fname, const char *spec)
{
static char dstBuf[2048]; /* static here ??? */
while (1)
{
- while (*s == ' ' || *s == '\t')
- s++;
+ for (; *s && strchr(FILE_MATCH_BLANK, *s); s++)
+ ;
if (!*s)
break;
if (*s == '(')
char attset_str[64], attname_str[64];
data1_attset *attset;
int i;
- char matchFlag[32];
int attSet = 1, attUse = 1;
int first = 1;
-
- s++;
- for (i = 0; *s && *s != ',' && *s != ')'; s++)
- if (i < 63)
+
+ for (s++; strchr(FILE_MATCH_BLANK, *s); s++)
+ ;
+ for (i = 0; *s && *s != ',' && *s != ')' &&
+ !strchr(FILE_MATCH_BLANK, *s); s++)
+ if (i+1 < sizeof(attset_str))
attset_str[i++] = *s;
attset_str[i] = '\0';
-
+
+ for (; strchr(FILE_MATCH_BLANK, *s); s++)
+ ;
if (*s == ',')
{
- s++;
- for (i = 0; *s && *s != ')'; s++)
- if (i < 63)
+ for (s++; strchr(FILE_MATCH_BLANK, *s); s++)
+ ;
+ for (i = 0; *s && *s != ')' &&
+ !strchr(FILE_MATCH_BLANK, *s); s++)
+ if (i+1 < sizeof(attname_str))
attname_str[i++] = *s;
attname_str[i] = '\0';
}
}
searchRecordKey (zh, reckeys, attSet, attUse, ws, 32);
- if (*s == ')')
- {
- for (i = 0; i<32; i++)
- matchFlag[i] = 1;
- }
- else
+ if (*s != ')')
{
yaz_log (YLOG_WARN, "Missing ) in match criteria %s in group %s",
spec, zh->m_group ? zh->m_group : "none");
s++;
for (i = 0; i<32; i++)
- if (matchFlag[i] && ws[i])
+ if (ws[i])
{
if (first)
{
char special[64];
const char *spec_src = NULL;
const char *s1 = ++s;
- while (*s1 && *s1 != ' ' && *s1 != '\t')
+ while (*s1 && !strchr(FILE_MATCH_BLANK, *s1))
s1++;
spec_len = s1 - s;
- if (spec_len > 63)
- spec_len = 63;
+ if (spec_len > sizeof(special)-1)
+ spec_len = sizeof(special)-1;
memcpy (special, s, spec_len);
special[spec_len] = '\0';
s = s1;
while (*s && *s != stopMarker)
{
- if (i < 63)
+ if (i+1 < sizeof(tmpString))
tmpString[i++] = *s++;
}
if (*s)
struct recordGroup *rGroup;
};
-#if NEW_REC_KEYS
-#else
-void create_rec_keys_codec(struct recKeys *keys)
-{
- keys->buf_used = 0;
- iscz1_reset(keys->codec_handle);
-}
-#endif
-
static void init_extractCtrl(ZebraHandle zh, struct recExtractCtrl *ctrl)
{
int i;
ctrl->flagShowRecords = !zh->m_flag_rw;
}
-static int file_extract_record(ZebraHandle zh,
- SYSNO *sysno, const char *fname,
- int deleteFlag,
- struct file_read_info *fi,
- int force_update,
- RecType recType,
- void *recTypeClientData)
+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;
{
if (zebraExplain_newDatabase (zh->reg->zei, zh->basenames[0],
zh->m_explain_database))
- return 0;
+ return ZEBRA_FAIL;
}
if (fi->fd != -1)
{
/* we are going to read from a file, so prepare the extraction */
-#if NEW_REC_KEYS
zebra_rec_keys_reset(zh->reg->keys);
-#else
- create_rec_keys_codec(&zh->reg->keys);
-#endif
#if NATTR
-#if NEW_REC_KEYS
zebra_rec_keys_reset(zh->reg->sortKeys);
#else
- create_rec_keys_codec(&zh->reg->sortKeys);
-#endif
-#else
zh->reg->sortKeys.buf_used = 0;
#endif
recordOffset = fi->file_moffset;
yaz_log_init_prefix2 (0);
if (r == RECCTRL_EXTRACT_EOF)
- return 0;
+ return ZEBRA_FAIL;
else if (r == RECCTRL_EXTRACT_ERROR_GENERIC)
{
/* error occured during extraction ... */
yaz_log (YLOG_WARN, "fail %s %s " PRINTF_OFF_T, zh->m_record_type,
fname, recordOffset);
}
- return 0;
+ return ZEBRA_FAIL;
}
else if (r == RECCTRL_EXTRACT_ERROR_NO_SUCH_FILTER)
{
PRINTF_OFF_T, zh->m_record_type,
fname, recordOffset);
}
- return 0;
+ return ZEBRA_FAIL;
}
if (extractCtrl.match_criteria[0])
matchStr = extractCtrl.match_criteria;
if (matchStr == 0 && zh->m_record_id && *zh->m_record_id)
{
-#if NEW_REC_KEYS
matchStr = fileMatchStr (zh, zh->reg->keys, fname,
zh->m_record_id);
-#else
- matchStr = fileMatchStr (zh, &zh->reg->keys, fname,
- zh->m_record_id);
-#endif
if (!matchStr)
{
yaz_log(YLOG_WARN, "Bad match criteria");
- return 0;
+ return ZEBRA_FAIL;
}
}
if (matchStr)
{
- char *rinfo = dict_lookup (zh->reg->matchDict, 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));
}
}
}
- if (! *sysno
-#if NEW_REC_KEYS
- && zebra_rec_keys_empty(zh->reg->keys)
-#else
- && zh->reg->keys.buf_used == 0
-#endif
- )
+ 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 1;
+ 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 1;
+ return ZEBRA_OK;
}
if (! *sysno)
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 1;
+ return ZEBRA_OK;
}
if (zh->records_processed < zh->m_file_verbose_limit)
yaz_log (YLOG_LOG, "add %s %s " PRINTF_OFF_T, zh->m_record_type,
if (matchStr)
{
- dict_insert (zh->reg->matchDict, matchStr, sizeof(*sysno), sysno);
+ 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);
-#if NEW_REC_KEYS
+#endif
extract_flushRecordKeys (zh, *sysno, 1, zh->reg->keys,
recordAttr->staticrank);
-#else
- extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys,
- recordAttr->staticrank);
-#endif
zh->records_inserted++;
}
else
{
/* record already exists */
-#if NEW_REC_KEYS
zebra_rec_keys_t delkeys = zebra_rec_keys_open();
-#else
- struct recKeys delkeys;
-#endif
#if NATTR
-#if NEW_REC_KEYS
zebra_rec_keys_t sortKeys = zebra_rec_keys_open();
#else
- struct recKeys sortKeys;
-#endif
-#else
struct sortKeys sortKeys;
#endif
recordAttr = rec_init_attr (zh->reg->zei, rec);
-#if NEW_REC_KEYS
zebra_rec_keys_set_buf(delkeys,
rec->info[recInfo_delKeys],
rec->size[recInfo_delKeys],
0);
-#else
- /* flush old keys for sort&search etc. */
- delkeys.buf_used = rec->size[recInfo_delKeys];
- delkeys.buf = rec->info[recInfo_delKeys];
-#endif
-#if NEW_REC_KEYS && NATTR
+#if NATTR
zebra_rec_keys_set_buf(sortKeys,
rec->info[recInfo_sortKeys],
rec->size[recInfo_sortKeys],
extract_flushSortKeys (zh, *sysno, 0, &sortKeys);
#endif
-#if NEW_REC_KEYS
extract_flushRecordKeys (zh, *sysno, 0, delkeys,
recordAttr->staticrank); /* old values */
-#else
- extract_flushRecordKeys (zh, *sysno, 0, &delkeys,
- recordAttr->staticrank); /* old values */
-#endif
if (deleteFlag)
{
/* record going to be deleted */
- if (
-#if NEW_REC_KEYS
- zebra_rec_keys_empty(delkeys)
-#else
- !delkeys.buf_used
-#endif
- )
+ if (zebra_rec_keys_empty(delkeys))
{
yaz_log (YLOG_LOG, "delete %s %s " PRINTF_OFF_T,
zh->m_record_type, fname, recordOffset);
- yaz_log (YLOG_WARN, "cannot delete file above, storeKeys false");
+ yaz_log (YLOG_WARN, "cannot delete file above, storeKeys false (1)");
}
else
{
zh->m_record_type, fname, recordOffset);
zh->records_deleted++;
if (matchStr)
- dict_delete (zh->reg->matchDict, 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 1;
+ return ZEBRA_OK;
}
else
{
- /* record going to be updated */
- if (
-#if NEW_REC_KEYS
- zebra_rec_keys_empty(delkeys)
-#else
- !delkeys.buf_used
-#endif
- )
- {
+ /* flush new keys for sort&search etc */
+ if (zh->records_processed < zh->m_file_verbose_limit)
yaz_log (YLOG_LOG, "update %s %s " PRINTF_OFF_T,
zh->m_record_type, fname, recordOffset);
- yaz_log (YLOG_WARN, "cannot update file above, storeKeys false");
- }
- else
- {
- /* flush new keys for sort&search etc */
- if (zh->records_processed < zh->m_file_verbose_limit)
- yaz_log (YLOG_LOG, "update %s %s " PRINTF_OFF_T,
- zh->m_record_type, fname, recordOffset);
- recordAttr->staticrank = extractCtrl.staticrank;
- extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys);
-#if NEW_REC_KEYS
- extract_flushRecordKeys (zh, *sysno, 1, zh->reg->keys,
- recordAttr->staticrank);
+ recordAttr->staticrank = extractCtrl.staticrank;
+#if NATTR
+ extract_flushSortKeys (zh, *sysno, 1, zh->reg->sortKeys);
#else
- extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys,
- recordAttr->staticrank);
+ extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys);
#endif
- zh->records_updated++;
- }
+ extract_flushRecordKeys (zh, *sysno, 1, zh->reg->keys,
+ recordAttr->staticrank);
+ zh->records_updated++;
}
-#if NEW_REC_KEYS
zebra_rec_keys_close(delkeys);
-#endif
-#if NATTR && NEW_REC_KWYS
+#if NATTR
zebra_rec_keys_close(sortKeys);
#endif
}
/* update delete keys */
xfree (rec->info[recInfo_delKeys]);
- if (
-#if NEW_REC_KEYS
- !zebra_rec_keys_empty(zh->reg->keys)
-#else
- zh->reg->keys.buf_used > 0
-#endif
- && zh->m_store_keys == 1)
+ if (!zebra_rec_keys_empty(zh->reg->keys) && zh->m_store_keys == 1)
{
-#if NEW_REC_KEYS
zebra_rec_keys_get_buf(zh->reg->keys,
&rec->info[recInfo_delKeys],
&rec->size[recInfo_delKeys]);
-#else
-
- rec->size[recInfo_delKeys] = zh->reg->keys.buf_used;
- rec->info[recInfo_delKeys] = zh->reg->keys.buf;
- zh->reg->keys.buf = NULL;
- zh->reg->keys.buf_max = 0;
-#endif
}
else
{
/* 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,
/* commit this record */
rec_put (zh->reg->records, &rec);
logRecord (zh);
- return 1;
+ return ZEBRA_OK;
}
-int fileExtract (ZebraHandle zh, SYSNO *sysno, const char *fname,
- int deleteFlag)
+ZEBRA_RES zebra_extract_file(ZebraHandle zh, SYSNO *sysno, const char *fname,
+ int deleteFlag)
{
- int r, i, fd;
+ ZEBRA_RES r = ZEBRA_OK;
+ int i, fd;
char gprefix[128];
char ext[128];
char ext_res[128];
&recTypeClientData)))
{
yaz_log(YLOG_WARN, "No such record type: %s", zh->m_record_type);
- return 0;
+ return ZEBRA_FAIL;
}
switch(recType->version)
else
strcpy (full_rep, fname);
-
if ((fd = open (full_rep, O_BINARY|O_RDONLY)) == -1)
{
yaz_log (YLOG_WARN|YLOG_ERRNO, "open %s", full_rep);
zh->m_record_type = original_record_type;
- return 0;
+ return ZEBRA_FAIL;
}
}
fi = file_read_start (fd);
- do
+ while(1)
{
fi->file_moffset = fi->file_offset;
fi->file_more = 0; /* file_end not called (yet) */
fi->file_offset = fi->file_moffset;
lseek(fi->fd, fi->file_moffset, SEEK_SET);
}
+ if (r != ZEBRA_OK)
+ {
+ break;
+ }
+ if (sysno)
+ {
+ break;
+ }
}
- while (r && !sysno);
file_read_stop (fi);
if (fd != -1)
close (fd);
int force_update,
int allow_update)
{
+ SYSNO sysno0 = 0;
RecordAttr *recordAttr;
struct recExtractCtrl extractCtrl;
int r;
extractCtrl.first_record = 1;
extractCtrl.fh = &fc;
-#if NEW_REC_KEYS
zebra_rec_keys_reset(zh->reg->keys);
-#else
- create_rec_keys_codec(&zh->reg->keys);
-#endif
+
#if NATTR
-#if NEW_REC_KEYS
zebra_rec_keys_reset(zh->reg->sortKeys);
#else
- create_rec_keys_codec(&zh->reg->sortKeys);
-#endif
-#else
zh->reg->sortKeys.buf_used = 0;
#endif
if (zebraExplain_curDatabase (zh->reg->zei, zh->basenames[0]))
if (!recType)
{
- yaz_log (YLOG_WARN, "No such record type: %s", zh->m_record_type);
+ yaz_log (YLOG_WARN, "No such record type: %s", recordType);
return ZEBRA_FAIL;
}
yaz_log (YLOG_WARN, "extract error: no such filter");
return ZEBRA_FAIL;
}
- /* match criteria */
- matchStr = NULL;
if (extractCtrl.match_criteria[0])
match_criteria = extractCtrl.match_criteria;
- if (! *sysno) {
- char *rinfo;
+ if (!sysno) {
+
+ sysno = &sysno0;
+
if (match_criteria && *match_criteria) {
matchStr = match_criteria;
} else {
if (zh->m_record_id && *zh->m_record_id) {
-#if NEW_REC_KEYS
matchStr = fileMatchStr (zh, zh->reg->keys, pr_fname,
zh->m_record_id);
-#else
- matchStr = fileMatchStr (zh, &zh->reg->keys, pr_fname,
- zh->m_record_id);
-#endif
if (!matchStr)
{
yaz_log (YLOG_WARN, "Bad match criteria (recordID)");
}
}
}
- if (matchStr) {
- rinfo = dict_lookup (zh->reg->matchDict, matchStr);
+ 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));
}
}
}
- if (
-#if NEW_REC_KEYS
- zebra_rec_keys_empty(zh->reg->keys)
-#else
- zh->reg->keys.buf_used == 0
-#endif
-)
+ if (zebra_rec_keys_empty(zh->reg->keys))
{
/* the extraction process returned no information - the record
is probably empty - unless flagShowRecords is in use */
/* new record */
if (delete_flag)
{
- if (show_progress)
- yaz_log (YLOG_LOG, "delete %s %s %ld", recordType,
+ yaz_log (YLOG_LOG, "delete %s %s %ld", recordType,
pr_fname, (long) recordOffset);
yaz_log (YLOG_WARN, "cannot delete record above (seems new)");
return ZEBRA_FAIL;
if (matchStr)
{
- dict_insert (zh->reg->matchDict, matchStr,
- sizeof(*sysno), sysno);
+ 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
-#if NEW_REC_KEYS
#if 0
print_rec_keys(zh, zh->reg->keys);
#endif
extract_flushRecordKeys (zh, *sysno, 1, zh->reg->keys,
recordAttr->staticrank);
-#else
-#if 0
- print_rec_keys(zh, &zh->reg->keys);
-#endif
- extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys,
- recordAttr->staticrank);
-#endif
-
zh->records_inserted++;
}
else
{
/* record already exists */
-#if NEW_REC_KEYS
zebra_rec_keys_t delkeys = zebra_rec_keys_open();
-#else
- struct recKeys delkeys;
-#endif
#if NATTR
- struct recKeys sortKeys;
+ zebra_rec_keys_t sortKeys = zebra_rec_keys_open();
#else
struct sortKeys sortKeys;
#endif
if (!allow_update)
{
- if (show_progress)
- yaz_log (YLOG_LOG, "skipped %s %s %ld",
+ yaz_log (YLOG_LOG, "skipped %s %s %ld",
recordType, pr_fname, (long) recordOffset);
logRecord(zh);
return ZEBRA_FAIL;
recordAttr = rec_init_attr (zh->reg->zei, rec);
-#if NEW_REC_KEYS
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
- delkeys.buf_used = rec->size[recInfo_delKeys];
- delkeys.buf = rec->info[recInfo_delKeys];
-#endif
sortKeys.buf_used = rec->size[recInfo_sortKeys];
sortKeys.buf = rec->info[recInfo_sortKeys];
+#endif
-#if NEW_REC_KEYS && NATTR
+#if NATTR
extract_flushSortKeys (zh, *sysno, 0, sortKeys);
#else
extract_flushSortKeys (zh, *sysno, 0, &sortKeys);
#endif
-#if NEW_REC_KEYS
extract_flushRecordKeys (zh, *sysno, 0, delkeys,
recordAttr->staticrank);
-#else
- extract_flushRecordKeys (zh, *sysno, 0, &delkeys,
- recordAttr->staticrank);
-#endif
if (delete_flag)
{
/* record going to be deleted */
- if (
-#if NEW_REC_KEYS
- zebra_rec_keys_empty(delkeys)
-#else
- !delkeys.buf_used
-#endif
- )
+ if (zebra_rec_keys_empty(delkeys))
{
- if (show_progress)
- {
- yaz_log (YLOG_LOG, "delete %s %s %ld", recordType,
- pr_fname, (long) recordOffset);
- yaz_log (YLOG_WARN, "cannot delete file above, "
- "storeKeys false");
- }
+ yaz_log (YLOG_LOG, "delete %s %s %ld", recordType,
+ pr_fname, (long) recordOffset);
+ yaz_log (YLOG_WARN, "cannot delete file above, "
+ "storeKeys false (3)");
}
else
{
pr_fname, (long) recordOffset);
zh->records_deleted++;
if (matchStr)
- dict_delete (zh->reg->matchDict, 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);
}
else
{
- /* record going to be updated */
- if (
-#if NEW_REC_KEYS
- zebra_rec_keys_empty(delkeys)
-#else
- !delkeys.buf_used
-#endif
- )
- {
- if (show_progress)
- {
- yaz_log (YLOG_LOG, "update %s %s %ld", recordType,
- pr_fname, (long) recordOffset);
- yaz_log (YLOG_WARN, "cannot update file above, storeKeys false");
- }
- }
- else
- {
- if (show_progress)
+ if (show_progress)
yaz_log (YLOG_LOG, "update %s %s %ld", recordType,
pr_fname, (long) recordOffset);
- recordAttr->staticrank = extractCtrl.staticrank;
- extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys);
-#if NEW_REC_KEYS
- extract_flushRecordKeys (zh, *sysno, 1, zh->reg->keys,
- recordAttr->staticrank);
+ recordAttr->staticrank = extractCtrl.staticrank;
+#if NATTR
+ extract_flushSortKeys (zh, *sysno, 1, zh->reg->sortKeys);
#else
- extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys,
- recordAttr->staticrank);
+ extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys);
#endif
- zh->records_updated++;
- }
+ extract_flushRecordKeys (zh, *sysno, 1, zh->reg->keys,
+ recordAttr->staticrank);
+ zh->records_updated++;
}
-#if NEW_REC_KEYS
zebra_rec_keys_close(delkeys);
-#endif
-#if NEW_REC_KEYS && NATTR
+#if NATTR
zebra_rec_keys_close(sortKeys);
#endif
}
/* update delete keys */
xfree (rec->info[recInfo_delKeys]);
- if (
-#if NEW_REC_KEYS
- !zebra_rec_keys_empty(zh->reg->keys)
-#else
- zh->reg->keys.buf_used > 0
-#endif
- && zh->m_store_keys == 1)
+ if (!zebra_rec_keys_empty(zh->reg->keys) && zh->m_store_keys == 1)
{
-#if NEW_REC_KEYS
zebra_rec_keys_get_buf(zh->reg->keys,
&rec->info[recInfo_delKeys],
&rec->size[recInfo_delKeys]);
-#else
-
- rec->size[recInfo_delKeys] = zh->reg->keys.buf_used;
- rec->info[recInfo_delKeys] = zh->reg->keys.buf;
- zh->reg->keys.buf = NULL;
- zh->reg->keys.buf_max = 0;
-#endif
}
else
{
/* 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,
abort ();
}
-#if NEW_REC_KEYS
zebra_rec_keys_reset(zh->reg->keys);
-#else
- create_rec_keys_codec(&zh->reg->keys);
-#endif
#if NATTR
-#if NEW_REC_KEYS
zebra_rec_keys_reset(zh->reg->sortKeys);
#else
- create_rec_keys_codec(&zh->reg->sortKeys);
-#endif
-#else
zh->reg->sortKeys.buf_used = 0;
#endif
extractCtrl.init = extract_init;
if (rec->size[recInfo_delKeys])
{
-#if NEW_REC_KEYS
zebra_rec_keys_t delkeys = zebra_rec_keys_open();
-#else
- struct recKeys delkeys;
-#endif
-
+
#if NATTR
-#if NEW_REC_KEYS
- zebra_rec_keys_t sortkeys = zzebra_rec_keys_open();
-#else
- struct recKeys sortkeys;
-#endif
+ zebra_rec_keys_t sortkeys = zebra_rec_keys_open();
#else
struct sortKeys sortkeys;
#endif
-#if NEW_REC_KEYS
zebra_rec_keys_set_buf(delkeys, rec->info[recInfo_delKeys],
rec->size[recInfo_delKeys],
0);
extract_flushRecordKeys (zh, rec->sysno, 0, delkeys, 0);
zebra_rec_keys_close(delkeys);
-#else
- delkeys.buf_used = rec->size[recInfo_delKeys];
- delkeys.buf = rec->info[recInfo_delKeys];
- extract_flushRecordKeys (zh, rec->sysno, 0, &delkeys, 0);
-#endif
-#if NATTR && NEW_REC_KEYS
+#if NATTR
zebra_rec_keys_set_buf(sortkeys, rec->info[recInfo_sortKeys],
rec->size[recInfo_sortKeys],
0);
extract_flushSortKeys (zh, rec->sysno, 0, &sortkeys);
#endif
}
-#if NEW_REC_KEYS
extract_flushRecordKeys (zh, rec->sysno, 1, zh->reg->keys, 0);
-#else
- extract_flushRecordKeys (zh, rec->sysno, 1, &zh->reg->keys, 0);
-#endif
-#if NATTR && NEW_REC_KEYS
+#if NATTR
extract_flushSortKeys (zh, rec->sysno, 1, zh->reg->sortKeys);
#else
extract_flushSortKeys (zh, rec->sysno, 1, &zh->reg->sortKeys);
#endif
xfree (rec->info[recInfo_delKeys]);
-#if NEW_REC_KEYS
zebra_rec_keys_get_buf(zh->reg->keys,
&rec->info[recInfo_delKeys],
&rec->size[recInfo_delKeys]);
-#else
- rec->size[recInfo_delKeys] = zh->reg->keys.buf_used;
- rec->info[recInfo_delKeys] = zh->reg->keys.buf;
- zh->reg->keys.buf = NULL;
- zh->reg->keys.buf_max = 0;
-#endif
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
return 0;
}
void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
int cmd,
-#if NEW_REC_KEYS
zebra_rec_keys_t reckeys,
-#else
- struct recKeys *reckeys,
-#endif
zint staticrank)
{
-#if NEW_REC_KEYS
-#else
- void *decode_handle = iscz1_start();
- int off = 0;
- int ch = 0;
-#endif
ZebraExplainInfo zei = zh->reg->zei;
if (!zh->reg->key_buf)
}
zebraExplain_recordCountIncrement (zei, cmd ? 1 : -1);
-#if NEW_REC_KEYS
if (zebra_rec_keys_rewind(reckeys))
{
size_t slen;
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;
}
(zh->reg->key_buf_used) += sizeof(key_out);
}
}
-#else
- while (off < reckeys->buf_used)
- {
- const char *src = reckeys->buf + off;
- struct it_key key_in;
- struct it_key key_out;
- char *dst = (char*) &key_in;
- zint *keyp = key_out.mem;
-
- iscz1_decode(decode_handle, &dst, &src);
- assert(key_in.len == 4);
-
- 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;
-
- ch = (int) key_in.mem[0]; /* ordinal for field/use/attribute */
-
- zh->reg->key_buf_used +=
- key_SU_encode(ch, ((char*)zh->reg->key_buf) +
- zh->reg->key_buf_used);
- while (*src)
- ((char*)zh->reg->key_buf) [(zh->reg->key_buf_used)++] = *src++;
- src++;
- ((char*)(zh->reg->key_buf))[(zh->reg->key_buf_used)++] = '\0';
- ((char*)(zh->reg->key_buf))[(zh->reg->key_buf_used)++] = cmd;
-
- if (zh->m_staticrank) /* rank config enabled ? */
- {
- *keyp++ = staticrank;
- key_out.len = 4;
- }
- else
- key_out.len = 3;
-
- if (key_in.mem[1]) /* filter specified record ID */
- *keyp++ = key_in.mem[1];
- else
- *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);
- off = src - reckeys->buf;
- }
- assert (off == reckeys->buf_used);
- iscz1_stop(decode_handle);
-#endif
}
void extract_flushWriteKeys (ZebraHandle zh, int final)
zh->reg->key_buf_used = 0;
}
-#if NEW_REC_KEYS
-void extract_add_it_key (ZebraHandle zh,
- zebra_rec_keys_t *keys,
- int reg_type,
- const char *str, int slen, struct it_key *key)
-{
- zebra_rec_keys_write(*keys, reg_type, str, slen, key);
-}
-#else
-void extract_add_it_key (ZebraHandle zh,
- struct recKeys *keys,
- int reg_type,
- const char *str, int slen, struct it_key *key)
-{
- char *dst;
- const char *src = (char*) key;
-
- if (keys->buf_used+1024 > keys->buf_max)
- {
- char *b = (char *) xmalloc (keys->buf_max += 128000);
- if (keys->buf_used > 0)
- memcpy (b, keys->buf, keys->buf_used);
- xfree (keys->buf);
- keys->buf = b;
- }
- dst = keys->buf + keys->buf_used;
-
- iscz1_encode(keys->codec_handle, &dst, &src);
-
-#if REG_TYPE_PREFIX
- *dst++ = reg_type;
-#endif
- memcpy (dst, str, slen);
- dst += slen;
- *dst++ = '\0';
- keys->buf_used = dst - keys->buf;
-}
-#endif
-
ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh,
-#if NEW_REC_KEYS
zebra_rec_keys_t reckeys,
-#else
- struct recKeys *reckeys,
-#endif
zebra_snippets *snippets)
{
NMEM nmem = nmem_create();
-
-#if NEW_REC_KEYS
if (zebra_rec_keys_rewind(reckeys))
{
const char *str;
ord = key.mem[0];
zebraExplain_lookup_ord(zh->reg->zei, ord, &index_type,
- 0/* db */, 0/* set */, 0/* use */);
+ 0/* db */, 0/* set */, 0/* use */,
+ 0 /* string_index */);
assert(index_type);
zebra_term_untrans_iconv(zh, nmem, index_type,
&dst_term, str);
nmem_reset(nmem);
}
}
-#else
- int off = 0;
- int seqno = 0;
- void *decode_handle = iscz1_start();
- assert(reckeys->buf);
- while (off < reckeys->buf_used)
- {
- const char *src = reckeys->buf + off;
- struct it_key key;
- char *dst = (char*) &key;
- char dst_buf[IT_MAX_WORD];
- char *dst_term = dst_buf;
- int index_type = 0, ord;
-
- iscz1_decode(decode_handle, &dst, &src);
- assert(key.len <= 4 && key.len > 2);
-
- seqno = (int) key.mem[key.len-1];
- ord = key.mem[0];
-
- zebraExplain_lookup_ord(zh->reg->zei, ord, &index_type,
- 0/* db */, 0/* set */, 0/* use */);
- assert(index_type);
- zebra_term_untrans_iconv(zh, nmem, index_type,
- &dst_term, src);
- zebra_snippets_append(snippets, seqno, ord, dst_term);
- while (*src++)
- ;
- off = src - reckeys->buf;
- nmem_reset(nmem);
- }
- iscz1_stop(decode_handle);
-#endif
nmem_destroy(nmem);
return ZEBRA_OK;
}
-void print_rec_keys(ZebraHandle zh,
-#if NEW_REC_KEYS
- zebra_rec_keys_t reckeys
-#else
- struct recKeys *reckeys
-#endif
-)
+void print_rec_keys(ZebraHandle zh, zebra_rec_keys_t reckeys)
{
-#if NEW_REC_KEYS
yaz_log(YLOG_LOG, "print_rec_keys");
if (zebra_rec_keys_rewind(reckeys))
{
assert(key.len <= 4 && key.len > 2);
zebraExplain_lookup_ord(zh->reg->zei,
- key.mem[0], &index_type, &db, 0, 0);
+ key.mem[0], &index_type, &db, 0, 0, 0);
seqno = (int) key.mem[key.len-1];
key.mem[0], seqno, dst_buf);
}
}
-#else
- int off = 0;
- int seqno = 0;
- void *decode_handle = iscz1_start();
- yaz_log(YLOG_LOG, "print_rec_keys buf=%p sz=%d", reckeys->buf,
- reckeys->buf_used);
- assert(reckeys->buf);
- while (off < reckeys->buf_used)
- {
- const char *src = reckeys->buf + off;
- struct it_key key;
- char *dst = (char*) &key;
- char dst_buf[IT_MAX_WORD];
- int index_type;
- const char *db = 0;
-
- iscz1_decode(decode_handle, &dst, &src);
- assert(key.len <= 4 && key.len > 2);
-
- seqno = (int) key.mem[key.len-1];
-
- zebraExplain_lookup_ord(zh->reg->zei,
- key.mem[0], &index_type, &db, 0, 0);
-
- zebra_term_untrans(zh, index_type, dst_buf, src);
-
- yaz_log(YLOG_LOG, "ord=" ZINT_FORMAT " seqno=%d term=%s",
- key.mem[0], seqno, dst_buf);
- while (*src++)
- ;
- off = src - reckeys->buf;
- }
- iscz1_stop(decode_handle);
-#endif
}
void extract_add_index_string (RecWord *p, const char *str, int length)
key.mem[3] = p->seqno;
#if 0
- /* just for debugging .. */
- yaz_log(YLOG_LOG, "add: set=%d use=%d "
- "record_id=%lld section_id=%lld seqno=%lld",
- p->attrSet, p->attrUse, p->record_id, p->section_id, p->seqno);
+ if (1)
+ {
+ char strz[80];
+ int i;
+
+ strz[0] = 0;
+ for (i = 0; i<length && i < 20; i++)
+ sprintf(strz+strlen(strz), "%02X", str[i] & 0xff);
+ /* just for debugging .. */
+ yaz_log(YLOG_LOG, "add: set=%d use=%d "
+ "record_id=%lld section_id=%lld seqno=%lld %s",
+ p->attrSet, p->attrUse, p->record_id, p->section_id, p->seqno,
+ strz);
+ }
#endif
- extract_add_it_key(p->extractCtrl->handle,
- &zh->reg->keys,
- p->index_type, str,
- length, &key);
+ zebra_rec_keys_write(zh->reg->keys, str, length, &key);
}
#if NATTR
key.mem[2] = p->section_id;
key.mem[3] = p->seqno;
- extract_add_it_key(p->extractCtrl->handle,
- &zh->reg->sortKeys,
- p->index_type, str,
- length, &key);
+ zebra_rec_keys_write(zh->reg->sortKeys, str, length, &key);
}
#else
static void extract_add_sort_string (RecWord *p, const char *str, int length)
}
#if NATTR
+#error not done yet with zebra_rec_keys_t
void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
int cmd, struct recKeys *reckeys)
{
i->prevcmd=-1;
i->keylen=0;
i->encode_handle = iscz1_start();
+ i->decode_handle = iscz1_start();
}
#define OLDENCODE 1
/* 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");
+#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)
+ {
+ 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)
-{ /* dummy routine */
+{
iscz1_stop(i->encode_handle);
+ iscz1_stop(i->decode_handle);
}
#else