projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use website for upload doc
[yaz-moved-to-github.git]
/
src
/
logrpn.c
diff --git
a/src/logrpn.c
b/src/logrpn.c
index
085b311
..
58468d5
100644
(file)
--- a/
src/logrpn.c
+++ b/
src/logrpn.c
@@
-1,8
+1,6
@@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
- * All rights reserved.
- *
- * $Id: logrpn.c,v 1.17 2007-05-06 20:12:20 adam Exp $
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2009 Index Data
+ * See the file LICENSE for details.
*/
/**
*/
/**
@@
-181,7
+179,7
@@
static void attrStr (int type, int value, char *str)
* zlog_attributes: print attributes of term
*/
static void zlog_attributes(Z_AttributesPlusTerm *t, int depth,
* zlog_attributes: print attributes of term
*/
static void zlog_attributes(Z_AttributesPlusTerm *t, int depth,
- const int *ast, int loglevel)
+ const Odr_oid *ast, int loglevel)
{
int of, i;
char str[80];
{
int of, i;
char str[80];
@@
-208,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 %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; i<element->value.complex->num_list; i++)
{
depth, "", attset_name, *element->attributeType);
for (i = 0; i<element->value.complex->num_list; i++)
{
@@
-218,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)
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;
*element->value.complex->list[i]->u.numeric);
}
break;
@@
-268,7
+268,7
@@
static char *prox_unit_name(Z_ProximityOperator *op)
}
static void zlog_structure(Z_RPNStructure *zs, int depth,
}
static void zlog_structure(Z_RPNStructure *zs, int depth,
- const int *ast, int loglevel)
+ const Odr_oid *ast, int loglevel)
{
if (zs->which == Z_RPNStructure_complex)
{
{
if (zs->which == Z_RPNStructure_complex)
{
@@
-281,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 %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",
"rel=%s unit=%s",
depth, "", op->u.prox->exclusion ?
(*op->u.prox->exclusion ? "T" : "F") : "N",
@@
-315,7
+316,8
@@
static void zlog_structure(Z_RPNStructure *zs, int depth,
zapt->term->u.characterString);
break;
case Z_Term_numeric:
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:
*zapt->term->u.numeric);
break;
case Z_Term_null:
@@
-349,7
+351,7
@@
void log_rpn_query(Z_RPNQuery *rpn)
}
void log_scan_term_level(int loglevel,
}
void log_scan_term_level(int loglevel,
- Z_AttributesPlusTerm *zapt, const int *ast)
+ Z_AttributesPlusTerm *zapt, const Odr_oid *ast)
{
int depth = 0;
if (!loglevel)
{
int depth = 0;
if (!loglevel)
@@
-364,7
+366,7
@@
void log_scan_term_level(int loglevel,
zlog_attributes(zapt, depth+2, ast, loglevel);
}
zlog_attributes(zapt, depth+2, ast, loglevel);
}
-void log_scan_term(Z_AttributesPlusTerm *zapt, const int *ast)
+void log_scan_term(Z_AttributesPlusTerm *zapt, const Odr_oid *ast)
{
log_scan_term_level (YLOG_LOG, zapt, ast);
}
{
log_scan_term_level (YLOG_LOG, zapt, ast);
}
@@
-399,6
+401,7
@@
void yaz_log_zquery (Z_Query *q)
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab