+ Z_Query *query;
+ *str = 0;
+ if (!m_buf)
+ return;
+ odr_setbuf (odr_decode, m_buf, m_len, 0);
+ if (!z_Query(odr_decode, &query, 0, 0))
+ return;
+ WRBUF wbuf = zquery2pquery(query);
+ if (wbuf)
+ {
+ if (wrbuf_len(wbuf) > len-1)
+ {
+ memcpy(str, wrbuf_buf(wbuf), len-1);
+ str[len-1] = '\0';
+ }
+ else
+ strcpy(str, wrbuf_buf(wbuf));
+ wrbuf_free(wbuf,1);
+ }
+ odr_reset(odr_decode);
+}
+
+int Yaz_Z_Query::match(Yaz_Z_Query *other)
+{
+ if (m_len != other->m_len)
+ return 0;
+ if (!m_buf || !other->m_buf)
+ return 0;
+ if (memcmp(m_buf, other->m_buf, m_len))
+ return 0;
+ return 1;
+}
+
+void Yaz_Z_Query::oid2str(Odr_oid *o, WRBUF buf)
+{
+ for (; *o >= 0; o++) {
+ char ibuf[16];
+ sprintf(ibuf, "%d", *o);
+ wrbuf_puts(buf, ibuf);
+ if (o[1] > 0)
+ wrbuf_putc(buf, '.');
+ }
+}
+
+void Yaz_Z_Query::pr_term(WRBUF wbuf, char *buf, int len)
+{
+ int i;
+ wrbuf_putc(wbuf, '"');
+ for (i = 0; i<len; i++)
+ {
+ int ch = buf[i];
+ if (ch == '"')
+ wrbuf_putc(wbuf, '\\');
+ wrbuf_putc(wbuf, ch);
+ }
+ wrbuf_puts(wbuf, "\" ");
+}
+
+int Yaz_Z_Query::rpn2pquery(Z_RPNStructure *s, WRBUF buf)
+{
+ if (s->which == Z_RPNStructure_simple)
+ {
+ Z_Operand *o = s->u.simple;
+
+ if (o->which == Z_Operand_APT)
+ {
+ Z_AttributesPlusTerm *at = s->u.simple->u.attributesPlusTerm;
+ if (at->attributes) {
+ int i;
+ for (i = 0; i < at->attributes->num_attributes; i++) {
+ wrbuf_puts(buf, "@attr ");
+ if (at->attributes->attributes[i]->attributeSet) {
+ oid2str(at->attributes->attributes[i]->attributeSet, buf);
+ wrbuf_putc(buf, ' ');
+ }
+ wrbuf_printf(buf, "%d=", *at->attributes->attributes[i]->attributeType);
+ wrbuf_printf(buf, "%d ", *at->attributes->attributes[i]->value.numeric);
+ }
+ }
+ if (at->term->which == Z_Term_general)
+ {
+ pr_term(buf, (char*) at->term->u.general->buf,
+ at->term->u.general->len);
+ }
+ else if (at->term->which == Z_Term_characterString)
+ {
+ wrbuf_puts(buf, "@term string ");
+ pr_term(buf, at->term->u.characterString,
+ strlen(at->term->u.characterString));