/*
- * Copyright (C) 1995-2005, Index Data ApS
+ * Copyright (C) 1995-2007, Index Data ApS
* All rights reserved.
*
- * $Id: querytowrbuf.c,v 1.1 2006-01-20 10:34:51 adam Exp $
+ * $Id: querytowrbuf.c,v 1.7 2007-03-19 14:40:07 adam Exp $
*/
-/**
- * \file querytostr.c
- * \brief Query to WRBUF (to strings)
+/** \file querytowrbuf.c
+ \brief Query to WRBUF (to strings)
*/
#include <stdio.h>
#include <assert.h>
+#include <yaz/logrpn.h>
#include <yaz/querytowrbuf.h>
static void yaz_term_to_wrbuf(WRBUF b, const char *term, int len)
if (attrset)
{
ast = attrset->value;
- wrbuf_printf(b, " @attrset %s ", attrset->desc);
+ wrbuf_printf(b, "@attrset %s ", attrset->desc);
}
yaz_rpnstructure_to_wrbuf(b, rpn->RPNStructure);
wrbuf_chop_right(b);
{
case Z_Query_type_1:
case Z_Query_type_101:
- wrbuf_printf(b,"RPN:");
+ wrbuf_printf(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_printf(b, "CCL %.*s", q->u.type_2->len, q->u.type_2->buf);
break;
case Z_Query_type_100:
- wrbuf_printf(b, "Z39.58: %.*s", q->u.type_100->len,
+ wrbuf_printf(b, "Z39.58 %.*s", q->u.type_100->len,
q->u.type_100->buf);
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_printf(b, "CQL %s", q->u.type_104->u.cql);
else
- wrbuf_printf(b,"Unknown type 104 query %d", q->u.type_104->which);
+ wrbuf_printf(b,"UNKNOWN type 104 query %d", q->u.type_104->which);
}
}
oid_value ast)
{
/* should print attr set here */
+ wrbuf_printf(b, "RPN ");
yaz_apt_to_wrbuf(b, zapt);
}
void wrbuf_scan_term(WRBUF b, const Z_AttributesPlusTerm *zapt, oid_value ast)
{
yaz_apt_to_wrbuf(b, zapt);
+ wrbuf_cstr(b);
}
/* obsolete */
void wrbuf_put_zquery(WRBUF b, const Z_Query *q)
{
yaz_query_to_wrbuf(b, q);
+ wrbuf_cstr(b);
}