-/* $Id: extract.c,v 1.184 2005-06-07 11:36:38 adam Exp $
+/* $Id: extract.c,v 1.189 2005-08-18 12:50:17 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
#include <ctype.h>
#ifdef WIN32
#include <io.h>
-#else
+#endif
+#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <fcntl.h>
{
w->zebra_maps = p->zebra_maps;
w->seqno = 1;
+#if NATTR
+#else
w->attrSet = VAL_BIB1;
w->attrUse = 1016;
- w->attrStr = 0;
- w->reg_type = 'w';
+#endif
+ w->index_name = 0;
+ w->index_type = 'w';
w->extractCtrl = p;
w->record_id = 0;
w->section_id = 0;
}
-static const char **searchRecordKey (ZebraHandle zh,
- struct recKeys *reckeys,
- int attrSetS, int attrUseS)
+static void searchRecordKey(ZebraHandle zh,
+ const struct recKeys *reckeys,
+ int attrSetS, int attrUseS,
+ const char **ws, int ws_length)
{
- static const char *ws[32];
void *decode_handle = iscz1_start();
int off = 0;
int startSeq = -1;
int seqno = 0;
int i;
+ int ch;
- for (i = 0; i<32; i++)
+ for (i = 0; i<ws_length; i++)
ws[i] = NULL;
+ ch = zebraExplain_lookup_attr_su_any_index(zh->reg->zei,
+ attrSetS, attrUseS);
+ if (ch < 0)
+ return ;
+
while (off < reckeys->buf_used)
{
const char *src = reckeys->buf + off;
struct it_key key;
char *dst = (char*) &key;
- int attrSet, attrUse;
iscz1_decode(decode_handle, &dst, &src);
assert(key.len <= 4 && key.len > 2);
- attrSet = (int) key.mem[0] >> 16;
- attrUse = (int) key.mem[0] & 65535;
seqno = (int) key.mem[key.len-1];
- if (attrUseS == attrUse && attrSetS == attrSet)
+ if (key.mem[0] == ch)
{
int woff;
if (startSeq == -1)
startSeq = seqno;
woff = seqno - startSeq;
- if (woff >= 0 && woff < 31)
+ if (woff >= 0 && woff < ws_length)
ws[woff] = src;
}
}
iscz1_stop(decode_handle);
assert (off == reckeys->buf_used);
- return ws;
}
struct file_read_info {
static char dstBuf[2048]; /* static here ??? */
char *dst = dstBuf;
const char *s = spec;
- static const char **w;
while (1)
{
break;
if (*s == '(')
{
+ const char *ws[32];
char attset_str[64], attname_str[64];
data1_attset *attset;
int i;
else
attUse = atoi (attname_str);
}
- w = searchRecordKey (zh, reckeys, attSet, attUse);
- assert (w);
+ searchRecordKey (zh, reckeys, attSet, attUse, ws, 32);
if (*s == ')')
{
s++;
for (i = 0; i<32; i++)
- if (matchFlag[i] && w[i])
+ if (matchFlag[i] && ws[i])
{
if (first)
{
*dst++ = ' ';
first = 0;
}
- strcpy (dst, w[i]);
- dst += strlen(w[i]);
+ strcpy (dst, ws[i]);
+ dst += strlen(ws[i]);
}
if (first)
{
SYSNO sysnotmp;
Record rec;
off_t recordOffset = 0;
+ struct recExtractCtrl extractCtrl;
/* announce database */
if (zebraExplain_curDatabase (zh->reg->zei, zh->basenames[0]))
if (fi->fd != -1)
{
- struct recExtractCtrl extractCtrl;
-
/* we are going to read from a file, so prepare the extraction */
create_rec_keys_codec(&zh->reg->keys);
-
+#if NATTR
+ create_rec_keys_codec(&zh->reg->sortKeys);
+#else
zh->reg->sortKeys.buf_used = 0;
-
+#endif
recordOffset = fi->file_moffset;
extractCtrl.handle = zh;
extractCtrl.offset = fi->file_moffset;
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);
return 0;
}
if (extractCtrl.match_criteria[0])
- matchStr = extractCtrl.match_criteria;
+ matchStr = extractCtrl.match_criteria;
}
/* perform match if sysno not known and if match criteria is specified */
*sysno = rec->sysno;
recordAttr = rec_init_attr (zh->reg->zei, rec);
+ recordAttr->staticrank = extractCtrl.staticrank;
if (matchStr)
{
dict_insert (zh->reg->matchDict, matchStr, sizeof(*sysno), sysno);
}
extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys);
- extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys);
+ extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys,
+ recordAttr->staticrank);
zh->records_inserted++;
}
{
/* record already exists */
struct recKeys delkeys;
+#if NATTR
+ struct recKeys sortKeys;
+#else
struct sortKeys sortKeys;
+#endif
rec = rec_get (zh->reg->records, *sysno);
assert (rec);
logRecord (zh);
return 1;
}
+ /* flush old keys for sort&search etc. */
delkeys.buf_used = rec->size[recInfo_delKeys];
delkeys.buf = rec->info[recInfo_delKeys];
sortKeys.buf = rec->info[recInfo_sortKeys];
extract_flushSortKeys (zh, *sysno, 0, &sortKeys);
- extract_flushRecordKeys (zh, *sysno, 0, &delkeys);
+ extract_flushRecordKeys (zh, *sysno, 0, &delkeys,
+ recordAttr->staticrank); /* old values */
if (deleteFlag)
{
/* record going to be deleted */
}
else
{
+ /* flush new keys for sort&search etc */
if (zh->records_processed < zh->m_file_verbose_limit)
yaz_log (YLOG_LOG, "update %s %s " PRINTF_OFF_T,
zh->m_record_type, fname, recordOffset);
+ recordAttr->staticrank = extractCtrl.staticrank;
extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys);
- extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys);
+ extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys,
+ recordAttr->staticrank);
zh->records_updated++;
}
}
extractCtrl.fh = &fc;
create_rec_keys_codec(&zh->reg->keys);
-
+#if NATTR
+ create_rec_keys_codec(&zh->reg->sortKeys);
+#else
zh->reg->sortKeys.buf_used = 0;
-
+#endif
if (zebraExplain_curDatabase (zh->reg->zei, zh->basenames[0]))
{
if (zebraExplain_newDatabase (zh->reg->zei, zh->basenames[0],
extractCtrl.dh = zh->reg->dh;
extractCtrl.handle = zh;
extractCtrl.match_criteria[0] = '\0';
+ extractCtrl.staticrank = 0;
init_extractCtrl(zh, &extractCtrl);
sizeof(*sysno), sysno);
}
extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys);
- extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys);
+ extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys, 0);
zh->records_inserted++;
}
{
/* record already exists */
struct recKeys delkeys;
+#if NATTR
+ struct recKeys sortKeys;
+#else
struct sortKeys sortKeys;
+#endif
if (!allow_update)
{
sortKeys.buf = rec->info[recInfo_sortKeys];
extract_flushSortKeys (zh, *sysno, 0, &sortKeys);
- extract_flushRecordKeys (zh, *sysno, 0, &delkeys);
+ extract_flushRecordKeys (zh, *sysno, 0, &delkeys, 0);
if (delete_flag)
{
/* record going to be deleted */
yaz_log (YLOG_LOG, "update %s %s %ld", recordType,
pr_fname, (long) recordOffset);
extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys);
- extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys);
+ extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys, 0);
zh->records_updated++;
}
}
}
create_rec_keys_codec(&zh->reg->keys);
-
+#if NATTR
+ create_rec_keys_codec(&zh->reg->sortKeys);
+#else
zh->reg->sortKeys.buf_used = 0;
-
+#endif
extractCtrl.init = extract_init;
extractCtrl.tokenAdd = extract_token_add;
extractCtrl.schemaAdd = extract_schema_add;
extractCtrl.flagShowRecords = 0;
extractCtrl.match_criteria[0] = '\0';
+ extractCtrl.staticrank = 0;
extractCtrl.handle = handle;
extractCtrl.first_record = 1;
if (rec->size[recInfo_delKeys])
{
struct recKeys delkeys;
+#if NATTR
+ struct recKeys sortkeys;
+#else
struct sortKeys sortkeys;
+#endif
delkeys.buf_used = rec->size[recInfo_delKeys];
delkeys.buf = rec->info[recInfo_delKeys];
sortkeys.buf = rec->info[recInfo_sortKeys];
extract_flushSortKeys (zh, rec->sysno, 0, &sortkeys);
- extract_flushRecordKeys (zh, rec->sysno, 0, &delkeys);
+ extract_flushRecordKeys (zh, rec->sysno, 0, &delkeys, 0);
}
- extract_flushRecordKeys (zh, rec->sysno, 1, &zh->reg->keys);
+ extract_flushRecordKeys (zh, rec->sysno, 1, &zh->reg->keys, 0);
extract_flushSortKeys (zh, rec->sysno, 1, &zh->reg->sortKeys);
xfree (rec->info[recInfo_delKeys]);
}
void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
- int cmd, struct recKeys *reckeys)
+ int cmd, struct recKeys *reckeys,
+ zint staticrank)
{
void *decode_handle = iscz1_start();
int off = 0;
while (off < reckeys->buf_used)
{
const char *src = reckeys->buf + off;
- struct it_key key;
- char *dst = (char*) &key;
+ struct it_key key_in;
+ struct it_key key_out;
+ char *dst = (char*) &key_in;
+ zint *keyp = key_out.mem;
+ size_t key_idx = 0;
iscz1_decode(decode_handle, &dst, &src);
- assert(key.len == 4);
+ assert(key_in.len == 4);
if (zh->reg->key_buf_used + 1024 >
(zh->reg->ptr_top -zh->reg->ptr_i)*sizeof(char*))
(zh->reg->key_buf)[zh->reg->ptr_top - zh->reg->ptr_i] =
(char*)zh->reg->key_buf + zh->reg->key_buf_used;
- ch = (int) key.mem[0]; /* ordinal for field/use/attribute */
+ ch = (int) key_in.mem[0]; /* ordinal for field/use/attribute */
zh->reg->key_buf_used +=
key_SU_encode (ch,((char*)zh->reg->key_buf) +
((char*)(zh->reg->key_buf))[(zh->reg->key_buf_used)++] = '\0';
((char*)(zh->reg->key_buf))[(zh->reg->key_buf_used)++] = cmd;
- key.len = 3;
- if (key.mem[1]) /* filter specified record ID */
- key.mem[0] = key.mem[1];
+ if (zh->m_staticrank) /* rank config enabled ? */
+ {
+ *keyp++ = staticrank;
+ key_out.len = 4;
+ }
+ else
+ key_out.len = 3;
+
+ if (key_in.mem[1]) /* filter specified record ID */
+ *keyp++ = key_in.mem[1];
else
- key.mem[0] = sysno;
- key.mem[1] = key.mem[2]; /* section_id */
- key.mem[2] = key.mem[3]; /* sequence .. */
+ *keyp++ = sysno;
+ *keyp++ = key_in.mem[2]; /* section_id */
+ *keyp++ = key_in.mem[3]; /* sequence .. */
memcpy ((char*)zh->reg->key_buf + zh->reg->key_buf_used,
- &key, sizeof(key));
- (zh->reg->key_buf_used) += sizeof(key);
+ &key_out, sizeof(key_out));
+ (zh->reg->key_buf_used) += sizeof(key_out);
off = src - reckeys->buf;
}
assert (off == reckeys->buf_used);
}
void extract_add_it_key (ZebraHandle zh,
+ struct recKeys *keys,
int reg_type,
const char *str, int slen, struct it_key *key)
{
char *dst;
- struct recKeys *keys = &zh->reg->keys;
const char *src = (char*) key;
if (keys->buf_used+1024 > keys->buf_max)
iscz1_encode(keys->codec_handle, &dst, &src);
+#if REG_TYPE_PREFIX
*dst++ = reg_type;
+#endif
memcpy (dst, str, slen);
dst += slen;
*dst++ = '\0';
seqno = (int) key.mem[key.len-1];
zebra_term_untrans_iconv(zh, nmem, src[0], &dst_term, src+1);
- zebra_snippets_append(snippets, seqno, key.mem[0], dst_term);
+ zebra_snippets_append(snippets, seqno, src[0], key.mem[0], dst_term);
while (*src++)
;
off = src - reckeys->buf;
ZebraExplainInfo zei = zh->reg->zei;
int ch;
- if (p->attrStr)
+ if (p->index_name)
{
- ch = zebraExplain_lookup_attr_str(zei, p->attrStr);
+ ch = zebraExplain_lookup_attr_str(zei, p->index_type, p->index_name);
if (ch < 0)
- ch = zebraExplain_add_attr_str(zei, p->attrStr);
+ ch = zebraExplain_add_attr_str(zei, p->index_type, p->index_name);
}
else
{
- ch = zebraExplain_lookup_attr_su(zei, p->attrSet, p->attrUse);
+#if NATTR
+ return;
+#else
+ ch = zebraExplain_lookup_attr_su(zei, p->index_type,
+ p->attrSet, p->attrUse);
if (ch < 0)
- ch = zebraExplain_add_attr_su(zei, p->attrSet, p->attrUse);
+ ch = zebraExplain_add_attr_su(zei, p->index_type,
+ p->attrSet, p->attrUse);
+#endif
}
key.len = 4;
key.mem[0] = ch;
p->attrSet, p->attrUse, p->record_id, p->section_id, p->seqno);
#endif
- extract_add_it_key(p->extractCtrl->handle, p->reg_type, str,
+ extract_add_it_key(p->extractCtrl->handle,
+ &zh->reg->keys,
+ p->index_type, str,
length, &key);
}
-static void extract_add_sort_string (RecWord *p, const char *str,
- int length)
+#if NATTR
+static void extract_add_sort_string (RecWord *p, const char *str, int length)
+{
+ struct it_key key;
+
+ ZebraHandle zh = p->extractCtrl->handle;
+ ZebraExplainInfo zei = zh->reg->zei;
+ int ch;
+
+ if (p->index_name)
+ {
+ ch = zebraExplain_lookup_attr_str(zei, p->index_type, p->index_name);
+ if (ch < 0)
+ ch = zebraExplain_add_attr_str(zei, p->index_type, p->index_name);
+ }
+ else
+ {
+ return;
+ }
+ key.len = 4;
+ key.mem[0] = ch;
+ key.mem[1] = p->record_id;
+ key.mem[2] = p->section_id;
+ key.mem[3] = p->seqno;
+
+ extract_add_it_key(p->extractCtrl->handle,
+ &zh->reg->sortKeys,
+ p->index_type, str,
+ length, &key);
+}
+#else
+static void extract_add_sort_string (RecWord *p, const char *str, int length)
{
ZebraHandle zh = p->extractCtrl->handle;
struct sortKeys *sk = &zh->reg->sortKeys;
memcpy (sk->buf + off, str, length);
sk->buf_used = off + length;
}
+#endif
void extract_add_string (RecWord *p, const char *string, int length)
{
assert (length > 0);
- if (zebra_maps_is_sort (p->zebra_maps, p->reg_type))
+ if (zebra_maps_is_sort (p->zebra_maps, p->index_type))
extract_add_sort_string (p, string, length);
else
extract_add_index_string (p, string, length);
yaz_log(YLOG_DEBUG, "Incomplete field, w='%.*s'", p->term_len, p->term_buf);
if (remain > 0)
- map = zebra_maps_input(p->zebra_maps, p->reg_type, &b, remain, 0);
+ map = zebra_maps_input(p->zebra_maps, p->index_type, &b, remain, 0);
while (map)
{
{
remain = p->term_len - (b - p->term_buf);
if (remain > 0)
- map = zebra_maps_input(p->zebra_maps, p->reg_type, &b, remain, 0);
+ map = zebra_maps_input(p->zebra_maps, p->index_type, &b,
+ remain, 0);
else
map = 0;
}
buf[i++] = *(cp++);
remain = p->term_len - (b - p->term_buf);
if (remain > 0)
- map = zebra_maps_input(p->zebra_maps, p->reg_type, &b, remain, 0);
+ map = zebra_maps_input(p->zebra_maps, p->index_type, &b, remain, 0);
else
map = 0;
}
p->term_len, p->term_buf);
if (remain > 0)
- map = zebra_maps_input (p->zebra_maps, p->reg_type, &b, remain, 1);
+ map = zebra_maps_input (p->zebra_maps, p->index_type, &b, remain, 1);
while (remain > 0 && i < IT_MAX_WORD)
{
if (remain > 0)
{
int first = i ? 0 : 1; /* first position */
- map = zebra_maps_input(p->zebra_maps, p->reg_type, &b, remain, first);
+ map = zebra_maps_input(p->zebra_maps, p->index_type, &b, remain, first);
}
else
map = 0;
remain = p->term_len - (b - p->term_buf);
if (remain > 0)
{
- map = zebra_maps_input (p->zebra_maps, p->reg_type, &b,
+ map = zebra_maps_input (p->zebra_maps, p->index_type, &b,
remain, 0);
}
else
p->reg_type, p->attrSet, p->attrUse, p->seqno, p->length,
p->string);
#endif
- if ((wrbuf = zebra_replace(p->zebra_maps, p->reg_type, 0,
+ if ((wrbuf = zebra_replace(p->zebra_maps, p->index_type, 0,
p->term_buf, p->term_len)))
{
p->term_buf = wrbuf_buf(wrbuf);
p->term_len = wrbuf_len(wrbuf);
}
- if (zebra_maps_is_complete (p->zebra_maps, p->reg_type))
+ if (zebra_maps_is_complete (p->zebra_maps, p->index_type))
extract_add_complete_field (p);
else
extract_add_incomplete_field(p);
zebraExplain_addSchema (zh->reg->zei, oid);
}
+#if NATTR
+void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
+ int cmd, struct recKeys *reckeys)
+{
+ SortIdx sortIdx = zh->reg->sortIdx;
+ void *decode_handle = iscz1_start();
+ int off = 0;
+ int ch = 0;
+
+ while (off < reckeys->buf_used)
+ {
+ const char *src = reckeys->buf + off;
+ struct it_key key;
+ char *dst = (char*) &key;
+
+ iscz1_decode(decode_handle, &dst, &src);
+ assert(key.len == 4);
+
+ ch = (int) key.mem[0]; /* ordinal for field/use/attribute */
+
+ sortIdx_type(sortIdx, ch);
+ if (cmd == 1)
+ sortIdx_add(sortIdx, src, strlen(src));
+ else
+ sortIdx_add(sortIdx, "", 1);
+
+ src += strlen(src);
+ src++;
+
+ off = src - reckeys->buf;
+ }
+ assert (off == reckeys->buf_used);
+ iscz1_stop(decode_handle);
+}
+#else
void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
int cmd, struct sortKeys *sk)
{
off += slen;
}
}
+#endif
void encode_key_init (struct encode_info *i)
{
projects / idzebra-moved-to-github.git / blobdiff