X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Flogrpn.c;h=cd8de78fa85b21bf8f12b4a152f43dd02e1483a9;hb=80fee38926477efd73c739731c5670d59c5d1bf7;hp=e34b6b2729fcc08dedad4638fbd2c8c971a91a99;hpb=379504a233e3e2cc85bca1e7b6d864f1395aec7c;p=yaz-moved-to-github.git diff --git a/src/logrpn.c b/src/logrpn.c index e34b6b2..cd8de78 100644 --- a/src/logrpn.c +++ b/src/logrpn.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2009 Index Data + * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ @@ -206,7 +206,8 @@ static void zlog_attributes(Z_AttributesPlusTerm *t, int depth, yaz_log (loglevel, "%*.0s%s %s", depth, "", attset_name, str); break; case Z_AttributeValue_complex: - yaz_log (loglevel, "%*.0s%s attributeType=%d complex", + yaz_log (loglevel, "%*.0s%s attributeType=" ODR_INT_PRINTF + " complex", depth, "", attset_name, *element->attributeType); for (i = 0; ivalue.complex->num_list; i++) { @@ -216,7 +217,8 @@ static void zlog_attributes(Z_AttributesPlusTerm *t, int depth, element->value.complex->list[i]->u.string); else if (element->value.complex->list[i]->which == Z_StringOrNumeric_numeric) - yaz_log (loglevel, "%*.0s numeric: '%d'", depth, "", + yaz_log (loglevel, "%*.0s numeric: '" ODR_INT_PRINTF + " '", depth, "", *element->value.complex->list[i]->u.numeric); } break; @@ -279,7 +281,8 @@ static void zlog_structure(Z_RPNStructure *zs, int depth, yaz_log (loglevel, "%*.0s %s", depth, "", complex_op_name(op) ); break; case Z_Operator_prox: - yaz_log (loglevel, "%*.0s prox excl=%s dist=%d order=%s " + yaz_log (loglevel, "%*.0s prox excl=%s dist=" ODR_INT_PRINTF + " order=%s " "rel=%s unit=%s", depth, "", op->u.prox->exclusion ? (*op->u.prox->exclusion ? "T" : "F") : "N", @@ -313,7 +316,8 @@ static void zlog_structure(Z_RPNStructure *zs, int depth, zapt->term->u.characterString); break; case Z_Term_numeric: - yaz_log (loglevel, "%*.0s term '%d' (numeric)", depth, "", + yaz_log (loglevel, "%*.0s term '" ODR_INT_PRINTF + "' (numeric)", depth, "", *zapt->term->u.numeric); break; case Z_Term_null: