-/* $Id: extract.c,v 1.197 2005-10-28 09:22:50 adam Exp $
+/* $Id: extract.c,v 1.200 2005-12-09 10:45:04 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
{
dict_insert (zh->reg->matchDict, 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++;
{
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
{
}
else
{
- /* record going to be updated */
- if (zebra_rec_keys_empty(delkeys))
- {
+ /* 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);
- extract_flushRecordKeys (zh, *sysno, 1, zh->reg->keys,
+ 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++;
- }
+ zh->records_updated++;
}
zebra_rec_keys_close(delkeys);
#if NATTR
/* 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,
int force_update,
int allow_update)
{
+ SYSNO sysno0 = 0;
RecordAttr *recordAttr;
struct recExtractCtrl extractCtrl;
int r;
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 (matchStr) {
- rinfo = dict_lookup (zh->reg->matchDict, matchStr);
+ char *rinfo = dict_lookup (zh->reg->matchDict, matchStr);
if (rinfo)
{
assert(*rinfo == sizeof(*sysno));
/* 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;
dict_insert (zh->reg->matchDict, 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 0
print_rec_keys(zh, zh->reg->keys);
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;
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);
/* record going to be deleted */
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
{
}
else
{
- /* record going to be updated */
- if (zebra_rec_keys_empty(delkeys))
- {
- 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);
- extract_flushRecordKeys (zh, *sysno, 1, zh->reg->keys,
+ 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++;
- }
+ zh->records_updated++;
}
zebra_rec_keys_close(delkeys);
#if NATTR
/* 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,
zebra_rec_keys_t delkeys = zebra_rec_keys_open();
#if NATTR
- zebra_rec_keys_t sortkeys = zzebra_rec_keys_open();
+ zebra_rec_keys_t sortkeys = zebra_rec_keys_open();
#else
struct sortKeys sortkeys;
#endif
&rec->size[recInfo_delKeys]);
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;
}
zh->reg->key_buf_used = 0;
}
-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);
-}
-
ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh,
zebra_rec_keys_t reckeys,
zebra_snippets *snippets)
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)