-/* $Id: zebraapi.c,v 1.254 2007-04-16 21:54:37 adam Exp $
+/* $Id: zebraapi.c,v 1.260 2007-10-29 09:25:41 adam Exp $
Copyright (C) 1995-2007
Index Data ApS
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,
- const int *input_format, int num_recs,
+ const Odr_oid *input_format, int num_recs,
ZebraRetrievalRecord *recs)
{
ZebraMetaRecord *poset;
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,
{
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)))
}
ZEBRA_RES zebra_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
- const int *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;