Log at most 20 entries for each error type during check. Allow
up to IT_KEY_LEVEL_MAX (5) , not 4 in check for each key.
void *client_data);
YAZ_EXPORT
void *client_data);
YAZ_EXPORT
-ZEBRA_RES zebra_register_check(ZebraHandle zh, int verbose_level);
+ZEBRA_RES zebra_register_check(ZebraHandle zh, int message_limit);
}
static ZEBRA_RES zebra_record_check(ZebraHandle zh, Record rec,
}
static ZEBRA_RES zebra_record_check(ZebraHandle zh, Record rec,
- zint *no_keys, int verbose_level,
+ zint *no_keys, int message_limit,
zint *no_long_dict_entries,
zint *no_failed_dict_lookups,
zint *no_invalid_keys,
zint *no_long_dict_entries,
zint *no_failed_dict_lookups,
zint *no_invalid_keys,
+ if (key_in.len < 2 || key_in.len > IT_KEY_LEVEL_MAX)
+ {
+ res = ZEBRA_FAIL;
+ (*no_invalid_keys)++;
+ if (*no_invalid_keys <= message_limit)
+ {
+ do_fail = 1;
+ yaz_log(YLOG_WARN, "Record " ZINT_FORMAT
+ ": unexpected key length %d",
+ rec->sysno, key_in.len);
+ }
+ }
if (ord_len + slen >= sizeof(ord_buf)-1)
{
if (ord_len + slen >= sizeof(ord_buf)-1)
{
- (*no_long_dict_entries)++;
- if (verbose_level >= 1)
+ (*no_long_dict_entries)++;
+ if (*no_long_dict_entries <= message_limit)
/* so bad it can not fit into our ord_buf */
yaz_log(YLOG_WARN, "Record " ZINT_FORMAT
": long dictionary entry %d + %d",
/* so bad it can not fit into our ord_buf */
yaz_log(YLOG_WARN, "Record " ZINT_FORMAT
": long dictionary entry %d + %d",
ord_buf[ord_len + slen] = '\0';
if (ord_len + slen >= IT_MAX_WORD)
{
ord_buf[ord_len + slen] = '\0';
if (ord_len + slen >= IT_MAX_WORD)
{
(*no_long_dict_entries)++;
(*no_long_dict_entries)++;
- if (verbose_level >= 1)
+ if (*no_long_dict_entries <= message_limit)
yaz_log(YLOG_WARN, "Record " ZINT_FORMAT
": long dictionary entry %d + %d",
rec->sysno, (int) ord_len, (int) slen);
yaz_log(YLOG_WARN, "Record " ZINT_FORMAT
": long dictionary entry %d + %d",
rec->sysno, (int) ord_len, (int) slen);
info = dict_lookup(zh->reg->dict, ord_buf);
if (!info)
{
info = dict_lookup(zh->reg->dict, ord_buf);
if (!info)
{
(*no_failed_dict_lookups)++;
(*no_failed_dict_lookups)++;
- if (verbose_level >= 1)
+ if (*no_failed_dict_lookups <= message_limit)
yaz_log(YLOG_WARN, "Record " ZINT_FORMAT
": term do not exist in dictionary", rec->sysno);
}
yaz_log(YLOG_WARN, "Record " ZINT_FORMAT
": term do not exist in dictionary", rec->sysno);
}
if (*info != sizeof(pos))
{
if (*info != sizeof(pos))
{
(*no_invalid_dict_infos)++;
(*no_invalid_dict_infos)++;
- if (verbose_level >= 1)
+ if (*no_invalid_dict_infos <= message_limit)
yaz_log(YLOG_WARN, "Record " ZINT_FORMAT
": long dictionary entry %d + %d",
rec->sysno, (int) ord_len, (int) slen);
yaz_log(YLOG_WARN, "Record " ZINT_FORMAT
": long dictionary entry %d + %d",
rec->sysno, (int) ord_len, (int) slen);
(*no_invalid_isam_entries)++;
(*no_invalid_isam_entries)++;
- if (verbose_level >= 1)
+ if (*no_invalid_isam_entries <= message_limit)
yaz_log(YLOG_WARN, "Record " ZINT_FORMAT
": isamb_pp_open entry " ZINT_FORMAT
" not found",
yaz_log(YLOG_WARN, "Record " ZINT_FORMAT
": isamb_pp_open entry " ZINT_FORMAT
" not found",
r = isamb_pp_forward(ispt, &isam_key, &until_key);
if (r != 1)
{
r = isamb_pp_forward(ispt, &isam_key, &until_key);
if (r != 1)
{
(*no_invalid_isam_entries)++;
(*no_invalid_isam_entries)++;
- if (verbose_level >= 1)
+ if (*no_invalid_isam_entries <= message_limit)
yaz_log(YLOG_WARN, "Record " ZINT_FORMAT
": isamb_pp_forward " ZINT_FORMAT
" returned no entry",
yaz_log(YLOG_WARN, "Record " ZINT_FORMAT
": isamb_pp_forward " ZINT_FORMAT
" returned no entry",
int cmp = key_compare(&until_key, &isam_key);
if (cmp != 0)
{
int cmp = key_compare(&until_key, &isam_key);
if (cmp != 0)
{
(*no_invalid_isam_entries)++;
(*no_invalid_isam_entries)++;
- if (verbose_level >= 1)
+ if (*no_invalid_isam_entries
+ <= message_limit)
yaz_log(YLOG_WARN, "Record "
ZINT_FORMAT
": isamb_pp_forward "
yaz_log(YLOG_WARN, "Record "
ZINT_FORMAT
": isamb_pp_forward "
- if (key_in.len < 2 || key_in.len > 4)
- {
- do_fail = 1;
- (*no_invalid_keys)++;
- if (verbose_level >= 1)
- {
- yaz_log(YLOG_WARN, "Record " ZINT_FORMAT
- ": unexpected key length %d",
- rec->sysno, key_in.len);
- }
- }
- res = ZEBRA_FAIL;
- if (verbose_level >= 1)
- {
- zebra_it_key_str_dump(zh, &key_in, str,
- slen, nmem, YLOG_LOG);
- nmem_reset(nmem);
- }
+ zebra_it_key_str_dump(zh, &key_in, str,
+ slen, nmem, YLOG_LOG);
+ nmem_reset(nmem);
-ZEBRA_RES zebra_register_check(ZebraHandle zh, int verbose_level)
+ZEBRA_RES zebra_register_check(ZebraHandle zh, int message_limit)
{
ZEBRA_RES res = ZEBRA_FAIL;
if (zebra_begin_read(zh) == ZEBRA_OK)
{
ZEBRA_RES res = ZEBRA_FAIL;
if (zebra_begin_read(zh) == ZEBRA_OK)
- if (zebra_record_check(zh, rec, &no_keys, verbose_level,
+ if (zebra_record_check(zh, rec, &no_keys, message_limit,
&no_long_dict_entries,
&no_failed_dict_lookups,
&no_invalid_keys,
&no_long_dict_entries,
&no_failed_dict_lookups,
&no_invalid_keys,
- else if (!strcmp(arg, "check0"))
+ else if (!strncmp(arg, "check", 5))
- if (zebra_register_check(zh, 0) != ZEBRA_OK)
- yaz_log(YLOG_WARN, "register check failed");
- }
- else if (!strcmp(arg, "check1") || !strcmp(arg, "check"))
- {
- if (zebra_register_check(zh, 1) != ZEBRA_OK)
+ if (zebra_register_check(zh, 10) != ZEBRA_OK)
yaz_log(YLOG_WARN, "register check failed");
}
else
yaz_log(YLOG_WARN, "register check failed");
}
else