-/* $Id: zebraapi.c,v 1.250 2007-03-13 13:46:11 adam Exp $
+/* $Id: zebraapi.c,v 1.262 2007-10-31 16:56:14 adam Exp $
Copyright (C) 1995-2007
Index Data ApS
#include "orddict.h"
#include <charmap.h>
#include <idzebra/api.h>
+#include <yaz/oid_db.h>
#define DEFAULT_APPROX_LIMIT 2000000000
const char *reg_path);
static void zebra_register_close(ZebraService zs, struct zebra_register *reg);
+const char *zebra_get_encoding(ZebraHandle zh)
+{
+ assert(zh && zh->session_res);
+ return res_get_def(zh->session_res, "encoding", "ISO-8859-1");
+}
+
ZebraHandle zebra_open(ZebraService zs, Res res)
{
ZebraHandle zh;
zh->break_handler_func = 0;
zh->break_handler_data = 0;
- default_encoding = res_get_def(zh->session_res, "encoding", "ISO-8859-1");
+ default_encoding = zebra_get_encoding(zh);
zh->iconv_to_utf8 =
yaz_iconv_open ("UTF-8", default_encoding);
ZebraService zebra_start_res(const char *configName, Res def_res, Res over_res)
{
Res res;
+ char version_str[16];
+ char system_str[80];
zebra_flock_init();
log_level_initialized = 1;
}
- yaz_log(YLOG_LOG, "zebra_start %s %s", ZEBRAVER,
+ zebra_get_version(version_str, system_str);
+
+ yaz_log(YLOG_LOG, "zebra_start %s %s", version_str,
configName ? configName : "");
if ((res = res_open(def_res, over_res)))
data1_set_tabroot (reg->dh, reg_path);
reg->recTypes = recTypes_init (zs->record_classes, reg->dh);
+ reg->index_types = 0;
reg->zebra_maps =
zebra_maps_open(res, reg_path, profilePath);
if (!reg->zebra_maps)
if (!strcmp (recordCompression, "bzip2"))
record_compression = REC_COMPRESS_BZIP2;
- if (1)
+ {
+ const char *index_types_fname = res_get(res, "indextypes");
+ if (index_types_fname)
+ {
+ char tmp_full_name[1024];
+
+ if (!yaz_filepath_resolve(index_types_fname,
+ profilePath,
+ reg_path,
+ tmp_full_name))
+ {
+ yaz_log(YLOG_WARN, "Could not find %s", index_types_fname);
+ ret = ZEBRA_FAIL;
+ }
+ else
+ {
+ reg->index_types = zebra_index_types_create(
+ tmp_full_name);
+ yaz_log(YLOG_LOG, "zebra_index_types_create returned %p",
+ reg->index_types);
+ }
+ }
+
+ }
{
const char *index_fname = res_get_def(res, "index", "default.idx");
if (index_fname && *index_fname)
recTypes_destroy (reg->recTypes);
zebra_maps_close (reg->zebra_maps);
+ zebra_index_types_destroy(reg->index_types);
zebraRankDestroy (reg);
bfs_destroy (reg->bfs);
data1_destroy (reg->dh);
ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream,
const char *setname,
Z_RecordComposition *comp,
- oid_value input_format, int num_recs,
+ const Odr_oid *input_format, int num_recs,
ZebraRetrievalRecord *recs)
{
ZebraMetaRecord *poset;
if (poset[i].term)
{
recs[i].errCode = 0;
- recs[i].format = VAL_SUTRS;
+ recs[i].format = yaz_oid_recsyn_sutrs;
recs[i].len = strlen(poset[i].term);
recs[i].buf = poset[i].term;
recs[i].base = poset[i].db;
hit_snippet);
#endif
recs[i].errCode =
- zebra_record_fetch(zh, poset[i].sysno, poset[i].score,
+ zebra_record_fetch(zh, setname,
+ poset[i].sysno, poset[i].score,
hit_snippet,
stream, input_format, comp,
&recs[i].format, &buf, &len,
recs[i].buf = 0; /* no record and no error issued */
recs[i].len = 0;
recs[i].errCode = 0;
- recs[i].format = VAL_NONE;
+ recs[i].format = 0;
recs[i].sysno = 0;
}
}
{
YAZ_PQF_Parser pqf_parser = yaz_pqf_create ();
Z_AttributesPlusTerm *zapt;
- int *attributeSet;
+ Odr_oid *attributeSet;
ZEBRA_RES res;
if (!(zapt = yaz_pqf_scan(pqf_parser, stream, &attributeSet, query)))
zh->errCode = YAZ_BIB1_SCAN_MALFORMED_SCAN;
}
else
- res = zebra_scan(zh, stream, zapt, VAL_BIB1,
+ {
+ res = zebra_scan(zh, stream, zapt, yaz_oid_attset_bib_1,
position, num_entries, entries, is_partial,
setname);
+ }
yaz_pqf_destroy (pqf_parser);
return res;
}
ZEBRA_RES zebra_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
- oid_value attributeset,
+ const Odr_oid *attributeset,
int *position,
int *num_entries, ZebraScanEntry **entries,
int *is_partial,
{
int i, status;
ASSERTZH;
- assert(statuses);
- yaz_log(log_level, "zebra_deleteResultSet n=%d",num_setnames);
+ yaz_log(log_level, "zebra_deleteResultSet n=%d", num_setnames);
if (zebra_begin_read(zh))
return Z_DeleteStatus_systemProblemAtTarget;
Odr_oct *oct = fragment->u.notExternallyTagged;
sysno = 0;
- if (zebra_update_record(zh,
- 0, /* record Type */
- &sysno,
- 0, /* match */
- 0, /* fname */
- (const char *) oct->buf, oct->len,
- 0) == ZEBRA_FAIL)
+ if (zebra_update_record(
+ zh,
+ action_update,
+ 0, /* record Type */
+ &sysno,
+ 0, /* match */
+ 0, /* fname */
+ (const char *) oct->buf, oct->len) == ZEBRA_FAIL)
res = ZEBRA_FAIL;
}
}
return res;
}
-ZEBRA_RES zebra_admin_exchange_record(ZebraHandle zh,
- const char *rec_buf,
- size_t rec_len,
- const char *recid_buf, size_t recid_len,
- int action)
- /* 1 = insert. Fail it already exists */
- /* 2 = replace. Fail it does not exist */
- /* 3 = delete. Fail if does not exist */
- /* 4 = update. Insert/replace */
-{
- ZEBRA_RES res;
- zint sysno = 0;
- char *rinfo = 0;
- char recid_z[256];
- int db_ord;
- ZEBRA_CHECK_HANDLE(zh);
- assert(action>0 && action <=4);
- assert(rec_buf);
-
- yaz_log(log_level, "zebra_admin_exchange_record ac=%d", action);
-
- if (!recid_buf || recid_len <= 0 || recid_len >= sizeof(recid_z))
- {
- zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED,
- "no record ID or empty record ID");
- return ZEBRA_FAIL;
- }
-
- memcpy (recid_z, recid_buf, recid_len);
- recid_z[recid_len] = 0;
-
- if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL)
- return ZEBRA_FAIL;
-
- db_ord = zebraExplain_get_database_ord(zh->reg->zei);
- rinfo = dict_lookup_ord(zh->reg->matchDict, db_ord, recid_z);
- if (rinfo)
- {
- if (action == 1) /* fail if insert */
- {
- if (zebra_end_trans(zh) != ZEBRA_OK)
- yaz_log(YLOG_WARN, "zebra_end_trans failed");
- zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED,
- "Cannot insert record: already exist");
- return ZEBRA_FAIL;
- }
-
- memcpy (&sysno, rinfo+1, sizeof(sysno));
- }
- else
- {
- if (action == 2 || action == 3) /* fail if delete or update */
- {
- if (zebra_end_trans(zh) != ZEBRA_OK)
- yaz_log(YLOG_WARN, "zebra_end_trans failed");
- zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED,
- "Cannot delete/update record: does not exist");
- return ZEBRA_FAIL;
- }
- action = 1; /* make it an insert (if it's an update).. */
- }
- res = zebra_buffer_extract_record(zh, rec_buf, rec_len,
- action == 3 ? 1 : 0 /* delete flag */,
- 0, /* test mode */
- 0, /* recordType */
- &sysno,
- 0, /* match */
- 0, /* fname */
- 1, /* force update */
- 1 /* allow update */
- );
- if (res == ZEBRA_FAIL)
- {
- zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED,
- "Unable to parse record");
- }
- if (action == 1)
- {
- dict_insert_ord(zh->reg->matchDict, db_ord, recid_z,
- sizeof(sysno), &sysno);
- }
- else if (action == 3)
- {
- dict_delete_ord(zh->reg->matchDict, db_ord, recid_z);
- }
- if (zebra_end_trans(zh) != ZEBRA_OK)
- {
- yaz_log(YLOG_WARN, "zebra_end_trans failed");
- res = ZEBRA_FAIL;
- }
- return res;
-}
-
int delete_w_handle(const char *info, void *handle)
{
ZebraHandle zh = (ZebraHandle) handle;
return zebra_end_trans (zh);
}
-int zebra_string_norm (ZebraHandle zh, unsigned reg_id,
- const char *input_str, int input_len,
- char *output_str, int output_len)
+int zebra_string_norm(ZebraHandle zh, const char *index_type,
+ const char *input_str, int input_len,
+ char *output_str, int output_len)
{
WRBUF wrbuf;
+ zebra_map_t zm = zebra_map_get(zh->reg->zebra_maps, index_type);
ASSERTZH;
assert(input_str);
assert(output_str);
if (!zh->reg->zebra_maps)
return -1;
- wrbuf = zebra_replace(zh->reg->zebra_maps, reg_id, "",
- input_str, input_len);
+ wrbuf = zebra_replace(zm, "", input_str, input_len);
if (!wrbuf)
return -2;
if (wrbuf_len(wrbuf) >= output_len)
ZEBRA_RES zebra_add_record(ZebraHandle zh,
const char *buf, int buf_size)
{
- return zebra_update_record(zh, 0, 0 /* sysno */, 0, 0, buf, buf_size, 1);
-}
-
-ZEBRA_RES zebra_insert_record(ZebraHandle zh,
- const char *recordType,
- zint *sysno, const char *match,
- const char *fname,
- const char *buf, int buf_size, int force_update)
-{
- ZEBRA_RES res;
- ASSERTZH;
- assert(sysno);
- assert(buf);
- yaz_log(log_level, "zebra_insert_record sysno=" ZINT_FORMAT, *sysno);
-
- if (buf_size < 1)
- buf_size = strlen(buf);
-
- if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL)
- return ZEBRA_FAIL;
- res = zebra_buffer_extract_record(zh, buf, buf_size,
- 0, /* delete_flag */
- 0, /* test_mode */
- recordType,
- sysno,
- match, fname,
- 1,
- 0); /* allow_update */
- if (zebra_end_trans(zh) != ZEBRA_OK)
- {
- yaz_log(YLOG_WARN, "zebra_end_trans failed");
- res = ZEBRA_FAIL;
- }
- return res;
+ return zebra_update_record(zh, action_update,
+ 0 /* record type */,
+ 0 /* sysno */ ,
+ 0 /* match */,
+ 0 /* fname */,
+ buf, buf_size);
}
ZEBRA_RES zebra_update_record(ZebraHandle zh,
+ enum zebra_recctrl_action_t action,
const char *recordType,
zint *sysno, const char *match,
const char *fname,
- const char *buf, int buf_size,
- int force_update)
+ const char *buf, int buf_size)
{
ZEBRA_RES res;
if (sysno)
yaz_log(log_level, " sysno=" ZINT_FORMAT, *sysno);
- if (buf_size < 1) buf_size = strlen(buf);
+ if (buf_size < 1)
+ buf_size = strlen(buf);
if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL)
return ZEBRA_FAIL;
res = zebra_buffer_extract_record(zh, buf, buf_size,
- 0, /* delete_flag */
+ action,
0, /* test_mode */
recordType,
sysno,
- match, fname,
- force_update,
- 1); /* allow_update */
+ match,
+ fname);
if (zebra_end_trans(zh) != ZEBRA_OK)
{
yaz_log(YLOG_WARN, "zebra_end_trans failed");
return res;
}
-ZEBRA_RES zebra_delete_record(ZebraHandle zh,
- const char *recordType,
- zint *sysno, const char *match,
- const char *fname,
- const char *buf, int buf_size,
- int force_update)
-{
- ZEBRA_RES res;
-
- ZEBRA_CHECK_HANDLE(zh);
-
- assert(buf);
- yaz_log(log_level, "zebra_delete_record");
- if (sysno)
- yaz_log(log_level, " sysno=" ZINT_FORMAT, *sysno);
-
- if (buf_size < 1) buf_size = strlen(buf);
-
- if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL)
- return ZEBRA_FAIL;
- res = zebra_buffer_extract_record(zh, buf, buf_size,
- 1, /* delete_flag */
- 0, /* test_mode */
- recordType,
- sysno,
- match,fname,
- force_update,
- 1); /* allow_update */
- if (zebra_end_trans(zh) != ZEBRA_OK)
- {
- yaz_log(YLOG_WARN, "zebra_end_trans failed");
- res = ZEBRA_FAIL;
- }
- return res;
-}
-
/* ---------------------------------------------------------------------------
Searching
*/
yaz_log(log_level, "zebra_search_PQF s=%s q=%s", setname, pqf_query);
- query = p_query_rpn (odr, PROTO_Z3950, pqf_query);
+ query = p_query_rpn(odr, pqf_query);
if (!query)
{