-/* $Id: zebraapi.c,v 1.254 2007-04-16 21:54:37 adam Exp $
+/* $Id: zebraapi.c,v 1.259 2007-08-28 21:40:57 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)))
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;