/*
- * Copyright (c) 1998-2005, Index Data.
+ * Copyright (c) 1998-2007, Index Data.
* See the file LICENSE for details.
*
- * $Id: yaz-z-query.cpp,v 1.18 2005-09-27 17:57:51 adam Exp $
+ * $Id: yaz-z-query.cpp,v 1.22 2007-04-12 15:00:33 adam Exp $
*/
-#include <yaz/logrpn.h>
-#include <yaz++/z-query.h>
+#include <yaz/querytowrbuf.h>
+#include <yazpp/z-query.h>
#include <yaz/pquery.h>
+#include <assert.h>
using namespace yazpp_1;
odr_print = odr_createmem(ODR_PRINT);
}
-Yaz_Z_Query& Yaz_Z_Query::operator=(const Yaz_Z_Query &p)
+
+Yaz_Z_Query::Yaz_Z_Query(const Yaz_Z_Query &q)
+{
+ odr_encode = odr_createmem(ODR_ENCODE);
+ odr_decode = odr_createmem(ODR_DECODE);
+ odr_print = odr_createmem(ODR_PRINT);
+
+ m_len = q.m_len;
+ m_buf = (char*) odr_malloc(odr_encode, m_len);
+ memcpy(m_buf, q.m_buf, m_len);
+}
+
+Yaz_Z_Query& Yaz_Z_Query::operator=(const Yaz_Z_Query &q)
{
- if (this != &p)
+ if (this != &q)
{
odr_reset(odr_encode);
- if (!p.m_buf)
+ if (!q.m_buf)
{
m_buf = 0;
m_len = 0;
}
else
{
- m_len = p.m_len;
+ m_len = q.m_len;
m_buf = (char*) odr_malloc(odr_encode, m_len);
- memcpy(m_buf, p.m_buf, m_len);
+ memcpy(m_buf, q.m_buf, m_len);
}
}
return *this;
odr_reset(odr_encode);
Z_Query *query = (Z_Query*) odr_malloc(odr_encode, sizeof(*query));
query->which = Z_Query_type_1;
- query->u.type_1 = p_query_rpn(odr_encode, PROTO_Z3950, rpn);
+ query->u.type_1 = p_query_rpn(odr_encode, rpn);
if (!query->u.type_1)
return -1;
if (!z_Query(odr_encode, &query, 0, 0))
return query;
}
-void Yaz_Z_Query::print(char *str, int len)
+void Yaz_Z_Query::print(char *str, size_t len)
{
Z_Query *query;
*str = 0;
odr_setbuf(odr_decode, m_buf, m_len, 0);
if (!z_Query(odr_decode, &query, 0, 0))
return;
- WRBUF wbuf = zquery2pquery(query);
- if (wbuf)
+ WRBUF wbuf = wrbuf_alloc();
+ yaz_query_to_wrbuf(wbuf, query);
+ if (wrbuf_len(wbuf) > len-1)
{
- 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);
+ memcpy(str, wrbuf_buf(wbuf), len-1);
+ str[len-1] = '\0';
}
+ else
+ strcpy(str, wrbuf_cstr(wbuf));
+ wrbuf_destroy(wbuf);
odr_reset(odr_decode);
}
-int Yaz_Z_Query::match(Yaz_Z_Query *other)
+int Yaz_Z_Query::match(const Yaz_Z_Query *other)
{
if (m_len != other->m_len)
return 0;
return 1;
}
-WRBUF Yaz_Z_Query::zquery2pquery(Z_Query *q)
-{
- WRBUF w = wrbuf_alloc();
- wrbuf_put_zquery(w, q);
- return w;
-}
-
/*
* Local variables:
* c-basic-offset: 4