X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fquerytowrbuf.c;h=f36844d1ef433a4c43f0793f680e1be2105e3201;hp=109fec640c1aa05be3de45fcb13995fb24c08774;hb=1346b30779b120691e4145a3578716f77300951e;hpb=fcfd9a074ff29ffdd52e5eb0ee348fb74f0a0d17 diff --git a/src/querytowrbuf.c b/src/querytowrbuf.c index 109fec6..f36844d 100644 --- a/src/querytowrbuf.c +++ b/src/querytowrbuf.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2011 Index Data + * Copyright (C) 1995-2013 Index Data * See the file LICENSE for details. */ /** \file querytowrbuf.c @@ -26,7 +26,7 @@ void yaz_encode_pqf_term(WRBUF b, const char *term, int len) { if (term[0] == '@') wrbuf_putc(b, '\\'); - for (i = 0; iattributeSet) { char oid_name_str[OID_STR_MAX]; - const char *setname = yaz_oid_to_string_buf(element->attributeSet, + const char *setname = yaz_oid_to_string_buf(element->attributeSet, 0, oid_name_str); if (setname) { @@ -65,13 +65,13 @@ static void yaz_attribute_element_to_wrbuf(WRBUF b, } } wrbuf_printf(b, ODR_INT_PRINTF "=", *element->attributeType); - switch (element->which) + switch (element->which) { case Z_AttributeValue_numeric: wrbuf_printf(b, ODR_INT_PRINTF, *element->value.numeric); break; case Z_AttributeValue_complex: - for (i = 0; ivalue.complex->num_list; i++) + for (i = 0; i < element->value.complex->num_list; i++) { if (i) wrbuf_puts(b, ","); @@ -80,7 +80,7 @@ static void yaz_attribute_element_to_wrbuf(WRBUF b, wrbuf_puts(b, element->value.complex->list[i]->u.string); else if (element->value.complex->list[i]->which == Z_StringOrNumeric_numeric) - wrbuf_printf(b, ODR_INT_PRINTF, + wrbuf_printf(b, ODR_INT_PRINTF, *element->value.complex->list[i]->u.numeric); } break; @@ -111,9 +111,9 @@ static void yaz_apt_to_wrbuf(WRBUF b, const Z_AttributesPlusTerm *zapt) { int num_attributes = zapt->attributes->num_attributes; int i; - for (i = 0; iattributes->attributes[i]); - + switch (zapt->term->which) { case Z_Term_general: @@ -152,7 +152,7 @@ static void yaz_rpnstructure_to_wrbuf(WRBUF b, const Z_RPNStructure *zs) else wrbuf_putc(b, '0'); - wrbuf_printf(b, " " ODR_INT_PRINTF " %d " + wrbuf_printf(b, " " ODR_INT_PRINTF " %d " ODR_INT_PRINTF " ", *op->u.prox->distance, *op->u.prox->ordered, *op->u.prox->relationType); @@ -202,7 +202,7 @@ void yaz_rpnquery_to_wrbuf(WRBUF b, const Z_RPNQuery *rpn) 0, oid_name_str); if (oid_name) wrbuf_printf(b, "@attrset %s ", oid_name); - } + } yaz_rpnstructure_to_wrbuf(b, rpn->RPNStructure); wrbuf_chop_right(b); } @@ -213,7 +213,7 @@ void yaz_query_to_wrbuf(WRBUF b, const Z_Query *q) assert(b); switch (q->which) { - case Z_Query_type_1: + case Z_Query_type_1: case Z_Query_type_101: wrbuf_puts(b,"RPN "); yaz_rpnquery_to_wrbuf(b, q->u.type_1); @@ -253,7 +253,7 @@ void wrbuf_diags(WRBUF b, int num_diagnostics, Z_DiagRec **diags) wrbuf_puts(b,"(diag not in default format?)"); else { - Z_DefaultDiagFormat *e=diags[0]->u.defaultFormat; + Z_DefaultDiagFormat *e = diags[0]->u.defaultFormat; if (e->condition) wrbuf_printf(b, ODR_INT_PRINTF " ",*e->condition); else