From: Heikki Levanto Date: Fri, 10 Dec 2004 12:37:07 +0000 (+0000) Subject: Cleaned a bit more logging X-Git-Tag: snippet.version.1~220 X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=commitdiff_plain;h=70ac1af85bfc3ed5298ee657a280a253be57469f Cleaned a bit more logging --- diff --git a/index/zebraapi.c b/index/zebraapi.c index 5861a23..3389125 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -1,4 +1,4 @@ -/* $Id: zebraapi.c,v 1.143 2004-12-02 17:27:03 adam Exp $ +/* $Id: zebraapi.c,v 1.144 2004-12-10 12:37:07 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -315,7 +315,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, if (!(reg->records = rec_open (reg->bfs, rw, record_compression))) { - yaz_log (YLOG_WARN, "rec_open"); + yaz_log (YLOG_WARN, "rec_open failed"); return 0; } if (rw) @@ -324,12 +324,12 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, } if (!(reg->dict = dict_open_res (reg->bfs, FNAME_DICT, 40, rw, 0, res))) { - yaz_log (YLOG_WARN, "dict_open"); + yaz_log (YLOG_WARN, "dict_open failed"); return 0; } if (!(reg->sortIdx = sortIdx_open (reg->bfs, rw))) { - yaz_log (YLOG_WARN, "sortIdx_open"); + yaz_log (YLOG_WARN, "sortIdx_open failed"); return 0; } if (res_get_match (res, "isam", "s", ISAM_DEFAULT)) @@ -338,7 +338,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, if (!(reg->isams = isams_open (reg->bfs, FNAME_ISAMS, rw, key_isams_m(res, &isams_m)))) { - yaz_log (YLOG_WARN, "isams_open"); + yaz_log (YLOG_WARN, "isams_open failed"); return 0; } } @@ -348,7 +348,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, if (!(reg->isamc = isc_open (reg->bfs, FNAME_ISAMC, rw, key_isamc_m(res, &isamc_m)))) { - yaz_log (YLOG_WARN, "isc_open"); + yaz_log (YLOG_WARN, "isc_open failed"); return 0; } } @@ -359,7 +359,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, if (!(reg->isamb = isamb_open (reg->bfs, "isamb", rw, key_isamc_m(res, &isamc_m), 0))) { - yaz_log (YLOG_WARN, "isamb_open"); + yaz_log (YLOG_WARN, "isamb_open failed"); return 0; } } @@ -370,7 +370,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, if (!(reg->isamb = isamb_open (reg->bfs, "isamb", rw, key_isamc_m(res, &isamc_m), 1))) { - yaz_log (YLOG_WARN, "isamb_open"); + yaz_log (YLOG_WARN, "isamb_open failed"); return 0; } } @@ -381,7 +381,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, if (!(reg->isamb = isamb_open (reg->bfs, "isamb", rw, key_isamc_m(res, &isamc_m), -1))) { - yaz_log (YLOG_WARN, "isamb_open"); + yaz_log (YLOG_WARN, "isamb_open failed"); return 0; } } @@ -1693,7 +1693,7 @@ int zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status) } #if HAVE_SYS_TIMES_H times (&zh->tms2); - yaz_log (YLOG_LOG, "user/system: %ld/%ld", + yaz_log (log_level, "user/system: %ld/%ld", (long) (zh->tms2.tms_utime - zh->tms1.tms_utime), (long) (zh->tms2.tms_stime - zh->tms1.tms_stime)); @@ -1750,8 +1750,7 @@ static int zebra_commit_ex (ZebraHandle zh, int clean_only) rval = res_get (zh->res, "shadow"); if (!rval) { - yaz_log (YLOG_WARN, "Cannot perform commit"); - yaz_log (YLOG_WARN, "No shadow area defined"); + yaz_log (YLOG_WARN, "Cannot perform commit - No shadow area defined"); return 0; } @@ -1785,7 +1784,7 @@ static int zebra_commit_ex (ZebraHandle zh, int clean_only) } else { - yaz_log (YLOG_LOG, "nothing to commit"); + yaz_log (log_level, "nothing to commit"); } bfs_destroy (bfs); diff --git a/index/zrpn.c b/index/zrpn.c index e9fc915..09b4509 100644 --- a/index/zrpn.c +++ b/index/zrpn.c @@ -1,4 +1,4 @@ -/* $Id: zrpn.c,v 1.163 2004-11-29 21:55:27 adam Exp $ +/* $Id: zrpn.c,v 1.164 2004-12-10 12:37:07 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -64,6 +64,9 @@ typedef struct } AttrType; +static int log_level_set=0; +static int log_level_rpn=0; + static const char **rpn_char_map_handler(void *vp, const char **from, int len) { struct rpn_char_map_info *p = (struct rpn_char_map_info *) vp; @@ -203,6 +206,11 @@ static void term_untrans(ZebraHandle zh, int reg_type, static void add_isam_p(const char *name, const char *info, struct grep_info *p) { + if (!log_level_set) + { + log_level_rpn = yaz_log_module_level("rpn"); + log_level_set=1; + } if (p->isam_p_indx == p->isam_p_size) { ISAMC_P *new_isam_p_buf; @@ -245,10 +253,10 @@ static void add_isam_p(const char *name, const char *info, int len = key_SU_decode (&su_code, name); term_untrans (p->zh, p->reg_type, term_tmp, name+len+1); - yaz_log(YLOG_LOG, "grep: %d %c %s", su_code, name[len], term_tmp); + yaz_log(log_level_rpn, "grep: %d %c %s", su_code, name[len], term_tmp); zebraExplain_lookup_ord (p->zh->reg->zei, su_code, &db, &set, &use); - yaz_log(YLOG_LOG, "grep: set=%d use=%d db=%s", set, use, db); + yaz_log(log_level_rpn, "grep: set=%d use=%d db=%s", set, use, db); resultSetAddTerm(p->zh, p->termset, name[len], db, set, use, term_tmp); @@ -724,7 +732,7 @@ static int string_relation(ZebraHandle zh, Z_AttributesPlusTerm *zapt, term_sub, term_component, space_split, term_dst)) return 0; - yaz_log(YLOG_DEBUG, "Relation <"); + yaz_log(log_level_rpn, "Relation <"); *term_tmp++ = '('; for (i = 0; term_component[i]; ) @@ -757,7 +765,7 @@ static int string_relation(ZebraHandle zh, Z_AttributesPlusTerm *zapt, term_sub, term_component, space_split, term_dst)) return 0; - yaz_log(YLOG_DEBUG, "Relation <="); + yaz_log(log_level_rpn, "Relation <="); *term_tmp++ = '('; for (i = 0; term_component[i]; ) @@ -790,7 +798,7 @@ static int string_relation(ZebraHandle zh, Z_AttributesPlusTerm *zapt, if (!term_100 (zh->reg->zebra_maps, reg_type, term_sub, term_component, space_split, term_dst)) return 0; - yaz_log(YLOG_DEBUG, "Relation >"); + yaz_log(log_level_rpn, "Relation >"); *term_tmp++ = '('; for (i = 0; term_component[i];) @@ -825,7 +833,7 @@ static int string_relation(ZebraHandle zh, Z_AttributesPlusTerm *zapt, if (!term_100 (zh->reg->zebra_maps, reg_type, term_sub, term_component, space_split, term_dst)) return 0; - yaz_log(YLOG_DEBUG, "Relation >="); + yaz_log(log_level_rpn, "Relation >="); *term_tmp++ = '('; for (i = 0; term_component[i];) @@ -861,7 +869,7 @@ static int string_relation(ZebraHandle zh, Z_AttributesPlusTerm *zapt, break; case 3: default: - yaz_log(YLOG_DEBUG, "Relation ="); + yaz_log(log_level_rpn, "Relation ="); if (!term_100 (zh->reg->zebra_maps, reg_type, term_sub, term_component, space_split, term_dst)) return 0; @@ -897,7 +905,7 @@ static RSET term_trunc(ZebraHandle zh, Z_AttributesPlusTerm *zapt, term_dst, xpath_use); if (r < 1) return 0; - yaz_log(YLOG_DEBUG, "term: %s", term_dst); + yaz_log(log_level_rpn, "term: %s", term_dst); return rset_trunc(zh, grep_info->isam_p_buf, grep_info->isam_p_indx, term_dst, strlen(term_dst), rank_type, 1 /* preserve pos */, @@ -938,10 +946,10 @@ static int string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, rpn_char_map_prepare (zh->reg, reg_type, &rcmi); attr_init (&use, zapt, 1); use_value = attr_find_ex (&use, &curAttributeSet, &use_string); - yaz_log(YLOG_DEBUG, "string_term, use value %d", use_value); + yaz_log(log_level_rpn, "string_term, use value %d", use_value); attr_init (&truncation, zapt, 5); truncation_value = attr_find (&truncation, NULL); - yaz_log(YLOG_DEBUG, "truncation value %d", truncation_value); + yaz_log(log_level_rpn, "truncation value %d", truncation_value); if (use_value == -1) /* no attribute - assumy "any" */ use_value = 1016; @@ -1052,7 +1060,7 @@ static int string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, term_dict[prefix_len++] = ')'; term_dict[prefix_len++] = 1; term_dict[prefix_len++] = reg_type; - yaz_log(YLOG_DEBUG, "reg_type = %d", term_dict[prefix_len-1]); + yaz_log(log_level_rpn, "reg_type = %d", term_dict[prefix_len-1]); term_dict[prefix_len] = '\0'; j = prefix_len; switch (truncation_value) @@ -1136,7 +1144,7 @@ static int string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, } if (attr_ok) { - yaz_log(YLOG_DEBUG, "dict_lookup_grep: %s", term_dict+prefix_len); + yaz_log(log_level_rpn, "dict_lookup_grep: %s", term_dict+prefix_len); r = dict_lookup_grep(zh->reg->dict, term_dict, regex_range, grep_info, &max_pos, init_pos, grep_handle); @@ -1333,7 +1341,7 @@ static int grep_info_prepare (ZebraHandle zh, } else termset_name = termset_value_string; - yaz_log(YLOG_LOG, "creating termset set %s", termset_name); + yaz_log(log_level_rpn, "creating termset set %s", termset_name); grep_info->termset = resultSetAdd (zh, termset_name, 1); if (!grep_info->termset) { @@ -1368,7 +1376,7 @@ static RSET rpn_search_APT_phrase (ZebraHandle zh, return 0; while (1) { - yaz_log(YLOG_DEBUG, "APT_phrase termp=%s", termp); + yaz_log(log_level_rpn, "APT_phrase termp=%s", termp); rset[rset_no] = term_trunc(zh, zapt, &termp, attributeSet, stream, &grep_info, reg_type, complete_flag, @@ -1415,7 +1423,7 @@ static RSET rpn_search_APT_or_list (ZebraHandle zh, return 0; while (1) { - yaz_log(YLOG_DEBUG, "APT_or_list termp=%s", termp); + yaz_log(log_level_rpn, "APT_or_list termp=%s", termp); rset[rset_no] = term_trunc(zh, zapt, &termp, attributeSet, stream, &grep_info, reg_type, complete_flag, @@ -1456,7 +1464,7 @@ static RSET rpn_search_APT_and_list (ZebraHandle zh, return 0; while (1) { - yaz_log(YLOG_DEBUG, "APT_and_list termp=%s", termp); + yaz_log(log_level_rpn, "APT_and_list termp=%s", termp); rset[rset_no] = term_trunc(zh, zapt, &termp, attributeSet, stream, &grep_info, reg_type, complete_flag, @@ -1495,7 +1503,7 @@ static int numeric_relation (ZebraHandle zh, Z_AttributesPlusTerm *zapt, attr_init (&relation, zapt, 2); relation_value = attr_find (&relation, NULL); - yaz_log(YLOG_DEBUG, "numeric relation value=%d", relation_value); + yaz_log(log_level_rpn, "numeric relation value=%d", relation_value); if (!term_100 (zh->reg->zebra_maps, reg_type, term_sub, term_tmp, 1, term_dst)) @@ -1504,32 +1512,32 @@ static int numeric_relation (ZebraHandle zh, Z_AttributesPlusTerm *zapt, switch (relation_value) { case 1: - yaz_log(YLOG_DEBUG, "Relation <"); + yaz_log(log_level_rpn, "Relation <"); gen_regular_rel (term_tmp, term_value-1, 1); break; case 2: - yaz_log(YLOG_DEBUG, "Relation <="); + yaz_log(log_level_rpn, "Relation <="); gen_regular_rel (term_tmp, term_value, 1); break; case 4: - yaz_log(YLOG_DEBUG, "Relation >="); + yaz_log(log_level_rpn, "Relation >="); gen_regular_rel (term_tmp, term_value, 0); break; case 5: - yaz_log(YLOG_DEBUG, "Relation >"); + yaz_log(log_level_rpn, "Relation >"); gen_regular_rel (term_tmp, term_value+1, 0); break; case 3: default: - yaz_log(YLOG_DEBUG, "Relation ="); + yaz_log(log_level_rpn, "Relation ="); sprintf (term_tmp, "(0*%d)", term_value); } - yaz_log(YLOG_DEBUG, "dict_lookup_grep: %s", term_tmp); + yaz_log(log_level_rpn, "dict_lookup_grep: %s", term_tmp); r = dict_lookup_grep(zh->reg->dict, term_dict, 0, grep_info, max_pos, 0, grep_handle); if (r) yaz_log(YLOG_WARN, "dict_lookup_grep fail, rel=gt: %d", r); - yaz_log(YLOG_DEBUG, "%d positions", grep_info->isam_p_indx); + yaz_log(log_level_rpn, "%d positions", grep_info->isam_p_indx); return 1; } @@ -1673,7 +1681,7 @@ static RSET rpn_search_APT_numeric (ZebraHandle zh, int r, rset_no = 0; struct grep_info grep_info; - yaz_log(YLOG_DEBUG, "APT_numeric t='%s'",termz); + yaz_log(log_level_rpn, "APT_numeric t='%s'",termz); if (grep_info_prepare (zh, zapt, &grep_info, reg_type, stream)) return 0; while (1) @@ -1908,10 +1916,10 @@ static RSET rpn_search_xpath (ZebraHandle zh, if (xpath_len < 0) return rset; - yaz_log (YLOG_LOG, "len=%d", xpath_len); + yaz_log (YLOG_DEBUG, "xpath len=%d", xpath_len); for (i = 0; ireg->zebra_maps, zapt, ®_id, &search_type, rank_type, &complete_flag, &sort_flag); diff --git a/index/zsets.c b/index/zsets.c index 88ed57d..8e7c694 100644 --- a/index/zsets.c +++ b/index/zsets.c @@ -1,4 +1,4 @@ -/* $Id: zsets.c,v 1.74 2004-12-10 11:56:22 heikki Exp $ +/* $Id: zsets.c,v 1.75 2004-12-10 12:37:07 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -85,6 +85,7 @@ static void loglevels() log_level_searchhits = yaz_log_module_level("searchhits"); log_level_searchterms = yaz_log_module_level("searchterms"); log_level_resultsets = yaz_log_module_level("resultsets"); + log_level_set=1; } ZebraSet resultSetAddRPN (ZebraHandle zh, NMEM m,