projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reduce default API logging
[idzebra-moved-to-github.git]
/
index
/
zebraapi.c
diff --git
a/index/zebraapi.c
b/index/zebraapi.c
index
1fbb956
..
7746497
100644
(file)
--- a/
index/zebraapi.c
+++ b/
index/zebraapi.c
@@
-1,4
+1,4
@@
-/* $Id: zebraapi.c,v 1.178 2005-06-14 20:28:54 adam Exp $
+/* $Id: zebraapi.c,v 1.189 2005-09-19 08:20:15 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
Copyright (C) 1995-2005
Index Data ApS
@@
-49,8
+49,8
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
static int log_level = 0;
static int log_level_initialized = 0;
static int log_level = 0;
static int log_level_initialized = 0;
-static Res zebra_open_res (ZebraHandle zh);
-static void zebra_close_res (ZebraHandle zh);
+static void zebra_open_res(ZebraHandle zh);
+static void zebra_close_res(ZebraHandle zh);
static void zebra_chdir (ZebraService zs)
{
static void zebra_chdir (ZebraService zs)
{
@@
-79,14
+79,14
@@
static void zebra_flush_reg (ZebraHandle zh)
zebra_index_merge (zh );
}
zebra_index_merge (zh );
}
-static struct zebra_register *zebra_register_open (ZebraService zs,
- const char *name,
- int rw, int useshadow,
- Res res,
- const char *reg_path);
+static struct zebra_register *zebra_register_open(ZebraService zs,
+ const char *name,
+ int rw, int useshadow,
+ Res res,
+ const char *reg_path);
static void zebra_register_close (ZebraService zs, struct zebra_register *reg);
static void zebra_register_close (ZebraService zs, struct zebra_register *reg);
-ZebraHandle zebra_open (ZebraService zs)
+ZebraHandle zebra_open(ZebraService zs, Res res)
{
ZebraHandle zh;
const char *default_encoding;
{
ZebraHandle zh;
const char *default_encoding;
@@
-111,6
+111,7
@@
ZebraHandle zebra_open (ZebraService zs)
zh->errCode = 0;
zh->errString = 0;
zh->res = 0;
zh->errCode = 0;
zh->errString = 0;
zh->res = 0;
+ zh->session_res = res_open(zs->global_res, res);
zh->user_perm = 0;
zh->reg_name = xstrdup ("");
zh->user_perm = 0;
zh->reg_name = xstrdup ("");
@@
-126,8
+127,9
@@
ZebraHandle zebra_open (ZebraService zs)
zh->lock_shadow = 0;
zh->shadow_enable = 1;
zh->lock_shadow = 0;
zh->shadow_enable = 1;
+ zh->m_staticrank = 0;
- default_encoding = res_get_def(zs->global_res, "encoding", "ISO-8859-1");
+ default_encoding = res_get_def(zh->session_res, "encoding", "ISO-8859-1");
zh->iconv_to_utf8 =
yaz_iconv_open ("UTF-8", default_encoding);
zh->iconv_to_utf8 =
yaz_iconv_open ("UTF-8", default_encoding);
@@
-172,20
+174,20
@@
ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res)
log_level = yaz_log_module_level("zebraapi");
log_level_initialized = 1;
}
log_level = yaz_log_module_level("zebraapi");
log_level_initialized = 1;
}
+
+ yaz_log(YLOG_LOG, "zebra_start %s %s", ZEBRAVER,
+ configName ? configName : "");
- yaz_log(YLOG_LOG, "zebra_start %s %s",configName, ZEBRAVER);
- assert(configName);
-
- if ((res = res_open (configName, def_res, over_res)))
+ if ((res = res_open(def_res, over_res)))
{
const char *passwd_plain = 0;
const char *passwd_encrypt = 0;
ZebraService zh = xmalloc(sizeof(*zh));
{
const char *passwd_plain = 0;
const char *passwd_encrypt = 0;
ZebraService zh = xmalloc(sizeof(*zh));
- yaz_log (YLOG_DEBUG, "Read resources `%s'", configName);
-
+ if (configName)
+ res_read_file(res, configName);
+
zh->global_res = res;
zh->global_res = res;
- zh->configName = xstrdup(configName);
zh->sessions = 0;
zebra_chdir (zh);
zh->sessions = 0;
zebra_chdir (zh);
@@
-196,7
+198,7
@@
ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res)
if (!passwd_plain && !passwd_encrypt)
zh->passwd_db = NULL;
if (!passwd_plain && !passwd_encrypt)
zh->passwd_db = NULL;
- else
+ else
{
zh->passwd_db = passwd_db_open();
if (!zh->passwd_db)
{
zh->passwd_db = passwd_db_open();
if (!zh->passwd_db)
@@
-248,9
+250,9
@@
Dict dict_open_res (BFiles bfs, const char *name, int cache, int rw,
}
static
}
static
-struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
- int rw, int useshadow, Res res,
- const char *reg_path)
+struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
+ int rw, int useshadow, Res res,
+ const char *reg_path)
{
struct zebra_register *reg;
int record_compression = REC_COMPRESS_NONE;
{
struct zebra_register *reg;
int record_compression = REC_COMPRESS_NONE;
@@
-316,6
+318,9
@@
struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
reg->sortKeys.buf = 0;
reg->sortKeys.buf_max = 0;
reg->sortKeys.buf = 0;
reg->sortKeys.buf_max = 0;
+#if NATTR
+ reg->sortKeys.codec_handle = iscz1_start();
+#endif
reg->records = 0;
reg->dict = 0;
reg->records = 0;
reg->dict = 0;
@@
-329,8
+334,9
@@
struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
reg->key_file_no = 0;
reg->ptr_i = 0;
reg->key_file_no = 0;
reg->ptr_i = 0;
- zebraRankInstall (reg, rank1_class);
- zebraRankInstall (reg, rankzv_class);
+ zebraRankInstall (reg, rank_1_class);
+ zebraRankInstall (reg, rank_zv_class);
+ zebraRankInstall (reg, rank_static_class);
recordCompression = res_get_def (res, "recordCompression", "none");
if (!strcmp (recordCompression, "none"))
recordCompression = res_get_def (res, "recordCompression", "none");
if (!strcmp (recordCompression, "none"))
@@
-480,6
+486,10
@@
static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
xfree(reg->keys.buf);
if (reg->keys.codec_handle)
iscz1_stop(reg->keys.codec_handle);
xfree(reg->keys.buf);
if (reg->keys.codec_handle)
iscz1_stop(reg->keys.codec_handle);
+#if NATTR
+ if (reg->sortKeys.codec_handle)
+ iscz1_stop(reg->sortKeys.codec_handle);
+#endif
xfree(reg->key_buf);
xfree(reg->name);
xfree(reg);
xfree(reg->key_buf);
xfree(reg->name);
xfree(reg);
@@
-504,7
+514,6
@@
ZEBRA_RES zebra_stop(ZebraService zs)
recTypeClass_destroy(zs->record_classes);
nmem_destroy(zs->nmem);
res_close (zs->global_res);
recTypeClass_destroy(zs->record_classes);
nmem_destroy(zs->nmem);
res_close (zs->global_res);
- xfree(zs->configName);
xfree(zs);
return ZEBRA_OK;
}
xfree(zs);
return ZEBRA_OK;
}
@@
-528,6
+537,7
@@
ZEBRA_RES zebra_close (ZebraHandle zh)
if (zh->reg)
zebra_register_close (zh->service, zh->reg);
zebra_close_res (zh);
if (zh->reg)
zebra_register_close (zh->service, zh->reg);
zebra_close_res (zh);
+ res_close(zh->session_res);
xfree(zh->record_encoding);
xfree(zh->record_encoding);
@@
-578,38
+588,34
@@
struct map_baseinfo {
int new_num_max;
};
int new_num_max;
};
-static Res zebra_open_res (ZebraHandle zh)
+static void zebra_open_res(ZebraHandle zh)
{
{
- Res res = 0;
char fname[512];
ASSERTZH;
zh->errCode = 0;
if (zh->path_reg)
{
char fname[512];
ASSERTZH;
zh->errCode = 0;
if (zh->path_reg)
{
- sprintf (fname, "%.200s/zebra.cfg", zh->path_reg);
- res = res_open (fname, zh->service->global_res, 0);
- if (!res)
- res = zh->service->global_res;
+ sprintf(fname, "%.200s/zebra.cfg", zh->path_reg);
+ zh->res = res_open(zh->session_res, 0);
+ res_read_file(zh->res, fname);
}
else if (*zh->reg_name == 0)
{
}
else if (*zh->reg_name == 0)
{
- res = zh->service->global_res;
+ zh->res = res_open(zh->session_res, 0);
}
else
{
yaz_log (YLOG_WARN, "no register root specified");
}
else
{
yaz_log (YLOG_WARN, "no register root specified");
- return 0; /* no path for register - fail! */
+ zh->res = 0; /* no path for register - fail! */
}
}
- return res;
}
static void zebra_close_res (ZebraHandle zh)
{
ASSERTZH;
zh->errCode = 0;
}
static void zebra_close_res (ZebraHandle zh)
{
ASSERTZH;
zh->errCode = 0;
- if (zh->res != zh->service->global_res)
- res_close (zh->res);
+ res_close (zh->res);
zh->res = 0;
}
zh->res = 0;
}
@@
-650,7
+656,7
@@
static void zebra_select_register (ZebraHandle zh, const char *new_reg)
strcat (zh->path_reg, zh->reg_name);
}
}
strcat (zh->path_reg, zh->reg_name);
}
}
- zh->res = zebra_open_res (zh);
+ zebra_open_res(zh);
if (zh->lock_normal)
zebra_lock_destroy (zh->lock_normal);
if (zh->lock_normal)
zebra_lock_destroy (zh->lock_normal);
@@
-663,7
+669,7
@@
static void zebra_select_register (ZebraHandle zh, const char *new_reg)
if (zh->res)
{
char fname[512];
if (zh->res)
{
char fname[512];
- const char *lock_area =res_get (zh->res, "lockDir");
+ const char *lock_area = res_get (zh->res, "lockDir");
if (!lock_area && zh->path_reg)
res_set (zh->res, "lockDir", zh->path_reg);
if (!lock_area && zh->path_reg)
res_set (zh->res, "lockDir", zh->path_reg);
@@
-696,6
+702,13
@@
static void zebra_select_register (ZebraHandle zh, const char *new_reg)
if (res_get_int(zh->res, "estimatehits", &approx) == ZEBRA_OK)
zebra_set_approx_limit(zh, approx);
}
if (res_get_int(zh->res, "estimatehits", &approx) == ZEBRA_OK)
zebra_set_approx_limit(zh, approx);
}
+ if (zh->res)
+ {
+ if (res_get_int(zh->res, "staticrank", &zh->m_staticrank) == ZEBRA_OK)
+ yaz_log(YLOG_LOG, "static rank set and is %d", zh->m_staticrank);
+ else
+ yaz_log(YLOG_LOG, "static rank unset");
+ }
}
void map_basenames_func (void *vp, const char *name, const char *value)
}
void map_basenames_func (void *vp, const char *name, const char *value)
@@
-737,8
+750,8
@@
int zebra_select_default_database(ZebraHandle zh)
/* no database has been selected - so we select based on
resource setting (including group)
*/
/* no database has been selected - so we select based on
resource setting (including group)
*/
- const char *group = res_get(zh->service->global_res, "group");
- const char *v = res_get_prefix(zh->service->global_res,
+ const char *group = res_get(zh->session_res, "group");
+ const char *v = res_get_prefix(zh->session_res,
"database", group, "Default");
return zebra_select_database(zh, v);
}
"database", group, "Default");
return zebra_select_database(zh, v);
}
@@
-765,7
+778,7
@@
void map_basenames (ZebraHandle zh, ODR stream,
odr_malloc (stream, sizeof(*info.new_basenames) * info.new_num_max);
info.mem = stream->mem;
odr_malloc (stream, sizeof(*info.new_basenames) * info.new_num_max);
info.mem = stream->mem;
- res_trav (zh->service->global_res, "mapdb", &info, map_basenames_func);
+ res_trav (zh->session_res, "mapdb", &info, map_basenames_func);
for (i = 0; i<p->num_bases; i++)
if (p->basenames[i] && p->new_num_bases < p->new_num_max)
for (i = 0; i<p->num_bases; i++)
if (p->basenames[i] && p->new_num_bases < p->new_num_max)
@@
-1008,7
+1021,8
@@
ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream,
ZEBRA_RES zebra_scan_PQF(ZebraHandle zh, ODR stream, const char *query,
int *position,
int *num_entries, ZebraScanEntry **entries,
ZEBRA_RES zebra_scan_PQF(ZebraHandle zh, ODR stream, const char *query,
int *position,
int *num_entries, ZebraScanEntry **entries,
- int *is_partial)
+ int *is_partial,
+ const char *setname)
{
YAZ_PQF_Parser pqf_parser = yaz_pqf_create ();
Z_AttributesPlusTerm *zapt;
{
YAZ_PQF_Parser pqf_parser = yaz_pqf_create ();
Z_AttributesPlusTerm *zapt;
@@
-1022,7
+1036,8
@@
ZEBRA_RES zebra_scan_PQF(ZebraHandle zh, ODR stream, const char *query,
}
else
res = zebra_scan(zh, stream, zapt, VAL_BIB1,
}
else
res = zebra_scan(zh, stream, zapt, VAL_BIB1,
- position, num_entries, entries, is_partial);
+ position, num_entries, entries, is_partial,
+ setname);
yaz_pqf_destroy (pqf_parser);
return res;
}
yaz_pqf_destroy (pqf_parser);
return res;
}
@@
-1031,9
+1046,11
@@
ZEBRA_RES zebra_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
oid_value attributeset,
int *position,
int *num_entries, ZebraScanEntry **entries,
oid_value attributeset,
int *position,
int *num_entries, ZebraScanEntry **entries,
- int *is_partial)
+ int *is_partial,
+ const char *setname)
{
ZEBRA_RES res;
{
ZEBRA_RES res;
+ RSET limit_rset = 0;
ASSERTZH;
assert(stream);
assert(zapt);
ASSERTZH;
assert(stream);
assert(zapt);
@@
-1049,9
+1066,21
@@
ZEBRA_RES zebra_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
*num_entries = 0;
return ZEBRA_FAIL;
}
*num_entries = 0;
return ZEBRA_FAIL;
}
+ if (setname)
+ {
+ limit_rset = resultSetRef(zh, setname);
+ if (!limit_rset)
+ {
+ zebra_setError(zh,
+ YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST,
+ setname);
+ zebra_end_read (zh);
+ return ZEBRA_FAIL;
+ }
+ }
res = rpn_scan (zh, stream, zapt, attributeset,
zh->num_basenames, zh->basenames, position,
res = rpn_scan (zh, stream, zapt, attributeset,
zh->num_basenames, zh->basenames, position,
- num_entries, entries, is_partial, 0, 0);
+ num_entries, entries, is_partial, limit_rset, 0);
zebra_end_read (zh);
return res;
}
zebra_end_read (zh);
return res;
}
@@
-1211,13
+1240,13
@@
ZEBRA_RES zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment)
Odr_oct *oct = fragment->u.notExternallyTagged;
sysno = 0;
Odr_oct *oct = fragment->u.notExternallyTagged;
sysno = 0;
- if ( zebra_update_record(zh,
- 0, /* record Type */
- &sysno,
- 0, /* match */
- 0, /* fname */
- oct->buf, oct->len,
- 0) == ZEBRA_FAIL)
+ if (zebra_update_record(zh,
+ 0, /* record Type */
+ &sysno,
+ 0, /* match */
+ 0, /* fname */
+ (const char *) oct->buf, oct->len,
+ 0) == ZEBRA_FAIL)
res = ZEBRA_FAIL;
}
}
res = ZEBRA_FAIL;
}
}
@@
-1595,9
+1624,9
@@
ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw)
}
zebra_set_state (zh, 'd', seqno);
}
zebra_set_state (zh, 'd', seqno);
- zh->reg = zebra_register_open (zh->service, zh->reg_name,
- 1, rval ? 1 : 0, zh->res,
- zh->path_reg);
+ zh->reg = zebra_register_open(zh->service, zh->reg_name,
+ 1, rval ? 1 : 0, zh->res,
+ zh->path_reg);
if (zh->reg)
zh->reg->seqno = seqno;
else
if (zh->reg)
zh->reg->seqno = seqno;
else
@@
-1676,9
+1705,9
@@
ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw)
resultSetInvalidate (zh);
zebra_register_close (zh->service, zh->reg);
}
resultSetInvalidate (zh);
zebra_register_close (zh->service, zh->reg);
}
- zh->reg = zebra_register_open (zh->service, zh->reg_name,
- 0, val == 'c' ? 1 : 0,
- zh->res, zh->path_reg);
+ zh->reg = zebra_register_open(zh->service, zh->reg_name,
+ 0, val == 'c' ? 1 : 0,
+ zh->res, zh->path_reg);
if (!zh->reg)
{
zebra_unlock (zh->lock_normal);
if (!zh->reg)
{
zebra_unlock (zh->lock_normal);
@@
-1965,7
+1994,7
@@
ZEBRA_RES zebra_octet_term_encoding(ZebraHandle zh, const char *encoding)
{
ASSERTZH;
assert(encoding);
{
ASSERTZH;
assert(encoding);
- yaz_log(log_level, "zebra_octet_term_encoding");
+ yaz_log(log_level, "zebra_octet_term_encoding %s", encoding);
zebra_clearError(zh);
if (zh->iconv_to_utf8 != 0)
zebra_clearError(zh);
if (zh->iconv_to_utf8 != 0)
@@
-2013,7
+2042,6
@@
const char *zebra_get_resource(ZebraHandle zh,
const char *v;
ASSERTZH;
assert(name);
const char *v;
ASSERTZH;
assert(name);
- assert(defaultvalue);
v = res_get_def (zh->res, name, (char *)defaultvalue);
zebra_clearError(zh);
yaz_log(log_level, "zebra_get_resource %s:%s", name, v);
v = res_get_def (zh->res, name, (char *)defaultvalue);
zebra_clearError(zh);
yaz_log(log_level, "zebra_get_resource %s:%s", name, v);