X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fquerytowrbuf.c;h=79a9b6ed62ad8dbc03a12e9de87dec35d701a48c;hp=80172ee3a1942689e49c2cfb089fede386708af7;hb=8cb8947e3a7bff4dbf8f124871cb4905df1adce7;hpb=d0e351c12fff564d876958e860338d43716dc269 diff --git a/src/querytowrbuf.c b/src/querytowrbuf.c index 80172ee..79a9b6e 100644 --- a/src/querytowrbuf.c +++ b/src/querytowrbuf.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2010 Index Data + * Copyright (C) Index Data * See the file LICENSE for details. */ /** \file querytowrbuf.c @@ -22,19 +22,29 @@ void yaz_encode_pqf_term(WRBUF b, const char *term, int len) for (i = 0; i < len; i++) if (strchr(" \"{", term[i])) break; - if (i == len && i) - wrbuf_printf(b, "%.*s ", len, term); + if (len > 0 && i == len) + { + if (term[0] == '@') + wrbuf_putc(b, '\\'); + for (i = 0; i < len; i++) + { + if (term[i] == '\\') + wrbuf_putc(b, '\\'); + wrbuf_putc(b, term[i]); + } + } else { 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) { @@ -55,28 +65,27 @@ 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_printf(b, ","); + wrbuf_puts(b, ","); if (element->value.complex->list[i]->which == Z_StringOrNumeric_string) - wrbuf_printf(b, "%s", - element->value.complex->list[i]->u.string); + 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; default: - wrbuf_printf (b, "@attr 1=unknown"); + wrbuf_puts(b, "@attr 1=unknown"); } wrbuf_puts(b, " "); } @@ -98,13 +107,16 @@ static const char *complex_op_name(const Z_Operator *op) } } -static void yaz_apt_to_wrbuf(WRBUF b, const Z_AttributesPlusTerm *zapt) +static void yaz_attributes_to_wrbuf(WRBUF w, const Z_AttributeList *al) { - int num_attributes = zapt->attributes->num_attributes; int i; - for (i = 0; iattributes->attributes[i]); - + for (i = 0; i < al->num_attributes; i++) + yaz_attribute_element_to_wrbuf(w, al->attributes[i]); +} + +static void yaz_apt_to_wrbuf(WRBUF b, const Z_AttributesPlusTerm *zapt) +{ + yaz_attributes_to_wrbuf(b, zapt->attributes); switch (zapt->term->which) { case Z_Term_general: @@ -112,7 +124,7 @@ static void yaz_apt_to_wrbuf(WRBUF b, const Z_AttributesPlusTerm *zapt) zapt->term->u.general->len); break; case Z_Term_characterString: - wrbuf_printf(b, "@term string "); + wrbuf_puts(b, "@term string "); yaz_encode_pqf_term(b, zapt->term->u.characterString, strlen(zapt->term->u.characterString)); break; @@ -121,7 +133,7 @@ static void yaz_apt_to_wrbuf(WRBUF b, const Z_AttributesPlusTerm *zapt) *zapt->term->u.numeric); break; case Z_Term_null: - wrbuf_printf(b, "@term null x"); + wrbuf_puts(b, "@term null x"); break; default: wrbuf_printf(b, "@term null unknown%d ", zapt->term->which); @@ -143,7 +155,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); @@ -178,7 +190,7 @@ static void yaz_rpnstructure_to_wrbuf(WRBUF b, const Z_RPNStructure *zs) strlen(zs->u.simple->u.resultSetId)); } else - wrbuf_printf (b, "(unknown simple structure)"); + wrbuf_puts(b, "(unknown simple structure)"); } else wrbuf_puts(b, "(unknown structure)"); @@ -193,7 +205,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); } @@ -204,21 +216,25 @@ 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_printf(b,"RPN "); + wrbuf_puts(b,"RPN "); yaz_rpnquery_to_wrbuf(b, q->u.type_1); break; case Z_Query_type_2: - wrbuf_printf(b, "CCL %.*s", q->u.type_2->len, q->u.type_2->buf); + wrbuf_puts(b, "CCL "); + wrbuf_write(b, (const char *) q->u.type_2->buf, q->u.type_2->len); break; case Z_Query_type_100: - wrbuf_printf(b, "Z39.58 %.*s", q->u.type_100->len, - q->u.type_100->buf); + wrbuf_puts(b, "Z39.58 "); + wrbuf_write(b, (const char *) q->u.type_100->buf, q->u.type_100->len); break; case Z_Query_type_104: if (q->u.type_104->which == Z_External_CQL) - wrbuf_printf(b, "CQL %s", q->u.type_104->u.cql); + { + wrbuf_puts(b, "CQL "); + wrbuf_puts(b, q->u.type_104->u.cql); + } else wrbuf_printf(b,"UNKNOWN type 104 query %d", q->u.type_104->which); } @@ -228,27 +244,41 @@ void yaz_scan_to_wrbuf(WRBUF b, const Z_AttributesPlusTerm *zapt, const Odr_oid *attrbute_set) { /* should print attr set here */ - wrbuf_printf(b, "RPN "); + wrbuf_puts(b, "RPN "); yaz_apt_to_wrbuf(b, zapt); } void wrbuf_diags(WRBUF b, int num_diagnostics, Z_DiagRec **diags) { /* we only dump the first diag - that keeps the log cleaner. */ - wrbuf_printf(b," ERROR "); + wrbuf_puts(b," ERROR "); if (diags[0]->which != Z_DiagRec_defaultFormat) - wrbuf_printf(b,"(diag not in default format?)"); + 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 - wrbuf_printf(b, "?? "); + wrbuf_puts(b, "?? "); if ((e->which==Z_DefaultDiagFormat_v2Addinfo) && (e->u.v2Addinfo)) - wrbuf_printf(b,"%s ",e->u.v2Addinfo); + wrbuf_puts(b, e->u.v2Addinfo); else if ((e->which==Z_DefaultDiagFormat_v3Addinfo) && (e->u.v3Addinfo)) - wrbuf_printf(b,"%s ",e->u.v3Addinfo); + wrbuf_puts(b, e->u.v3Addinfo); + wrbuf_puts(b, " "); + } +} + +void yaz_facet_list_to_wrbuf(WRBUF w, const Z_FacetList *fl) +{ + int i; + for (i = 0; i < fl->num; i++) + { + Z_FacetField *ff = fl->elements[i]; + + if (i) + wrbuf_puts(w, ", "); + yaz_attributes_to_wrbuf(w, ff->attributes); } }